X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=commands.py;h=38769876bff1ff5a4a730f78f6f95c729952475c;hp=c6f27770b539e158ab71d622908e34816bdc6138;hb=426774374f607b0961b9ea30cee0fa8ae4927441;hpb=f5ab0a0673f92f224c105b2e59e3b064d697d1b5 diff --git a/commands.py b/commands.py old mode 100644 new mode 100755 index c6f2777..3876987 --- a/commands.py +++ b/commands.py @@ -1,5 +1,5 @@ # Part of Acrobat. -import string, cPickle, random, urllib, sys, time, re, os +import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime from irclib import irc_lower, nm_to_n # query karma @@ -36,7 +36,7 @@ def karmadelq(bot, cmd, nick, conn, public, karma): # help - provides the URL of the help file def helpq(bot, cmd, nick, conn, public): bot.automsg(public,nick, - "For help see http://www.pick.ucam.org/~matthew/irc/servus.html") + "For help see http://www.chiark.greenend.org.uk/~matthewv/irc/servus.html") # query bot status @@ -61,6 +61,9 @@ def fish_quota(pond): pond.cur_fish=pond.max_fish pond.quotatime=time.time() +# List of things the bot might be called to work round the self-trouting code +synonyms=["itself","the bot","themself"] + # trout someone, or flirt with them def troutq(bot, cmd, nick, conn, public, cfg): fishlist=cfg[0] @@ -84,8 +87,9 @@ def troutq(bot, cmd, nick, conn, public, cfg): return me = bot.connection.get_nickname() trout_msg = random.choice(fishlist) + fishpond.last=trout_msg # The bot won't trout or flirt with itself; - if irc_lower(me) == irc_lower(target): + if irc_lower(me) == irc_lower(target) or irc_lower(target) in synonyms: target = nick # There's a chance the game may be given away if the request was not # public... @@ -124,13 +128,14 @@ def slashq(bot, cmd, nick, conn, public, cfg): return me = bot.connection.get_nickname() slash_msg = random.choice(fishlist) + fishpond.last=slash_msg # The bot won't slash people with themselves if irc_lower(who[0]) == irc_lower(who[1]): conn.notice(nick, "oooooh no missus!") return # The bot won't slash with itself, instead slashing the requester for n in [0,1]: - if irc_lower(me) == irc_lower(who[n]): + if irc_lower(me) == irc_lower(who[n]) or irc_lower(who[n]) in synonyms: who[n] = nick # Perhaps someone asked to slash themselves with the bot then we get if irc_lower(who[0]) == irc_lower(who[1]): @@ -154,9 +159,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 +192,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 +219,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)) @@ -257,6 +247,94 @@ def defineq(bot, cmd, nick, conn, public): except IOError: # if the connection times out. This blocks. :( bot.automsg(public,nick,"The web's broken. Waah!") +# Look up a currency conversion via xe.com +def currencyq(bot, cmd, nick, conn, public): + args = ' '.join(cmd.split()[1:]).split(' as ') + if len(args) != 2 or len(args[0]) != 3 or len(args[1]) != 3: + conn.notice(nick, "syntax: currency arg1 as arg2") + return + targ = ("http://www.xe.com/ucc/convert.cgi?From=%s&To=%s" % (args[0], args[1])) + try: + currencypage = urllib.urlopen(targ).read() + match = re.search(r"(1 %s = [\d\.]+ %s)" % (args[0].upper(),args[1].upper()),currencypage,re.MULTILINE) + if match == None: + bot.automsg(public,nick,"Dear Chief Secretary, there is no money.") + else: + conversion = match.group(1); + conversion = conversion.replace(' ',' '); + bot.automsg(public,nick,conversion + " (from xe.com)") + except IOError: # if the connection times out. This blocks. :( + bot.automsg(public,nick,"The web's broken. Waah!") + + +### extract the commit message and timestamp for commit +def __getcommitinfo(commit): + cmd=["git","log","-n","1","--pretty=format:%ct|%s",commit] + x=subprocess.Popen(cmd, + stdout=subprocess.PIPE,stderr=subprocess.PIPE) + out,err=x.communicate() + + if len(err): + return(err) + + ts,mes=out.split('|') + when=datetime.date.fromtimestamp(float(ts)) + return mes.strip(), when + +###Return an array of commit messages and timestamps for lines in db that match what +def __getcommits(db,keys,what): + ans=[] + for k in keys: + if what in k: + ret=__getcommitinfo(db[k]) + if len(ret)==1: #error message + return ["Error message from git blame: %s" % ret] + else: + ans.append( (k,ret[0],ret[1]) ) + return ans + +###search all three databases for what +def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what): + if what.strip()=="": + return [] + tans=__getcommits(tdb,tdbk,what) + fans=__getcommits(fdb,fdbk,what) + sans=__getcommits(sdb,sdbk,what) + return tans+fans+sans + +def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk): + clist=cmd.split() + if len(clist) < 2: + bot.automsg(public,nick,"Who or what do you want to blame?") + return + cwhat=' '.join(clist[2:]) + if clist[1]=="#last": + ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last) + elif clist[1]=="#trouts" or clist[1]=="#trout": + ans=__getcommits(tdb,tdbk,cwhat) + elif clist[1]=="#flirts" or clist[1]=="#flirt": + ans=__getcommits(fdb,fdbk,cwhat) + elif clist[1]=="#slashes" or clist[1]=="#slash": + ans=__getcommits(sdb,sdbk,cwhat) + else: + cwhat=' '.join(clist[1:]) + ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,cwhat) + if len(ans)==0: + bot.automsg(public,nick,"No match found") + elif len(ans)==1: + if len(ans[0])==1: + bot.automsg(public,nick,ans[0]) + else: + bot.automsg(public,nick,"Modified %s: %s" % (ans[0][2].isoformat(),ans[0][1])) + elif len(ans)>4: + bot.automsg(public,nick,"I found %d matches, which is too many. Please be more specific!" % (len(ans)) ) + else: + for a in ans: + if len(a)==1: + bot.automsg(public,nick,a) + else: + bot.automsg(public,nick,"'%s' modified on %s: %s" % (a[0],a[2].isoformat(),a[1])) + ### say to msg/channel def sayq(bot, cmd, nick, conn, public): if irc_lower(nick) == irc_lower(bot.owner): @@ -324,19 +402,22 @@ class UrlLog: 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(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 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 - url="".join(cmd.split(" ")[1:]) - - url=canonical_url(url) + urlstring=urlre.search(cmd).group(1) + url=canonical_url(urlstring) if (url in urldb): T = urldb[url] complaint="That's %s URL that was first mentioned %s by %s" % \ @@ -346,12 +427,19 @@ 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") else: - conn.privmsg(bot.channel,"%s would like to draw your attention to %s"%(nick,url)) - bot.automsg(False,nick,"That URL was unique; I have posted it into IRC") + if urlstring != cmd.split()[1]: #first argument to URL was not the url + conn.privmsg(bot.channel,"%s remarks: %s" % (nick," ".join(cmd.split()[1:]))) + else: + conn.privmsg(bot.channel,"(via %s) %s"%(nick," ".join(cmd.split()[1:]))) urldb[url]=UrlLog(url,nick) ### Deal with URLs spotted in channel @@ -363,7 +451,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: @@ -378,6 +467,8 @@ def urlexpire(urldb,expire): # 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) @@ -385,3 +476,49 @@ 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): + + if (not urlre.search(cmd)): + bot.automsg(False,nick,"Please use 'twit' only with http URLs") + return + + urlstring = urlre.search(cmd).group(1) + if (urlstring.find("twitter.com") !=-1): + stringout = getTweet(urlstring,twitapi) + bot.automsg(public, nick, stringout) + +def getTweet(urlstring,twitapi): + parts = string.split(urlstring,'/') + tweetID = parts[-1] + try: + status = twitapi.GetStatus(tweetID) + #print status, type(status), status=={} + if status == {}: + return "twitapi.GetStatus returned nothing :-(" + if status.user == None and status.text == None: + return "Empty status object returned :(" + if status.user is not None: + tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace') + tweeter_name = status.user.name.encode('UTF-8', 'replace') + else: + tweeter_screen = "[not returned]" ; tweeter_name = "[not returned]" + 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() + stringout = "Twitter error: %s" % terror[1].__str__() + return stringout