Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

src/irclib: Handle IRCds which use a MAXLIST-style value for the MAXBANS 005 key.

Browse Source
This commit is contained in:
James Vega 2005-06-29 14:20:54 +00:00
parent 0880a07b72
commit bd31b7f596
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/irclib.py
View File

@ -400,7 +400,6 @@ class IrcState(IrcCommandDispatcher):
_005converters = utils.InsensitivePreservingDict({ _005converters = utils.InsensitivePreservingDict({
'modes': int, 'modes': int,
'keylen': int, 'keylen': int,
'maxbans': int,
'nicklen': int, 'nicklen': int,
'userlen': int, 'userlen': int,
'hostlen': int, 'hostlen': int,
@ -425,6 +424,34 @@ class IrcState(IrcCommandDispatcher):
return dict(zip('ovh', s)) return dict(zip('ovh', s))
_005converters['prefix'] = _prefixParser _005converters['prefix'] = _prefixParser
del _prefixParser del _prefixParser
def _maxlistParser(s):
modes = ''
limits = []
pairs = s.split(',')
for pair in pairs:
(mode, limit) = pair.split(':', 1)
modes += mode
limits += (int(limit),) * len(mode)
return dict(zip(modes, limits))
_005converters['maxlist'] = _maxlistParser
del _maxlistParser
def _maxbansParser(s):
# IRCd using a MAXLIST style string (IRCNet)
if ':' in s:
modes = ''
limits = []
pairs = s.split(',')
for pair in pairs:
(mode, limit) = pair.split(':', 1)
modes += mode
limits += (int(limit),) * len(mode)
d = dict(zip(modes, limits))
assert 'b' in d
return d['b']
else:
return int(s)
_005converters['maxbans'] = _maxbansParser
del _maxbansParser
def do005(self, irc, msg): def do005(self, irc, msg):
for arg in msg.args[1:-1]: # 0 is nick, -1 is "are supported" for arg in msg.args[1:-1]: # 0 is nick, -1 is "are supported"
if '=' in arg: if '=' in arg:

6
test/test_irclib.py
View File

@ -284,6 +284,12 @@ class IrcStateTestCase(SupyTestCase):
self.assertEqual(state.supported['prefix']['o'], '@') self.assertEqual(state.supported['prefix']['o'], '@')
self.assertEqual(state.supported['prefix']['v'], '+') self.assertEqual(state.supported['prefix']['v'], '+')
def testIRCNet005(self):
state = irclib.IrcState()
# Testing IRCNet's misuse of MAXBANS
state.addMsg(self.irc, ircmsgs.IrcMsg(':irc.inet.tele.dk 005 adkwbot WALLCHOPS KNOCK EXCEPTS INVEX MODES=4 MAXCHANNELS=20 MAXBANS=beI:100 MAXTARGETS=4 NICKLEN=9 TOPICLEN=120 KICKLEN=90 :are supported by this server'))
self.assertEqual(state.supported['maxbans'], 100)
def testEmptyTopic(self): def testEmptyTopic(self):
state = irclib.IrcState() state = irclib.IrcState()
state.addMsg(self.irc, ircmsgs.topic('#foo')) state.addMsg(self.irc, ircmsgs.topic('#foo'))