Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Final cleanups for BadWords kicking.

This commit is contained in:
Jeremy Fincher 2007-09-20 02:24:52 +00:00 committed by James Vega
parent e292c5d0c9
commit f1948a2245
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/BadWords/config.py
View File

@ -94,8 +94,10 @@ conf.registerChannelValue(BadWords, 'kick',
registry.Boolean(False, """Determines whether the bot will kick people with registry.Boolean(False, """Determines whether the bot will kick people with
a warning when they use bad words.""")) a warning when they use bad words."""))
conf.registerChannelValue(BadWords.kick, 'message', conf.registerChannelValue(BadWords.kick, 'message',
registry.String("""You have been kicked for using a word prohibited on this registry.NormalizedString("""You have been kicked for using a word
channel. Please use more appropriate language in the future.""")) prohibited in the presence of this bot. Please use more appropriate
language in the future.""", """Determines the kick message used by the bot
when kicking users for saying bad words."""))
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

17
plugins/BadWords/plugin.py
View File

@ -66,11 +66,14 @@ class BadWords(callbacks.Privmsg):
self.filtering = True self.filtering = True
return msg return msg
def updateRegexp(self):
if self.lastModified < self.words.lastModified:
self.makeRegexp(self.words())
self.lastModified = time.time()
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
if self.filtering and msg.command == 'PRIVMSG': if self.filtering and msg.command == 'PRIVMSG':
if self.lastModified < self.words.lastModified: self.updateRegexp()
self.makeRegexp(self.words())
self.lastModified = time.time()
s = msg.args[1] s = msg.args[1]
if self.registryValue('stripFormatting'): if self.registryValue('stripFormatting'):
s = ircutils.stripFormatting(s) s = ircutils.stripFormatting(s)
@ -79,17 +82,17 @@ class BadWords(callbacks.Privmsg):
return msg return msg
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
self.updateRegexp()
s = ircutils.stripFormatting(msg.args[1]) s = ircutils.stripFormatting(msg.args[1])
channel = msg.args[0] channel = msg.args[0]
if ircutils.isChannel(channel) and self.registryValue('kick', channel): if ircutils.isChannel(channel) and self.registryValue('kick', channel):
if self.regexp.match(s): if self.regexp.search(s):
if irc.nick in irc.state.channels[channel].ops: if irc.nick in irc.state.channels[channel].ops:
message = self.registryValue('kick.message', channel) message = self.registryValue('kick.message', channel)
irc.queueMsg(ircmsgs.kick(channel, msg.nick, message)) irc.queueMsg(ircmsgs.kick(channel, msg.nick, message))
else: else:
self.log('Should kick %s from %s, but am not opped.', self.log.warning('Should kick %s from %s, but not opped.',
msg.nick, channel) msg.nick, channel)
callbacks.Privmsg.doPrivmsg(self, irc, msg)
def makeRegexp(self, iterable): def makeRegexp(self, iterable):
s = '(%s)' % '|'.join(map(re.escape, iterable)) s = '(%s)' % '|'.join(map(re.escape, iterable))