From 7043e17fb0abd3988cdbfa558ce6b81477bb33e3 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Fri, 12 Sep 2014 04:53:23 +0000 Subject: [PATCH] Anonymous: Fix handling of allowPrivateTarget (after a629f51). --- plugins/Anonymous/plugin.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/Anonymous/plugin.py b/plugins/Anonymous/plugin.py index 1e3f17183..0a1bbae5f 100644 --- a/plugins/Anonymous/plugin.py +++ b/plugins/Anonymous/plugin.py @@ -59,7 +59,7 @@ class Anonymous(callbacks.Plugin): if capability: if not ircdb.checkCapability(msg.prefix, capability): irc.errorNoCapability(capability, Raise=True) - if irc.isChannel(target): + if action != 'tell': if self.registryValue('requirePresenceInChannel', target) and \ msg.nick not in irc.state.channels[target].users: irc.error(format(_('You must be in %s to %q in there.'), @@ -71,7 +71,7 @@ class Anonymous(callbacks.Plugin): if not c._checkCapability(self.name()): irc.error(_('That channel has set its capabilities so as to ' 'disallow the use of this plugin.'), Raise=True) - elif action == 'say' and not self.registryValue('allowPrivateTarget'): + elif not self.registryValue('allowPrivateTarget'): irc.error(format(_('%q cannot be used to send private messages.'), action), Raise=True) @@ -80,8 +80,7 @@ class Anonymous(callbacks.Plugin): def say(self, irc, msg, args, target, text): """ - Sends to . Can only send to if - supybot.plugins.Anonymous.allowPrivateTarget is True. + Sends to . """ self._preCheck(irc, msg, target, 'say') self.log.info('Saying %q in %s due to %s.',