mention #urls

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 6049640b62fddce7749fa01f1d5b5b3c83b3099b..0075272c54d7f585291e3619217644f7744baf8c 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -327,6 +327,7 @@ class UrlLog:
 
 #(?:) is a regexp that doesn't group        
 urlre = re.compile("((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
+hturlre= re.compile("(http)(s?://[^ ]+)( |$)")
 urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused","a vastly overused"]
 
 ### Deal with /msg bot url or ~url in channel
@@ -346,6 +347,11 @@ def urlq(bot, cmd, nick, conn, public,urldb):
       T.count+=1
     bot.automsg(False,nick,complaint)
     T.lastasked=time.time()
+    #URL suppressed, so mention in #urls
+    if urlstring != cmd.split()[1]: #first argument to URL was not the url
+      conn.privmsg("#urls","%s remarks: %s" % (nick," ".join(cmd.split()[1:])))
+    else:
+      conn.privmsg("#urls","(via %s) %s"%(nick," ".join(cmd.split()[1:])))
   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")
@@ -390,6 +396,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):