Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-02 17:29:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix parsing of 004 message for supported umodes/chanmodes

Browse Source 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 4232e40e26)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
This commit is contained in:
James McCoy 2011-11-07 05:58:27 -05:00 committed by Daniel Folkinshteyn
parent ab9365f172
commit 23f07cadc2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/irclib.py
View File

@ -405,10 +405,10 @@ class IrcState(IrcCommandDispatcher):
"""Handles parsing the 004 reply """Handles parsing the 004 reply
Supported user and channel modes are cached""" Supported user and channel modes are cached"""
# msg.args = [nick, server, ircd-version, umodes, modes, # msg.args = [server, ircd-version, umodes, modes,
# modes that require arguments? (non-standard)] # modes that require arguments? (non-standard)]
self.supported['umodes'] = msg.args[3] self.supported['umodes'] = msg.args[2]
self.supported['chanmodes'] = msg.args[4] self.supported['chanmodes'] = msg.args[3]
_005converters = utils.InsensitivePreservingDict({ _005converters = utils.InsensitivePreservingDict({
'modes': int, 'modes': int,

7
test/test_irclib.py
View File

@ -290,6 +290,13 @@ class IrcStateTestCase(SupyTestCase):
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')) 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) self.assertEqual(state.supported['maxbans'], 100)
def testSupportedUmodes(self):
state = irclib.IrcState()
state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 charm.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI'))
self.assertEqual(state.supported['umodes'], 'CDGPRSabcdfgiklnorsuwxyz')
self.assertEqual(state.supported['chanmodes'],
'biklmnopstveI')
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'))