From 046b3a5b43428ceb767609bf0ffd6fdd27191527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= Date: Sun, 12 Dec 2010 14:11:10 -0300 Subject: [PATCH] fix previous commit: actually only allow edits in #ubuntu-ops if the user has 'restricted-editor' capability. --- Encyclopedia/plugin.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Encyclopedia/plugin.py b/Encyclopedia/plugin.py index 80c5d14..0664dc8 100644 --- a/Encyclopedia/plugin.py +++ b/Encyclopedia/plugin.py @@ -480,8 +480,9 @@ class Encyclopedia(callbacks.Plugin): ret = self.search_factoid(lower_text[7:].strip(), channel) elif (' is ' in lower_text and lower_text[:3] in ('no ', 'no,')) or '' in lower_text or '=~' in lower_text \ or '~=' in lower_text or '' in lower_text or lower_text.startswith('forget') or lower_text.startswith('unforget'): - if not capab(msg.prefix, 'editfactoids') and \ - channel not in self.registryValue('editchannel'): + if not (capab(msg.prefix, 'editfactoids') \ + or channel in self.registryValue('editchannel') \ + and capab(msg.prefix, 'restricted-editor')): irc.reply("Your edit request has been forwarded to %s. Thank you for your attention to detail" % self.registryValue('relaychannel',channel),private=True) irc.queueMsg(ircmsgs.privmsg(self.registryValue('relaychannel',channel), "In %s, %s said: %s" % @@ -490,8 +491,9 @@ class Encyclopedia(callbacks.Plugin): return ret = self.factoid_edit(text, channel, msg.prefix) elif (' is ' in lower_text and '|' in lower_text and lower_text.index('|') > lower_text.index(' is ')) or (' is ' in lower_text and '|' not in lower_text): - if not capab(msg.prefix, 'editfactoids') and \ - channel not in self.registryValue('editchannel'): + if not (capab(msg.prefix, 'editfactoids') \ + or channel in self.registryValue('editchannel') \ + and capab(msg.prefix, 'restricted-editor')): if len(text[:text.find('is')]) > 15: irc.error("I am only a bot, please don't think I'm intelligent :)") else: