X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=Servus-chiark.py;h=de6a88fa36069da51d134ad5cd1b28d29d0d7037;hp=270955e8e36b6206ffa4e173dd03439c7c3a0e53;hb=c4a28171488f97455798c6aa8952bfc25893151d;hpb=9e5958bf112f07447b0faee3f32b2adfe823f446

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 270955e..de6a88f 100644
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -140,74 +140,13 @@ class game:
 	maxlose=14*minlose #2 weeks
 	losetime=time.time()+300000
 
-def canonical_url(urlstring):
-# canonicalise BBC URLs
-  if (urlstring.find("news.bbc.co.uk") != -1):
-    for middle in ("/low/","/mobile/"):
-      x = urlstring.find(middle)
-      if (x != -1):
-        urlstring.replace(middle,"/hi/")
-  return urlstring
-
-def nicetime(tempus):
-  if (tempus<120):
-    tm="%d seconds ago"%int(tempus)
-  elif (tempus<7200):
-    tm="%d minutes ago"%int(tempus/60)
-  if (tempus>7200):
-    tm="%d hours ago"%int(tempus/3600)
-  return tm
-
-urldb = {}
-urlre = re.compile("(https?://[^ ]+)( |$)")
-urlcomplaints = [" contemporary","n interesting"," fascinating","n overused"," vastly overused"]
-
-def urlq(bot, cmd, nick, conn, public):
-  if (not urlre.search(cmd)):
-    bot.automsg(False,nick,"Please use 'url' only with http URLs")
-    return
-
-  url="".join(cmd.split(" ")[1:])
-
-  url=canonical_url(url)
-  if (url in urldb):
-    users = urldb[url]
-    complaint="The url %s was mentioned %s by %s"%(url,nicetime(time.time()-users[-1][1]),users[-1][0])
-    if (public):
-      complaint=complaint+". Furthermore it defeats the point of this command to use it other than via /msg."
-    bot.automsg(False,nick,complaint)
-  else:
-    if (public):
-      bot.automsg(False,nick,"That URL was unique. There is little point in using !url out loud; please use it via /msg")
-    else:
-      conn.privmsg(bot.channel,"%s would like to draw your attention to %s"%(nick,url))
-    urldb[url]=[[nick,time.time()]]
-
-def dourl(bot,conn,nick,command):
-  urlstring=urlre.search(command).group(1)
-  urlstring=canonical_url(urlstring)
-
-  if urlstring in urldb:
-    T=urldb[urlstring]
-    uci = len(T)
-    if uci >= len(urlcomplaints):
-      uci = len(urlcomplaints)
-    message="observes a"+urlcomplaints[uci-1]+" URL: mentioned by "
-    if (len(T)>5): 
-      cutoff=len(T)-5
-    else:
-      cutoff=-1
-    for t in range(len(T)-1,cutoff,-1):
-      tempus = time.time()-T[t][1]
-      message += T[t][0]+" ("+nicetime(tempus)+")"
-      if (t!=cutoff+1):
-        message += ", "
-    if (cutoff != -1):
-      message += ", amongst others"
-    conn.action(bot.channel, message)
-    urldb[urlstring]=[[nick,time.time()]]+urldb[urlstring]
-  else:
-    urldb[urlstring]=[[nick,time.time()]]
+# initialise the urldb on startup
+urldb={}
+lastexp=time.time()
+#expire urls if not asked about or seen for >71 hours
+expirelen=71*60*60
+#do an expiry run every hour
+expirevery=60*60
 
 # Command processing: whenever something is said that the bot can hear,
 # "command" is invoked and must decide what to do.  This configuration
@@ -229,7 +168,7 @@ commands = {"karma": (c.karmaq,karmadb),
 	    "die": quit,
 	    "define": c.defineq,
             "google": c.googleq,
-#	    "url": urlq,
+	    "url": (c.urlq,urldb),
 	    "units": c.unitq,
 	    "help": c.helpq,
 #	    "game": (c.gameq,game),
@@ -255,9 +194,14 @@ def command(bot, cmd, nick, conn, public):
     except IndexError:
 	    command=""
 
-#    if public:
-#      if urlre.search(cmd):
-#        dourl(bot,conn,nick,cmd)
+    t=time.time()
+    if t - lastexp > expirevery:
+	    c.urlexpire(urldb,expirelen)
+	    lastexp=t
+
+    if public:
+      if c.urlre.search(cmd):
+        c.dourl(bot,conn,nick,cmd,urldb)
          
     # karma: up
     if command.endswith("++"):