GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-05-05 22:27:24 +02:00
Code Issues Projects Releases Wiki Activity

applyModes: remove old modepairs when setting non-list modes that require params

Browse Source 
Closes #30.
This commit is contained in:
James Lu 2015-07-05 23:15:17 -07:00
parent 48c3b4b2e9
commit 170620c410
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_proto_inspircd.py
View File

@ -218,5 +218,12 @@ class TestInspIRCdProtocol(unittest.TestCase):
self.irc.run(':70M FMODE #pylink 1423790413 -o %s' % self.u) self.irc.run(':70M FMODE #pylink 1423790413 -o %s' % self.u)
self.assertEqual(modes, self.irc.channels['#pylink'].modes) self.assertEqual(modes, self.irc.channels['#pylink'].modes)
self.assertNotIn(self.u, self.irc.channels['#pylink'].prefixmodes['ops']) self.assertNotIn(self.u, self.irc.channels['#pylink'].prefixmodes['ops'])
def testFmodeRemovesOldParams(self):
self.irc.run(':70M FMODE #pylink 1423790412 +l 50')
self.assertEqual({('l', '50')}, self.irc.channels['#pylink'].modes)
self.irc.run(':70M FMODE #pylink 1423790412 +l 30')
self.assertEqual({('l', '30')}, self.irc.channels['#pylink'].modes)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

16
utils.py
View File

@ -136,8 +136,10 @@ def applyModes(irc, target, changedmodes):
log.debug('(%s) Using usermodes for this query? %s', irc.name, usermodes) log.debug('(%s) Using usermodes for this query? %s', irc.name, usermodes)
if usermodes: if usermodes:
modelist = irc.users[target].modes modelist = irc.users[target].modes
supported_modes = irc.umodes
else: else:
modelist = irc.channels[target].modes modelist = irc.channels[target].modes
supported_modes = irc.cmodes
log.debug('(%s) Applying modes %r on %s (initial modelist: %s)', irc.name, changedmodes, target, modelist) log.debug('(%s) Applying modes %r on %s (initial modelist: %s)', irc.name, changedmodes, target, modelist)
for mode in changedmodes: for mode in changedmodes:
# Chop off the +/- part that parseModes gives; it's meaningless for a mode list. # Chop off the +/- part that parseModes gives; it's meaningless for a mode list.
@ -157,10 +159,20 @@ def applyModes(irc, target, changedmodes):
log.debug('(%s) Final prefixmodes list: %s', irc.name, irc.channels[target].prefixmodes) log.debug('(%s) Final prefixmodes list: %s', irc.name, irc.channels[target].prefixmodes)
if real_mode[0] in irc.prefixmodes: if real_mode[0] in irc.prefixmodes:
# Ignore other prefix modes such as InspIRCd's +Yy # Ignore other prefix modes such as InspIRCd's +Yy
log.debug('(%s) Not adding mode %s to IrcChannel.modes because it\'s a prefix mode', irc.name, str(mode)) log.debug('(%s) Not adding mode %s to IrcChannel.modes because '
'it\'s a prefix mode we don\'t care about.', irc.name, str(mode))
continue continue
if mode[0][0] == '+': if mode[0][0] == '+':
# We're adding a mode # We're adding a mode
existing = [m for m in modelist if m[0] == real_mode[0]]
if existing and real_mode[1] and mode[0] not in irc.cmodes['*A']:
# The mode we're setting takes a parameter, but is not a list mode (like +beI).
# Therefore, only one version of it can exist at a time, and we must remove
# any old modepairs using the same letter. Otherwise, we'll get duplicates when,
# for example, someone sets mode "+l 30" on a channel already set "+l 25".
log.debug('(%s) Old modes for mode %r exist on %s, removing them: %s',
irc.name, mode, target, str(existing))
[modelist.discard(oldmode) for oldmode in existing]
modelist.add(real_mode) modelist.add(real_mode)
log.debug('(%s) Adding mode %r on %s', irc.name, mode, target) log.debug('(%s) Adding mode %r on %s', irc.name, mode, target)
else: else:
@ -168,6 +180,8 @@ def applyModes(irc, target, changedmodes):
# We're removing a mode # We're removing a mode
if real_mode[1] is None: if real_mode[1] is None:
# We're removing a mode that only takes arguments when setting. # We're removing a mode that only takes arguments when setting.
# Remove all mode entries that use the same letter as the one
# we're unsetting.
for oldmode in modelist.copy(): for oldmode in modelist.copy():
if oldmode[0] == real_mode[0]: if oldmode[0] == real_mode[0]:
modelist.discard(oldmode) modelist.discard(oldmode)