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

classes: fix some prefixmodes list vs. state confusion

Browse Source
This commit is contained in:
James Lu 2018-03-02 21:07:47 -08:00
parent 5a00454a8d
commit 0ca185fada
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes.py
View File

@ -589,7 +589,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
arg = None arg = None
log.debug('Current mode: %s%s; args left: %s', prefix, mode, args) log.debug('Current mode: %s%s; args left: %s', prefix, mode, args)
try: try:
if prefixmodes and mode in prefixmodes: if prefixmodes and mode in self.prefixmodes:
# We're setting a prefix mode on someone (e.g. +o user1) # We're setting a prefix mode on someone (e.g. +o user1)
log.debug('Mode %s: This mode is a prefix mode.', mode) log.debug('Mode %s: This mode is a prefix mode.', mode)
arg = args.pop(0) arg = args.pop(0)
@ -661,13 +661,13 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
supported_modes = self.umodes supported_modes = self.umodes
oldmodes = self.users[target].modes oldmodes = self.users[target].modes
prefixmodes = {} prefixmodes = None
else: else:
log.debug('(%s) Using self.cmodes for this query: %s', self.name, self.cmodes) log.debug('(%s) Using self.cmodes for this query: %s', self.name, self.cmodes)
supported_modes = self.cmodes supported_modes = self.cmodes
oldmodes = self._channels[target].modes oldmodes = self._channels[target].modes
prefixmodes = self.prefixmodes prefixmodes = self._channels[target].prefixmodes
return self._parse_modes(args, oldmodes, supported_modes, is_channel=is_channel, return self._parse_modes(args, oldmodes, supported_modes, is_channel=is_channel,
prefixmodes=prefixmodes) prefixmodes=prefixmodes)
@ -699,13 +699,13 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
# for ops). # for ops).
for pmode, pmodelist in prefixmodes.items(): for pmode, pmodelist in prefixmodes.items():
if pmode in supported_modes and real_mode[0] == supported_modes[pmode]: if pmode in supported_modes and real_mode[0] == supported_modes[pmode]:
log.debug('(%s) Initial prefixmodes list: %s', self.name, pmodelist) log.debug('(%s) Initial prefixmodes list (%s): %s', self.name, pmode, pmodelist)
if mode[0][0] == '+': if mode[0][0] == '+':
pmodelist.add(mode[1]) pmodelist.add(mode[1])
else: else:
pmodelist.discard(mode[1]) pmodelist.discard(mode[1])
log.debug('(%s) Final prefixmodes list: %s', self.name, pmodelist) log.debug('(%s) Final prefixmodes list (%s): %s', self.name, pmode, pmodelist)
if real_mode[0] in self.prefixmodes: if real_mode[0] in self.prefixmodes:
# Don't add prefix modes to Channel.modes; they belong in the # Don't add prefix modes to Channel.modes; they belong in the