def urltype(self):
z=min(len(urlcomplaints)-1, self.count-1)
return urlcomplaints[z]
-
-urlre = re.compile("(https?://[^ ]+)( |$)")
+
+#(?:) 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
def urlq(bot, cmd, nick, conn, public,urldb):
if (not urlre.search(cmd)):
- bot.automsg(False,nick,"Please use 'url' only with http URLs")
+ bot.automsg(False,nick,"Please use 'url' only with http, https, nsfw, or nsfws URLs")
return
urlstring=urlre.search(cmd).group(1)
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")
# canonicalise BBC URLs (internal use only)
def canonical_url(urlstring):
+ if "nsfw://" in urlstring or "nsfws://" in urlstring:
+ urlstring=urlstring.replace("nsfw","http",1)
if (urlstring.find("news.bbc.co.uk") != -1):
for middle in ("/low/","/mobile/"):
x = urlstring.find(middle)
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):
urlstring = urlre.search(cmd).group(1)
if (urlstring.find("twitter.com") !=-1):
stringout = getTweet(urlstring,twitapi)
- try:
- bot.automsg(public, nick, stringout)
- except UnicodeEncodeError:
- bot.automsg(public, nick, "Sorry, that tweet contained non-ASCII characters")
+ bot.automsg(public, nick, stringout)
def getTweet(urlstring,twitapi):
parts = string.split(urlstring,'/')
tweetID = parts[-1]
try:
status = twitapi.GetStatus(tweetID)
- tweeter_screen = status.user.screen_name
- tweeter_name = status.user.name
- tweetText = status.text
+ 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')
stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
except twitter.TwitterError:
terror = sys.exc_info()