diff --git a/Encyclopedia/__init__.py b/Encyclopedia/__init__.py index 82b5c04..559ac6c 100644 --- a/Encyclopedia/__init__.py +++ b/Encyclopedia/__init__.py @@ -24,7 +24,7 @@ import supybot import supybot.world as world from importlib import reload -__version__ = "3.8.0" +__version__ = "3.9.0" __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@gmail.com") __contributors__ = { supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'], diff --git a/Encyclopedia/plugin.py b/Encyclopedia/plugin.py index bcf1c04..b3273dd 100644 --- a/Encyclopedia/plugin.py +++ b/Encyclopedia/plugin.py @@ -190,7 +190,7 @@ class Encyclopedia(callbacks.Plugin): irc.replySuccess() except: irc.error('User %s is not registered' % name) - add = wrap(add, ['otherUser']) + add = wrap(add, ['nick']) def remove(self, irc, msg, args, name): """ @@ -206,7 +206,7 @@ class Encyclopedia(callbacks.Plugin): irc.replySuccess() except: irc.error('User %s is not registered or not an editor' % name) - remove = wrap(remove, ['otherUser']) + remove = wrap(remove, ['nick']) def editors(self, irc, msg, args): """takes no arguments @@ -922,9 +922,8 @@ class Encyclopedia(callbacks.Plugin): edit_rmsg = "Edited: None found" else: edit_rmsg = 'Edited: %s' % ', '.join(edit_ret) - irc.reply(auth_rmsg) - irc.reply(edit_rmsg) - lookup = wrap(lookup, [optional("otherUser"), optional("channel")]) + irc.reply("%s; %s" % (auth_rmsg, edit_rmsg)) + lookup = wrap(lookup, [optional("nick"), optional("channel")]) class ignore(callbacks.Commands): def add(self, irc, msg, args, banmask, expires, channel):