GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 03:29:28 +01:00
Code Issues Projects Releases Wiki Activity

clientbot: filter PART hooks for only parts we didn't initialize

Browse Source 
This fixes Relay being confused by its own "Relay plugin unloaded" /part's, and makes Clientbot's behaviour in this regard consistent with other protocols.
This commit is contained in:
James Lu 2018-07-18 19:10:19 -07:00
parent 12f6bb5e18
commit 9cf507183d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
protocols/clientbot.py
View File

@ -287,6 +287,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
# Only parts for the main PyLink client are actually forwarded. Others are ignored. # Only parts for the main PyLink client are actually forwarded. Others are ignored.
if self.pseudoclient and source == self.pseudoclient.uid: if self.pseudoclient and source == self.pseudoclient.uid:
self._channels[channel]._clientbot_part_requested = True
self.send('PART %s :%s' % (channel, reason)) self.send('PART %s :%s' % (channel, reason))
else: else:
self.call_hooks([source, 'CLIENTBOT_PART', {'channel': channel, 'text': reason}]) self.call_hooks([source, 'CLIENTBOT_PART', {'channel': channel, 'text': reason}])
@ -1041,7 +1042,21 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
self._channels[channel].remove_user(source) self._channels[channel].remove_user(source)
self.users[source].channels -= set(channels) self.users[source].channels -= set(channels)
return {'channels': channels, 'text': reason} # Only send the PART hook for parts not initiated by us - this is for consistency with other
# protocols
notify_channels = []
for channel in channels:
is_part_requested = getattr(self._channels[channel], '_clientbot_part_requested', False)
if is_part_requested:
log.debug('(%s) clientbot.handle_part: not forwarding part hook for %s since we requested it', self.name, channel)
self._channels[channel]._clientbot_part_requested = False
continue
else:
notify_channels.append(channel)
if notify_channels:
log.debug('(%s) clientbot.handle_part: returning part hook for %s (original: %s)', self.name, notify_channels, channels)
return {'channels': notify_channels, 'text': reason}
def handle_ping(self, source, command, args): def handle_ping(self, source, command, args):
""" """