From 96dc860313bac1115a5565307a370af027200ea6 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 25 Sep 2015 20:51:15 -0700 Subject: [PATCH] BadWords: truly fix kicks when badwords list is empty (#989) --- plugins/BadWords/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/BadWords/plugin.py b/plugins/BadWords/plugin.py index b4251b0d3..54c511030 100644 --- a/plugins/BadWords/plugin.py +++ b/plugins/BadWords/plugin.py @@ -71,12 +71,12 @@ class BadWords(callbacks.Privmsg): self.filtering = True # We need to check for bad words here rather than in doPrivmsg because # messages don't get to doPrivmsg if the user is ignored. - if msg.command == 'PRIVMSG': + if msg.command == 'PRIVMSG' and self.words(): channel = msg.args[0] self.updateRegexp(channel) s = ircutils.stripFormatting(msg.args[1]) if ircutils.isChannel(channel) and self.registryValue('kick', channel): - if self.words and self.regexp.search(s): + if self.regexp.search(s): c = irc.state.channels[channel] cap = ircdb.makeChannelCapability(channel, 'op') if c.isHalfopPlus(irc.nick):