chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new flirt from rejs
[irc.git]
/
commands.py
diff --git
a/commands.py
b/commands.py
old mode 100644
(file)
new mode 100755
(executable)
index
bbcaeb8
..
8c22d29
--- a/
commands.py
+++ b/
commands.py
@@
-125,6
+125,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
# 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!")
@@
-300,6
+301,9
@@
def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what):
def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
clist=cmd.split()
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)
cwhat=' '.join(clist[2:])
if clist[1]=="#last":
ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last)
@@
-318,7
+322,7
@@
def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
if len(ans[0])==1:
bot.automsg(public,nick,ans[0])
else:
if len(ans[0])==1:
bot.automsg(public,nick,ans[0])
else:
- bot.automsg(public,nick,"
Add
ed %s: %s" % (ans[0][2].isoformat(),ans[0][1]))
+ bot.automsg(public,nick,"
Modifi
ed %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:
elif len(ans)>4:
bot.automsg(public,nick,"I found %d matches, which is too many. Please be more specific!" % (len(ans)) )
else:
@@
-326,7
+330,7
@@
def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
if len(a)==1:
bot.automsg(public,nick,a)
else:
if len(a)==1:
bot.automsg(public,nick,a)
else:
- bot.automsg(public,nick,"'%s'
add
ed on %s: %s" % (a[0],a[2].isoformat(),a[1]))
+ bot.automsg(public,nick,"'%s'
modifi
ed on %s: %s" % (a[0],a[2].isoformat(),a[1]))
### say to msg/channel
def sayq(bot, cmd, nick, conn, public):
### say to msg/channel
def sayq(bot, cmd, nick, conn, public):