chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add the 'reload' command to the list output
[irc.git]
/
acrobat-chiark-0.2.py
diff --git
a/acrobat-chiark-0.2.py
b/acrobat-chiark-0.2.py
index 6cb3bfdccd46b113185aa336dadbf095112fd4a5..f520749ea7b233833cf7cb0174c106ec77b7ece0 100755
(executable)
--- a/
acrobat-chiark-0.2.py
+++ b/
acrobat-chiark-0.2.py
@@
-50,6
+50,8
@@
class Acrobat(SingleServerIRCBot):
self.channel = channel
self.owner = owner
self.quotatime = time.time()
self.channel = channel
self.owner = owner
self.quotatime = time.time()
+ #List of known !commands we respond to
+ self.known =['karma','trout','info','die','quiet','list','google','say','do','reload']
#Configurable stuff - how often do we add how many fish?
self.cur_fish=5
self.max_fish=5 #Maximum of 5 fish
#Configurable stuff - how often do we add how many fish?
self.cur_fish=5
self.max_fish=5 #Maximum of 5 fish
@@
-159,6
+161,10
@@
class Acrobat(SingleServerIRCBot):
conn.notice(nick, "My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))
conn.notice(nick, "My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))
+ # list know commands
+ def listq(self, cmd, nick, conn, public):
+ conn.notice(nick, "%s" % string.join(self.known))
+
# trout someone
def troutq(self, cmd, nick, conn, public):
self.fish_quota()
# trout someone
def troutq(self, cmd, nick, conn, public):
self.fish_quota()
@@
-166,7
+172,7
@@
class Acrobat(SingleServerIRCBot):
conn.notice(nick, "Sorry, but %s is being a spoilsport." %
self.Boring_Git)
return
conn.notice(nick, "Sorry, but %s is being a spoilsport." %
self.Boring_Git)
return
- if self.cur_fish
=
= 0:
+ if self.cur_fish
<
= 0:
conn.notice(nick, "Fish stocks exhausted.")
else:
self.cur_fish -=1
conn.notice(nick, "Fish stocks exhausted.")
else:
self.cur_fish -=1
@@
-181,10
+187,8
@@
class Acrobat(SingleServerIRCBot):
if me.lower() == target.lower():
target = nick
if public == 0:
if me.lower() == target.lower():
target = nick
if public == 0:
- if random.random() <= 0.25:
- trout_msg+= ' (at the instigation of '
- trout_msg+=nick
- trout_msg+= ')'
+ if random.random() <= 0.1:
+ trout_msg+= ' (at the instigation of %s)' % nick
conn.action(self.channel, trout_msg % target)
except IndexError:
conn.notice(nick, "Who do you wish me to trout?")
conn.action(self.channel, trout_msg % target)
except IndexError:
conn.notice(nick, "Who do you wish me to trout?")
@@
-224,6
+228,8
@@
class Acrobat(SingleServerIRCBot):
if self.cur_fish>self.max_fish:
self.cur_fish=self.max_fish
self.quotatime=time.time()
if self.cur_fish>self.max_fish:
self.cur_fish=self.max_fish
self.quotatime=time.time()
+ print self.cur_fish
+ print self.quotatime
# quit irc
def quit(self, cmd, nick, conn, public):
# quit irc
def quit(self, cmd, nick, conn, public):
@@
-250,17
+256,17
@@
class Acrobat(SingleServerIRCBot):
if public == 0:
conn.notice(nick, str(gsearch))
else: # we haven't found anything.
if public == 0:
conn.notice(nick, str(gsearch))
else: # we haven't found anything.
- conn.privmsg(
nick
, str(gsearch))
+ conn.privmsg(
self.channel
, str(gsearch))
else:
if public == 0:
conn.notice(nick, "No pages found.")
else:
else:
if public == 0:
conn.notice(nick, "No pages found.")
else:
- conn.privmsg(
nick
, "No pages found.")
+ conn.privmsg(
self.channel
, "No pages found.")
except IOError: # if the connection times out. This blocks. :(
if public == 0:
conn,notice(nick, "The web's broken. Waah!")
else:
except IOError: # if the connection times out. This blocks. :(
if public == 0:
conn,notice(nick, "The web's broken. Waah!")
else:
- conn.privmsg(
nick
, "The web's broken. Waah!")
+ conn.privmsg(
self.channel
, "The web's broken. Waah!")
# General query handler
def do_command(self, nick, cmd, public=0):
# General query handler
def do_command(self, nick, cmd, public=0):
@@
-281,6
+287,9
@@
class Acrobat(SingleServerIRCBot):
if cmd == "info":
self.infoq(cmd, nick, conn, public)
if cmd == "info":
self.infoq(cmd, nick, conn, public)
+ # Known commands
+ if cmd == "list":
+ self.listq(cmd, nick, conn, public)
# weaponry
if cmd.split()[0] == "trout":
self.troutq(cmd, nick, conn, public)
# weaponry
if cmd.split()[0] == "trout":
self.troutq(cmd, nick, conn, public)