new trout from rjk

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 08faf54c7b0c386bee1699cef811dffef264f5c4..d22655e7fab72147322a6a03afba55e1fd1a1d4a 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -154,9 +154,9 @@ def unitq(bot, cmd, nick, conn, public):
             conn.notice(nick, "syntax: units arg1 as arg2")
             return
     if args[1]=='?':
-        sin,sout=os.popen2(["units","--verbose",args[0]],"r")
+        sin,sout=os.popen4(["units","--verbose","--",args[0]],"r")
     else:
-        sin,sout=os.popen2(["units","--verbose",args[0],args[1]],"r")
+        sin,sout=os.popen4(["units","--verbose","--",args[0],args[1]],"r")
     sin.close()
     res=sout.readlines()
     #popen2 doesn't clean up the child properly. Do this by hand
@@ -187,24 +187,6 @@ def reloadq(bot, cmd, nick, conn, public):
         bot.automsg(public,nick,
                "Configuration can only be reloaded by my owner, by /msg.")
 
-# lose the game and/or install a new trigger word
-def gameq(bot, cmd, nick, conn, public, game):
-    #only install a new trigger if it's not too short.
-    if len(' '.join(cmd.split()[1:]))>2:
-        game.trigger=' '.join(cmd.split()[1:])
-    if (time.time()> game.grace):
-        if not public:
-            if irc_lower(nick) == irc_lower(bot.owner):
-                conn.action(bot.channel,"loses the game!")
-            else:
-                conn.privmsg(bot.channel,nick+" just lost the game!")
-    else:
-        if not public:
-            conn.notice(nick, "It's a grace period!")
-    game.grace=time.time()+60*20 #20 minutes' grace
-    game.losetime=time.time()+random.randrange(game.minlose,game.maxlose)
-    conn.notice(bot.owner, str(game.losetime-time.time())+" "+game.trigger)
-
 # quit irc
 def quitq(bot, cmd, nick, conn, public):
     if irc_lower(nick) == irc_lower(bot.owner):
@@ -232,6 +214,9 @@ def googleq(bot, cmd, nick, conn, public):
 
 # Look up the definition of something using google
 def defineq(bot, cmd, nick, conn, public):
+    #this doesn't work any more
+    bot.automsg(public,nick,"'define' is broken because google are bastards :(")
+    return
     cmdrest = string.join(cmd.split()[1:])
     targ = ("http://www.google.co.uk/search?q=define%%3A%s&ie=utf-8&oe=utf-8"
             % urllib.quote_plus(cmdrest))
@@ -326,7 +311,10 @@ class UrlLog:
         return urlcomplaints[z]
 
 #(?:) is a regexp that doesn't group        
-urlre = re.compile("((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
+urlre = re.compile(r"((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
+hturlre= re.compile(r"(http)(s?://[^ ]+)( |$)")
+#matches \bre\:?\s+ before a regexp; (?i)==case insensitive match
+shibboleth = re.compile(r"(?i)\bre\:?\s+((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
 urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused","a vastly overused"]
 
 ### Deal with /msg bot url or ~url in channel
@@ -371,7 +359,8 @@ def dourl(bot,conn,nick,command,urldb):
     T=urldb[urlstring]
     message="observes %s URL, first mentioned %s by %s" % \
              (T.urltype(),T.firstmen(),T.nick)
-    conn.action(bot.channel, message)
+    if shibboleth.search(command)==None:
+        conn.action(bot.channel, message)
     T.lastseen=time.time()
     T.count+=1
   else:
@@ -395,6 +384,17 @@ def canonical_url(urlstring):
         urlstring.replace(middle,"/hi/")
   return urlstring
 
+# automatically make nsfw urls for you and pass them on to url
+def nsfwq(bot,cmd,nick,conn,public,urldb):
+  if (not hturlre.search(cmd)):
+    bot.automsg(False,nick,"Please use 'nsfw' only with http or https URLs")
+    return
+  newcmd=hturlre.sub(nsfwify,cmd)
+  urlq(bot,newcmd,nick,conn,public,urldb)
+
+def nsfwify(match):
+    a,b,c=match.groups()
+    return 'nsfw'+b+c
 
 #get tweet text
 def twitterq(bot,cmd,nick,conn,public,twitapi):
@@ -416,6 +416,7 @@ def getTweet(urlstring,twitapi):
     tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
     tweeter_name = status.user.name.encode('UTF-8', 'replace')
     tweetText = status.text.encode('UTF-8', 'replace')
+    tweetText = tweetText.replace('\n',' ')
     stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
   except twitter.TwitterError:
     terror = sys.exc_info()