Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-04 18:38:39 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bug with multiple criteria in the last command.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-09-05 03:34:37 +00:00
parent b1a40f1cfd
commit ea74e4e898
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/FunCommands.py
View File

@ -636,14 +636,14 @@ class FunCommands(callbacks.Privmsg):
for (option, arg) in optlist: for (option, arg) in optlist:
option = option.strip('-') option = option.strip('-')
if option == 'from': if option == 'from':
predicates.append(lambda m: m.nick == arg) predicates.append(lambda m, arg=arg: m.nick == arg)
elif option == 'in' or option == 'to': elif option == 'in' or option == 'to':
if not ircutils.isChannel(argument): if not ircutils.isChannel(arg):
irc.error(msg, 'Argument to --%s must be a channel.' % arg) irc.error(msg, 'Argument to --%s must be a channel.' % arg)
return return
predicates.append(lambda m: m.args[0] == arg) predicates.append(lambda m, arg=arg: m.args[0] == arg)
elif option == 'with': elif option == 'with':
predicates.append(lambda m: arg in m.args[1]) predicates.append(lambda m, arg=arg: arg in m.args[1])
elif option == 'regexp': elif option == 'regexp':
try: try:
r = utils.perlReToPythonRe(arg) r = utils.perlReToPythonRe(arg)
@ -656,9 +656,12 @@ class FunCommands(callbacks.Privmsg):
if first: if first:
first = False first = False
continue continue
if m.command != 'PRIVMSG': if not m.prefix or m.command != 'PRIVMSG':
continue continue
if all(bool, [f(m) for f in predicates]): for predicate in predicates:
if not predicate(m):
break
else:
if undecorated: if undecorated:
irc.reply(msg, m.args[1]) irc.reply(msg, m.args[1])
else: else: