Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-23 02:24:12 +01:00
Code Issues Projects Releases Wiki Activity

Added supybot.protocols.irc.queuing.rateLimit.join, to throttle joins.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-04-14 01:35:35 +00:00
parent 73f639b55f
commit b48ca7ab71
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf.py
View File

@ -942,6 +942,11 @@ registerGlobalValue(supybot.protocols.irc.queuing, 'duplicates',
multiple times; most of the time it doesn't matter, unless you're doing multiple times; most of the time it doesn't matter, unless you're doing
certain kinds of plugin hacking.""")) certain kinds of plugin hacking."""))
registerGroup(supybot.protocols.irc.queuing, 'rateLimit')
registerGlobalValue(supybot.protocols.irc.queuing.rateLimit, 'join',
registry.Float(0, """Determines how many seconds must elapse between JOINs
sent to the server."""))
### ###
# supybot.protocols.http # supybot.protocols.http
### ###

13
src/irclib.py
View File

@ -139,7 +139,7 @@ class IrcCallback(IrcCommandDispatcher):
# later point) reorder messages based on priority or penalty calculations. # later point) reorder messages based on priority or penalty calculations.
### ###
_high = frozenset(['MODE', 'KICK', 'PONG', 'NICK', 'PASS', 'CAPAB']) _high = frozenset(['MODE', 'KICK', 'PONG', 'NICK', 'PASS', 'CAPAB'])
_low = frozenset(['PRIVMSG', 'PING', 'WHO', 'NOTICE']) _low = frozenset(['PRIVMSG', 'PING', 'WHO', 'NOTICE', 'JOIN'])
class IrcMsgQueue(object): class IrcMsgQueue(object):
"""Class for a queue of IrcMsgs. Eventually, it should be smart. """Class for a queue of IrcMsgs. Eventually, it should be smart.
@ -153,7 +153,7 @@ class IrcMsgQueue(object):
the 'high priority' ones before the normal ones before the 'low priority' the 'high priority' ones before the normal ones before the 'low priority'
ones. ones.
""" """
__slots__ = ('msgs', 'highpriority', 'normal', 'lowpriority') __slots__ = ('msgs', 'highpriority', 'normal', 'lowpriority', 'lastJoin')
def __init__(self, iterable=()): def __init__(self, iterable=()):
self.reset() self.reset()
for msg in iterable: for msg in iterable:
@ -161,6 +161,7 @@ class IrcMsgQueue(object):
def reset(self): def reset(self):
"""Clears the queue.""" """Clears the queue."""
self.lastJoin = 0
self.highpriority = smallqueue() self.highpriority = smallqueue()
self.normal = smallqueue() self.normal = smallqueue()
self.lowpriority = smallqueue() self.lowpriority = smallqueue()
@ -190,6 +191,14 @@ class IrcMsgQueue(object):
msg = self.normal.dequeue() msg = self.normal.dequeue()
elif self.lowpriority: elif self.lowpriority:
msg = self.lowpriority.dequeue() msg = self.lowpriority.dequeue()
if msg.command == 'JOIN':
limit = conf.supybot.protocols.irc.queuing.rateLimit.join()
now = time.time()
if self.lastJoin + limit <= now:
self.lastJoin = now
else:
self.lowpriority.enqueue(msg)
msg = None
return msg return msg
def __contains__(self, msg): def __contains__(self, msg):

8
test/test_irclib.py
View File

@ -158,10 +158,10 @@ class IrcMsgQueueTestCase(SupyTestCase):
q.enqueue(self.who) q.enqueue(self.who)
self.assertEqual(self.join, q.dequeue()) self.assertEqual(self.join, q.dequeue())
self.assertEqual(self.who, q.dequeue()) self.assertEqual(self.who, q.dequeue())
q.enqueue(self.who) ## q.enqueue(self.who)
q.enqueue(self.join) ## q.enqueue(self.join)
self.assertEqual(self.join, q.dequeue()) ## self.assertEqual(self.join, q.dequeue())
self.assertEqual(self.who, q.dequeue()) ## self.assertEqual(self.who, q.dequeue())
def testTopicBeforePrivmsg(self): def testTopicBeforePrivmsg(self):
q = irclib.IrcMsgQueue() q = irclib.IrcMsgQueue()