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

AutoMode: Fix commit 4eb674843e (extra modes).

This commit is contained in:
Valentin Lorentz 2012-09-17 19:27:18 +02:00
parent 0267f15a45
commit a8415c8d75
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/AutoMode/plugin.py
View File

@ -28,8 +28,10 @@
# POSSIBILITY OF SUCH DAMAGE.
###
import re
import time
import supybot.log as log
import supybot.conf as conf
import supybot.ircdb as ircdb
import supybot.ircmsgs as ircmsgs
@ -92,6 +94,26 @@ class AutoMode(callbacks.Plugin):
do('voice')
except Continue:
return
finally:
user = ircdb.users.getUser(ircdb.users.getUserId(msg.prefix))
pattern = re.compile('-|\+')
for item in self.registryValue('extra', channel):
try:
username, modes = pattern.split(item, maxsplit=1)
modes = item[len(username)] + modes
except ValueError: # No - or + in item
log.error(('%r is not a valid item for '
'supybot.plugins.AutoMode.extra') % item)
continue
if username != user.name:
continue
else:
self.log.info('Scheduling auto-modes %s of %s in %s.',
modes, msg.prefix, channel)
modes = [modes] + \
([msg.nick]*len(pattern.sub('', modes)))
schedule_msg(ircmsgs.mode(channel, modes), lambda :False)
break
c = ircdb.channels.getChannel(channel)
if c.checkBan(msg.prefix) and self.registryValue('ban', channel):
period = self.registryValue('ban.period', channel)
@ -108,20 +130,6 @@ class AutoMode(callbacks.Plugin):
irc.queueMsg(ircmsgs.ban(channel, banmask))
irc.queueMsg(ircmsgs.kick(channel, msg.nick))
user = ircdb.users.getUser(ircdb.users.getUserId(msg.prefix))
pattern = re.compile('-\+')
for item in self.registryValue('extra', channel):
try:
username, modes = pattern.split(item, maxsplit=1)
except ValueError: # No - or + in item
log.error('%r is not a valid item for '
'supybot.plugins.AutoMode.extra')
continue
if username != user.name:
continue
else:
schedule_msg(ircmsgs.mode(msg.nick, modes), lambda :True)
break