X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=Servus-chiark.py;h=26d46a1f32aa8d7322b3395ccb6590141b444446;hp=51c4bbc19478a9e7c390708e15ff4ef2ad900af0;hb=590d87b4535433f64c5490d521c95fd0589cc817;hpb=1e09d53a375bde7a0cc07b01b821f088c2227834 diff --git a/Servus-chiark.py b/Servus-chiark.py old mode 100644 new mode 100755 index 51c4bbc..26d46a1 --- a/Servus-chiark.py +++ b/Servus-chiark.py @@ -24,7 +24,9 @@ # Acrobat configuration file # The following definitions are required to be present in this module: -server = "rapun" +# You can also override them on the command-line +# e.g. python acrobat.py Servus-chiark nickname=testbot channel=\#test owner=MyNick +server = "chiark" port = 6667 nickname = "Servus" channel = "#chiark" @@ -33,7 +35,7 @@ owner = "Emperor" # Everything else in this file is configuration-specific. -import os, time, re +import os, time, re, twitter, subprocess, sys # Most command implementations are stored in a separate module. import commands as c @@ -49,6 +51,30 @@ class fish: DoS=0 Boring_Git='Nobody' quotatime=0 + last="" + +# load the "blame" details for a file +def loadblame(filename): + p=subprocess.Popen(["git","blame","-s",filename], + stdout=subprocess.PIPE,stderr=subprocess.PIPE) + out,err=p.communicate() + if len(err)>0: + sys.exit("git blame failure: %s" % err) + bdb={} + lines=out.split("\n") + for line in lines: + l=line.split() + if len(line.strip())>0: + commit=l[0] + thing=' '.join(l[2:]) + bdb[thing]=commit + keys=bdb.keys() + return bdb,keys + +#set up blame dbs for trouts/flirts/slashes +tbdb,tbdbk=loadblame("trouts") +fbdb,fbdbk=loadblame("flirts") +sbdb,sbdbk=loadblame("slashes") # load a file full of flirts or trouts def __load(filename): @@ -101,7 +127,7 @@ def fishq(bot, cmd, nick, conn, public,f): # Karma implementation import cPickle -karmafilename = "chiark-karma" +karmafilename = "chiark-karma-"+channel # load the karma db try: f = open(karmafilename, "r") @@ -132,87 +158,16 @@ def quit(bot,cmd,nick,conn,public): def reload(bot,cmd,nick,conn,public): c.reloadq(bot,cmd,nick,conn,public) -#The game... -class game: - trigger="Servus" - grace=time.time() - minlose=24*60*60 #1 day - maxlose=14*minlose #2 weeks - losetime=time.time()+300000 +# initialise the urldb on startup +urldb={} +lastexp=time.time() +#expire urls if not asked about or seen for >71 hours +expirelen=71*60*60 +#do an expiry run every hour +expirevery=60*60 -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): - print "debug: ",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:]) - print "##",url,"##" - - 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()]] - print [bot, cmd, nick, conn] - -def dourl(bot,conn,nick,command): - urlstring=urlre.search(command).group(1) - print "dourl: ",urlstring - urlstring=canonical_url(urlstring) - - if urlstring in urldb: - T=urldb[urlstring] - print T - 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()]] +# non-authenticated twitter api instance +twitapi = twitter.Api() # Command processing: whenever something is said that the bot can hear, # "command" is invoked and must decide what to do. This configuration @@ -234,12 +189,16 @@ commands = {"karma": (c.karmaq,karmadb), "die": quit, "define": c.defineq, "google": c.googleq, - "url": urlq, + "url": (c.urlq,urldb), + "nsfw": (c.nsfwq,urldb), + "nws": (c.nsfwq,urldb), "units": c.unitq, + "currency":c.currencyq, + "blame": (c.blameq,fish,tbdb,tbdbk,fbdb,fbdbk,sbdb,sbdbk), "help": c.helpq, -# "game": (c.gameq,game), "say": c.sayq, - "do": c.doq } + "do": c.doq, + "twit": (c.twitterq,twitapi) } # disconnect and hop annoy people # "disconnect": c.disconnq, # "hop": c.disconnq } @@ -249,6 +208,7 @@ triggers = ("!", "~") # what character should the bot be invoked by: # eg !trout, ~trout etc. def command(bot, cmd, nick, conn, public): + global urldb,lastexp,expirelen,expirevery,twitapi ours=0 try: if public and cmd[0] in triggers: @@ -260,10 +220,15 @@ def command(bot, cmd, nick, conn, public): except IndexError: command="" + t=time.time() + if t - lastexp > expirevery: + c.urlexpire(urldb,expirelen) + lastexp=t + if public: - if cmd.find("http") != -1: - dourl(bot,conn,nick,cmd) - + if c.urlre.search(cmd) and command.lower()!="url": + c.dourl(bot,conn,nick,cmd,urldb) + # karma: up if command.endswith("++"): karma(cmd,1) @@ -277,11 +242,3 @@ def command(bot, cmd, nick, conn, public): e(bot,cmd,nick,conn,public) else: e[0](bot,cmd,nick,conn,public,*e[1:]) -# elif public: -# if cmd.find("GAME")!=-1: #someone else lost -# grace.grace=time.time()+60*20 -# elif cmd.find(game.trigger)!=-1 and len(game.trigger)>2: #we lost! -# c.gameq(bot,"pad "+game.trigger,bot.owner,conn,False,game) -# elif time.time()>game.losetime: #we randomly lost, take new trigger -# c.gameq(bot,cmd,bot.owner,conn,False,game) -#