move url stuff to commands.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 270955e8e36b6206ffa4e173dd03439c7c3a0e53..3fcdc01c7d9a143a881f028e697f0bc2090ab8c4 100644 (file)
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -140,74 +140,8 @@ 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
+c.urldb={}
 
 # Command processing: whenever something is said that the bot can hear,
 # "command" is invoked and must decide what to do.  This configuration
@@ -256,8 +190,8 @@ def command(bot, cmd, nick, conn, public):
            command=""
 
 #    if public:
-#      if urlre.search(cmd):
-#        dourl(bot,conn,nick,cmd)
+#      if c.urlre.search(cmd):
+#        c.dourl(bot,conn,nick,cmd)
          
     # karma: up
     if command.endswith("++"):

diff --git a/commands.py b/commands.py
index b2df479f8eef6f4ef0c0a2834f94721053942fd8..eac7bb71b0fc1d3a8eb1c9876ba4fa5c98657f7f 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -294,3 +294,75 @@ def rot13q(bot, cmd, nick, conn, public):
     b=a[13:]+a[:13]
     trans=string.maketrans(a+a.upper(),b+b.upper())
     conn.notice(nick, string.join(cmd.split()[1:]).translate(trans))
+
+### URL-tracking stuff
+
+### return a easy-to-read approximation of a time period
+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
+
+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()]]
+
+# canonicalise BBC URLs
+def canonical_url(urlstring):
+  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
+