Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Made @karma++ not return [karma++].

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-25 07:23:36 +00:00
parent a92798c9d8
commit d73abebb36
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/callbacks.py
View File

@ -238,7 +238,12 @@ def tokenize(s):
debug.msg('tokenize took %s seconds.' % (time.time() - start), 'verbose') debug.msg('tokenize took %s seconds.' % (time.time() - start), 'verbose')
return args return args
def findCallbackForCommand(irc, commandName):
for callback in irc.callbacks:
if hasattr(callback, 'isCommand'):
if callback.isCommand(commandName):
return callback
return None
class IrcObjectProxy: class IrcObjectProxy:
def __init__(self, irc, msg, args): def __init__(self, irc, msg, args):
@ -251,11 +256,8 @@ class IrcObjectProxy:
self.evalArgs() self.evalArgs()
def findCallback(self, commandName): def findCallback(self, commandName):
for callback in self.irc.callbacks: # Mostly for backwards compatibility now.
if hasattr(callback, 'isCommand'): return findCallbackForCommand(self.irc, commandName)
if callback.isCommand(commandName):
return callback
return None
def evalArgs(self): def evalArgs(self):
while self.counter < len(self.args): while self.counter < len(self.args):
@ -292,7 +294,10 @@ class IrcObjectProxy:
callback.callCommand(command, self, self.msg, self.args) callback.callCommand(command, self, self.msg, self.args)
else: else:
self.args.insert(0, name) self.args.insert(0, name)
self.reply(self.msg, '[%s]' % ' '.join(self.args)) if not isinstance(self.irc, irclib.Irc):
# If self.irc is an actual irclib.Irc, then this is the
# first command given, and should be ignored as usual.
self.reply(self.msg, '[%s]' % ' '.join(self.args))
except ArgumentError: except ArgumentError:
if hasattr(command, '__doc__'): if hasattr(command, '__doc__'):
self.reply(self.msg, command.__doc__.splitlines()[0]) self.reply(self.msg, command.__doc__.splitlines()[0])
@ -451,7 +456,7 @@ class Privmsg(irclib.IrcCallback):
funcname = f.im_func.func_name funcname = f.im_func.func_name
debug.msg('%s took %s seconds' % (funcname, elapsed), 'verbose') debug.msg('%s took %s seconds' % (funcname, elapsed), 'verbose')
_r = re.compile(r'^([\w_-]+)') _r = re.compile(r'^([\w_-]+)(?:\s+|$)')
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
s = addressed(irc.nick, msg) s = addressed(irc.nick, msg)
#debug.printf('Privmsg.doPrivmsg: s == %r' % s) #debug.printf('Privmsg.doPrivmsg: s == %r' % s)