From 0b8b4dc3cff5351b2df240a59699572de4091640 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 1 Jan 2017 00:19:10 -0800 Subject: [PATCH] inspircd, nefarious: stop applying remote modes on sjoin I have no clue why this code exists, but it looks wrong and probably is wrong. --- protocols/inspircd.py | 1 - protocols/nefarious.py | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 8dbf7de..31a41c4 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -526,7 +526,6 @@ class InspIRCdProtocol(TS6BaseProtocol): modestring = args[2:-1] or args[2] parsedmodes = self.irc.parseModes(channel, modestring) - self.irc.applyModes(channel, parsedmodes) namelist = [] # Keep track of other modes that are added due to prefix modes being joined too. diff --git a/protocols/nefarious.py b/protocols/nefarious.py index 8f1ae62..2413ffe 100644 --- a/protocols/nefarious.py +++ b/protocols/nefarious.py @@ -1025,16 +1025,10 @@ class P10Protocol(IRCS2SProtocol): else: parsedmodes = [] - # This list is used to keep track of prefix modes being added to the mode list. - changedmodes = set(parsedmodes) - - # Also add the the ban list to the list of modes to process internally. - parsedmodes.extend(bans) - if parsedmodes: - self.irc.applyModes(channel, parsedmodes) + changedmodes = set(parsedmodes + bans) namelist = [] - log.debug('(%s) handle_sjoin: got userlist %r for %r', self.irc.name, userlist, channel) + log.debug('(%s) handle_burst: got userlist %r for %r', self.irc.name, userlist, channel) prefixes = ''