chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blame: Put the filename in the loadblame result
[irc.git]
/
commands.py
diff --git
a/commands.py
b/commands.py
index f7444d1d52b09eb4bf13c71fd5f33d3bb17a1990..8cc34f03ac6f4dc4997b4f435523842bc7b40601 100755
(executable)
--- a/
commands.py
+++ b/
commands.py
@@
-1,8
+1,13
@@
# Part of Acrobat.
# Part of Acrobat.
-import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse
+import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse
, hashlib
from collections import defaultdict
from irclib import irc_lower, nm_to_n
from collections import defaultdict
from irclib import irc_lower, nm_to_n
+try:
+ from blame_filter import bfd
+except ImportError:
+ bfd = None
+
# query karma
def karmaq(bot, cmd, nick, conn, public, karma):
try:
# query karma
def karmaq(bot, cmd, nick, conn, public, karma):
try:
@@
-89,6
+94,7
@@
def troutq(bot, cmd, nick, conn, public, cfg):
me = bot.connection.get_nickname()
trout_msg = random.choice(fishlist)
fishpond.last=trout_msg
me = bot.connection.get_nickname()
trout_msg = random.choice(fishlist)
fishpond.last=trout_msg
+ fishpond.last_cfg=cfg
# The bot won't trout or flirt with itself;
if irc_lower(me) == irc_lower(target) or irc_lower(target) in synonyms:
target = nick
# The bot won't trout or flirt with itself;
if irc_lower(me) == irc_lower(target) or irc_lower(target) in synonyms:
target = nick
@@
-130,6
+136,7
@@
def slashq(bot, cmd, nick, conn, public, cfg):
me = bot.connection.get_nickname()
slash_msg = random.choice(fishlist)
fishpond.last=slash_msg
me = bot.connection.get_nickname()
slash_msg = random.choice(fishlist)
fishpond.last=slash_msg
+ fishpond.last_cfg=cfg
# The bot won't slash people with themselves
if irc_lower(who[0]) == irc_lower(who[1]):
conn.notice(nick, "oooooh no missus!")
# The bot won't slash people with themselves
if irc_lower(who[0]) == irc_lower(who[1]):
conn.notice(nick, "oooooh no missus!")
@@
-279,8
+286,12
@@
def __getcommitinfo(commit):
return(err)
ts,mes=out.split('|')
return(err)
ts,mes=out.split('|')
+ mes=mes.strip()
+ md5mes=hashlib.md5(mes).hexdigest()
+ if bfd and md5mes in bfd:
+ mes=bfd[md5mes]
when=datetime.date.fromtimestamp(float(ts))
when=datetime.date.fromtimestamp(float(ts))
- return mes
.strip()
, when
+ return mes, when
###Return an array of commit messages and timestamps for lines in db that match what
def __getcommits(db,keys,what):
###Return an array of commit messages and timestamps for lines in db that match what
def __getcommits(db,keys,what):
@@
-303,14
+314,21
@@
def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what):
sans=__getcommits(sdb,sdbk,what)
return tans+fans+sans
sans=__getcommits(sdb,sdbk,what)
return tans+fans+sans
-def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
+def blameq(bot,cmd,nick,conn,public,fish,cfgs):
+ tdb,tdbk,x = cfgs[0][7] # urgh, magic, to support magic knowledge below
+ fdb,fdbk,x = cfgs[1][7]
+ sdb,sdbk,x = cfgs[2][7]
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":
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)
+ if fish.last_cfg is None:
+ bot.automsg(public,nick,"Nothing")
+ return
+ xdb,xdbk,kindsfile = fish.last_cfg[7]
+ ans=__getcommits(xdb,xdbk,fish.last)
elif clist[1]=="#trouts" or clist[1]=="#trout":
ans=__getcommits(tdb,tdbk,cwhat)
elif clist[1]=="#flirts" or clist[1]=="#flirt":
elif clist[1]=="#trouts" or clist[1]=="#trout":
ans=__getcommits(tdb,tdbk,cwhat)
elif clist[1]=="#flirts" or clist[1]=="#flirt":
@@
-393,23
+411,33
@@
class UrlLog:
self.nick=nick
self.url=url
self.first=time.time()
self.nick=nick
self.url=url
self.first=time.time()
+ self.localfirst=time.localtime(self.first)
self.count=1
self.lastseen=time.time()
self.lastasked=time.time()
def recenttime(self):
return max(self.lastseen,self.lastasked)
def firstmen(self):
self.count=1
self.lastseen=time.time()
self.lastasked=time.time()
def recenttime(self):
return max(self.lastseen,self.lastasked)
def firstmen(self):
- return nicetime(time.time()-self.first)
+ n=time.localtime(time.time())
+ s="%02d:%02d" % (self.localfirst.tm_hour,self.localfirst.tm_min)
+ if n.tm_yday != self.localfirst.tm_yday:
+ s+=time.strftime(" on %d %B", self.localfirst)
+ return s
def urltype(self):
def urltype(self):
- z=min(len(url
complaint
s)-1, self.count-1)
- return url
complaint
s[z]
+ z=min(len(url
info
s)-1, self.count-1)
+ return url
info
s[z]
#(?:) 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?://[^ ]+)( |$)")
#(?:) 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"]
+#How long (in s) to wait since the most recent mention before commenting
+url_repeat_time = 300
+urlinfos = ["a new",
+ "a fascinating",
+ "an interesting",
+ "a popular"]
### Deal with /msg bot url or ~url in channel
def urlq(bot, cmd, nick, conn, public,urldb):
### Deal with /msg bot url or ~url in channel
def urlq(bot, cmd, nick, conn, public,urldb):
@@
-421,12
+449,12
@@
def urlq(bot, cmd, nick, conn, public,urldb):
url=canonical_url(urlstring)
if (url in urldb):
T = urldb[url]
url=canonical_url(urlstring)
if (url in urldb):
T = urldb[url]
- com
plaint="That's %s URL that was first mentioned %s by
%s" % \
- (T.
urltype(),T.firstmen(),T.nick
)
+ com
ment="I saw that URL in scrool, first mentioned by %s at
%s" % \
+ (T.
nick,T.firstmen()
)
if (public):
if (public):
- com
plaint=complai
nt+". Furthermore it defeats the point of this command to use it other than via /msg."
+ com
ment=comme
nt+". Furthermore it defeats the point of this command to use it other than via /msg."
T.count+=1
T.count+=1
- bot.automsg(False,nick,com
plai
nt)
+ bot.automsg(False,nick,com
me
nt)
T.lastasked=time.time()
#URL suppressed, so mention in #urls
if urlstring != cmd.split()[1]: #first argument to URL was not the url
T.lastasked=time.time()
#URL suppressed, so mention in #urls
if urlstring != cmd.split()[1]: #first argument to URL was not the url
@@
-450,9
+478,10
@@
def dourl(bot,conn,nick,command,urldb):
if urlstring in urldb:
T=urldb[urlstring]
if urlstring in urldb:
T=urldb[urlstring]
- message="observes %s URL, first mentioned %s by %s" % \
- (T.urltype(),T.firstmen(),T.nick)
- if shibboleth.search(command)==None:
+ message="saw that URL in scrool, first mentioned by %s at %s" % \
+ (T.nick,T.firstmen())
+ if shibboleth.search(command)==None and \
+ time.time() - T.lastseen > url_repeat_time:
conn.action(bot.channel, message)
T.lastseen=time.time()
T.count+=1
conn.action(bot.channel, message)
T.lastseen=time.time()
T.count+=1
@@
-502,13
+531,13
@@
def twitterq(bot,cmd,nick,conn,public,twitapi):
for stringout in stringsout:
bot.automsg(public, nick, stringout)
for stringout in stringsout:
bot.automsg(public, nick, stringout)
-def getTweet(urlstring,twitapi,inclusion=False):
+def getTweet(urlstring,twitapi,inclusion=False
,recurlvl=0
):
unobfuscate_urls=True
expand_included_tweets=True
stringsout=[]
unobfuscate_urls=True
expand_included_tweets=True
stringsout=[]
-
- pa
rts = string.split(urlstring,'/')
- tweetID = pa
rts
[-1]
+
+ pa
th = urlparse.urlparse(urlstring).path
+ tweetID = pa
th.split('/')
[-1]
try:
status = twitapi.GetStatus(tweetID)
if status == {}:
try:
status = twitapi.GetStatus(tweetID)
if status == {}:
@@
-576,14
+605,17
@@
def getTweet(urlstring,twitapi,inclusion=False):
else:
toReplace = '%s://%s%s' % (rv.scheme, rv.hostname, rv.path) # leave off the final '?'
else:
toReplace = '%s://%s%s' % (rv.scheme, rv.hostname, rv.path) # leave off the final '?'
- if expand_included_tweets
and not inclusion
:
+ if expand_included_tweets:
if rv.hostname == 'twitter.com' and re.search(r'status/\d+',rv.path):
if rv.hostname == 'twitter.com' and re.search(r'status/\d+',rv.path):
- quotedtweet = getTweet(toReplace, twitapi, inclusion=True) # inclusion parameter limits recursion.
- if not quotedtweet:
- quotedtweet = [""]
- quotedtweet[0] = "Q{ " + quotedtweet[0]
- quotedtweet[-1] += " }"
- stringsout = quotedtweet + stringsout
+ if recurlvl > 2:
+ stringsout = [ "{{ Recursion level too high }}" ] + stringsout
+ else:
+ quotedtweet = getTweet(toReplace, twitapi, inclusion=True, recurlvl=recurlvl+1) # inclusion parameter limits recursion.
+ if not quotedtweet:
+ quotedtweet = [""]
+ quotedtweet[0] = "Q{ " + quotedtweet[0]
+ quotedtweet[-1] += " }"
+ stringsout = quotedtweet + stringsout
tweetText = tweetText.replace(url.url, toReplace)
tweetText = tweetText.replace(url.url, toReplace)