val/ubuntu-bots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

merge multiple mode messages into one (4 modes max)

Browse Source
This commit is contained in:
Elián Hanisch
2012-07-15 22:28:38 -03:00
parent 6640435520
commit 909d56d704
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Bantracker/plugin.py
View File

@ -55,6 +55,7 @@ import supybot.ircdb as ircdb
import supybot.schedule as schedule
import supybot.utils as utils
from fnmatch import fnmatch
from collections import defaultdict
import sqlite
import pytz
import cPickle
@ -869,6 +870,7 @@ class Bantracker(callbacks.Plugin):
def autoRemoveBans(self, irc):
modedict = { 'quiet': '-q', 'ban': '-b' }
unbandict = defaultdict(list)
for ban in self.managedBans.popExpired():
channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
if not self.registryValue('autoremove', channel):
@ -880,9 +882,15 @@ class Bantracker(callbacks.Plugin):
ban.ban.id,
mask,
channel)
# send unban msg
unban = ircmsgs.mode(channel, (modedict[type], mask))
irc.queueMsg(unban)
unbandict[channel].append((modedict[type], mask))
# send unban messages, with 4 modes max each.
maxModes = 4
for channel, modes in unbandict.iteritems():
for i in range(len(modes) / maxModes + 1):
L = modes[i * maxModes : (i + 1) * maxModes]
if L:
msg = ircmsgs.mode(channel, ircutils.joinModes(L))
irc.queueMsg(msg)
# notify about bans soon to expire
for ban in self.managedBans.getExpired(600):

23
Bantracker/test.py
View File

@ -361,6 +361,29 @@ class BantrackerTestCase(ChannelPluginTestCase):
msg = self.irc.takeMsg() # unban msg
self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
def testBanremoveMergeModes(self):
cb = self.getCallback()
self.feedBan('asd!*@*')
self.feedBan('qwe!*@*')
self.feedBan('zxc!*@*')
self.feedBan('asd!*@*', mode='q')
self.feedBan('qwe!*@*', mode='q')
self.feedBan('zxc!*@*', mode='q')
self.assertNotError('banremove 1 0')
self.assertNotError('banremove 2 0')
self.assertNotError('banremove 3 0')
self.assertNotError('banremove 4 0')
self.assertNotError('banremove 5 0')
self.assertNotError('banremove 6 0')
print 'waiting 1 secs ...'
time.sleep(1)
cb.autoRemoveBans(self.irc)
msg = self.irc.takeMsg() # unban msg
self.assertEqual(str(msg).strip(),
"MODE #test -qqqb zxc!*@* qwe!*@* asd!*@* :zxc!*@*")
msg = self.irc.takeMsg()
self.assertEqual(str(msg).strip(), "MODE #test -bb qwe!*@* :asd!*@*")
def testBanremoveQuiet(self):
cb = self.getCallback()
self.feedBan('asd!*@*', mode='q')