GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

clientbot: stop sending duplicate JOIN hooks

Browse Source 
Also set _clientbot_initial_who_received on 315/ENDOFWHO, instead of on the first /who response we get.

Really fixes #551.
This commit is contained in:
James Lu 2018-05-09 22:31:19 -07:00
parent 451db74f0c
commit 3120fa5396
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocols/clientbot.py
View File

@ -768,7 +768,6 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
self.update_client(uid, 'HOST', host) self.update_client(uid, 'HOST', host)
self.update_client(uid, 'GECOS', realname) self.update_client(uid, 'GECOS', realname)
self.users[uid]._clientbot_identhost_received = True self.users[uid]._clientbot_identhost_received = True
self._channels[channel]._clientbot_initial_who_received = True
# The status given uses the following letters: <H|G>[*][@|+] # The status given uses the following letters: <H|G>[*][@|+]
# H means here (not marked /away) # H means here (not marked /away)
@ -822,6 +821,9 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
c = self._channels[channel] c = self._channels[channel]
modes = set(c.modes) modes = set(c.modes)
bursted_before = hasattr(c, '_clientbot_initial_who_received')
queued_users = []
for user in users.copy(): for user in users.copy():
# Fill in prefix modes of everyone when doing mock SJOIN. # Fill in prefix modes of everyone when doing mock SJOIN.
try: try:
@ -834,7 +836,14 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
log.debug("(%s) Ignoring KeyError (%s) from WHO response; it's probably someone we " log.debug("(%s) Ignoring KeyError (%s) from WHO response; it's probably someone we "
"don't share any channels with", self.name, e) "don't share any channels with", self.name, e)
if users: if bursted_before and user in c.users:
log.debug("(%s) Skipping join of %s/%s to %r", self.name, user,
self.get_friendly_name(user), channel)
continue
queued_users.append(user)
c._clientbot_initial_who_received = True
if queued_users:
return {'channel': channel, 'users': users, 'modes': modes, return {'channel': channel, 'users': users, 'modes': modes,
'parse_as': "JOIN"} 'parse_as': "JOIN"}