chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coding style: Whitespace fixes in tweet handling
[irc.git]
/
commands.py
diff --git
a/commands.py
b/commands.py
index 6c5653dc9dd42119b80d1ea6a784007e762a1205..512b4f7e3a0a634741ffd21ec955cfb642e7d311 100755
(executable)
--- a/
commands.py
+++ b/
commands.py
@@
-54,10
+54,14
@@
def infoq(bot, cmd, nick, conn, public, karma):
bot.owner, len(karma.keys())))
class FishPond:
bot.owner, len(karma.keys())))
class FishPond:
- DoS=0
- quotatime=0
- last=""
- last_cfg=None
+ def __init__(fishpond):
+ fishpond.last=[]
+ fishpond.DoS=0
+ fishpond.quotatime=0
+
+ def note_last(fishpond, msg, cfg):
+ fishpond.last.insert(0,(msg,cfg))
+ fishpond.last = fishpond.last[0:10]
# Check on fish stocks
def fish_quota(pond):
# Check on fish stocks
def fish_quota(pond):
@@
-99,8
+103,7
@@
def troutq(bot, cmd, nick, conn, public, cfg):
return
me = bot.connection.get_nickname()
trout_msg = random.choice(fishlist)
return
me = bot.connection.get_nickname()
trout_msg = random.choice(fishlist)
- fishpond.last=trout_msg
- fishpond.last_cfg=cfg
+ fishpond.note_last(trout_msg,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
@@
-141,8
+144,7
@@
def slashq(bot, cmd, nick, conn, public, cfg):
return
me = bot.connection.get_nickname()
slash_msg = random.choice(fishlist)
return
me = bot.connection.get_nickname()
slash_msg = random.choice(fishlist)
- fishpond.last=slash_msg
- fishpond.last_cfg=cfg
+ fishpond.note_last(slash_msg,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!")
@@
-320,7
+322,7
@@
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,cfgs):
+def blameq(bot,cmd,nick,conn,public,fish
pond
,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]
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]
@@
-331,11
+333,19
@@
def blameq(bot,cmd,nick,conn,public,fish,cfgs):
cwhat=' '.join(clist[2:])
kindsfile = "fish?"
if clist[1]=="#last":
cwhat=' '.join(clist[2:])
kindsfile = "fish?"
if clist[1]=="#last":
- if fish.last_cfg is None:
+ try:
+ n = abs(int(clist[2]))-1
+ if n < 0: raise ValueError
+ except IndexError: n = 0
+ except ValueError:
+ bot.automsg(public,nick,"Huh?")
+ return
+ try: lmsg, lcfg = fishpond.last[n]
+ except IndexError:
bot.automsg(public,nick,"Nothing")
return
bot.automsg(public,nick,"Nothing")
return
- xdb,xdbk,kindsfile =
fish.last_
cfg[7]
- ans=__getcommits(xdb,xdbk,
fish.last
)
+ xdb,xdbk,kindsfile =
l
cfg[7]
+ ans=__getcommits(xdb,xdbk,
lmsg
)
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":
@@
-561,12
+571,11
@@
def getTweet(urlstring,twitapi,inclusion=False,recurlvl=0):
tweeter_name = tweeter_name + " RTing " + status.user.name #.encode('UTF-8', 'replace')
tweetText = status.full_text
if status.media:
tweeter_name = tweeter_name + " RTing " + status.user.name #.encode('UTF-8', 'replace')
tweetText = status.full_text
if status.media:
- replacements = defaultdict(
list
)
+ replacements = defaultdict(
list
)
for medium in status.media:
replacements[medium.url].append(medium.media_url_https)
for k,v in replacements.items():
for medium in status.media:
replacements[medium.url].append(medium.media_url_https)
for k,v in replacements.items():
-
v = [re.sub(r"/tweet_video_thumb/([\w\-]+).jpg", r"/tweet_video/\1.mp4", link) for link in v]
if len(v) > 1:
replacementstring = "[" + " ; ".join(v) +"]"
v = [re.sub(r"/tweet_video_thumb/([\w\-]+).jpg", r"/tweet_video/\1.mp4", link) for link in v]
if len(v) > 1:
replacementstring = "[" + " ; ".join(v) +"]"