mirror of https://github.com/Mikaela/Limnoria.git
Merge pull request #989 from GLolol/badwords-1
BadWords: bug fix, don't kick ops, remove unused import
This commit is contained in:
commit
5b3f4cc159
|
@ -29,7 +29,6 @@
|
||||||
###
|
###
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import math
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import supybot.conf as conf
|
import supybot.conf as conf
|
||||||
|
@ -77,11 +76,18 @@ class BadWords(callbacks.Privmsg):
|
||||||
self.updateRegexp(channel)
|
self.updateRegexp(channel)
|
||||||
s = ircutils.stripFormatting(msg.args[1])
|
s = ircutils.stripFormatting(msg.args[1])
|
||||||
if ircutils.isChannel(channel) and self.registryValue('kick', channel):
|
if ircutils.isChannel(channel) and self.registryValue('kick', channel):
|
||||||
if self.regexp.search(s):
|
if self.words and self.regexp.search(s):
|
||||||
if irc.nick in irc.state.channels[channel].ops or \
|
c = irc.state.channels[channel]
|
||||||
irc.nick in irc.state.channels[channel].halfops:
|
cap = ircdb.makeChannelCapability(channel, 'op')
|
||||||
message = self.registryValue('kick.message', channel)
|
if c.isHalfopPlus(irc.nick):
|
||||||
irc.queueMsg(ircmsgs.kick(channel, msg.nick, message))
|
if c.isHalfopPlus(msg.nick) or \
|
||||||
|
ircdb.checkCapability(msg.prefix, cap):
|
||||||
|
self.log.debug("Not kicking %s from %s, because "
|
||||||
|
"they are halfop+ or can't be "
|
||||||
|
"kicked.", msg.nick, channel)
|
||||||
|
else:
|
||||||
|
message = self.registryValue('kick.message', channel)
|
||||||
|
irc.queueMsg(ircmsgs.kick(channel, msg.nick, message))
|
||||||
else:
|
else:
|
||||||
self.log.warning('Should kick %s from %s, but not opped.',
|
self.log.warning('Should kick %s from %s, but not opped.',
|
||||||
msg.nick, channel)
|
msg.nick, channel)
|
||||||
|
|
Loading…
Reference in New Issue