PsychoticNinja/Limnoria
1
0
Fork 0
mirror of https://github.com/progval/Limnoria.git synced 2025-05-04 17:30:58 -05:00
Code Issues Projects Releases Wiki Activity

Simplify and fix logic of umodes filtering. Closes GH-719.

Browse Source
This commit is contained in:
Valentin Lorentz 2014-08-04 16:26:08 +02:00
parent d431c2992b
commit 9385487f54
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/irclib.py
View File

@ -410,8 +410,8 @@ class IrcState(IrcCommandDispatcher):
# msg.args = [nick, server, ircd-version, umodes, modes, # msg.args = [nick, server, ircd-version, umodes, modes,
# modes that require arguments? (non-standard)] # modes that require arguments? (non-standard)]
self.ircd = msg.args[2] self.ircd = msg.args[2]
self.supported['umodes'] = msg.args[3] self.supported['umodes'] = frozenset(msg.args[3])
self.supported['chanmodes'] = msg.args[4] self.supported['chanmodes'] = frozenset(msg.args[4])
_005converters = utils.InsensitivePreservingDict({ _005converters = utils.InsensitivePreservingDict({
'modes': int, 'modes': int,
@ -1068,13 +1068,10 @@ class Irc(IrcCommandDispatcher):
if umodes == '': if umodes == '':
umodes = conf.supybot.protocols.irc.umodes() umodes = conf.supybot.protocols.irc.umodes()
supported = self.state.supported.get('umodes') supported = self.state.supported.get('umodes')
if umodes:
addSub = '+'
if umodes[0] in '+-':
(addSub, umodes) = (umodes[0], umodes[1:])
if supported: if supported:
umodes = ''.join([m for m in umodes if m in supported]) acceptedchars = supported.union('+-')
umodes = ''.join([addSub, umodes]) umodes = ''.join([m for m in umodes if m in acceptedchars])
if umodes:
log.info('Sending user modes to %s: %s', self.network, umodes) log.info('Sending user modes to %s: %s', self.network, umodes)
self.sendMsg(ircmsgs.mode(self.nick, umodes)) self.sendMsg(ircmsgs.mode(self.nick, umodes))
do377 = do422 = do376 do377 = do422 = do376