GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 04:02:45 +01:00
Code Issues Projects Releases Wiki Activity

clientbot: drop pre-WHO join bursting with userhost-in-names, it's too unreliable

Browse Source 
Closes #602.
Closes #551.
This commit is contained in:
James Lu 2018-04-24 12:15:25 -07:00
parent e96081aa6e
commit 8eba402a33
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
protocols/clientbot.py
View File

@ -706,12 +706,12 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
log.debug('(%s) handle_353: adding modes %s to %s', self.name, modes, channel) log.debug('(%s) handle_353: adding modes %s to %s', self.name, modes, channel)
# Send JOIN hook payloads only for users that we know the ident@host of already. # Send JOIN hook payloads only for users that we know the ident@host of already.
# We also use this to track whether kicks are successful, rejoining the target in the next /names lookup # This is mostly used to resync kicked Clientbot users that can't actually be kicked
# if it wasn't. # after a delay.
fully_synced_names = [uid for uid in names if hasattr(self.users[uid], '_clientbot_identhost_received')] if names and hasattr(self.irc.channels[channel], '_clientbot_initial_who_received'):
if fully_synced_names: log.debug('(%s) handle_353: sending JOIN hook because /WHO was already received for %s',
log.debug('(%s) handle_353: sending pre-WHO JOIN hook for %s: %s', self.name, channel, fully_synced_names) self.irc.name, channel)
return {'channel': channel, 'users': fully_synced_names, 'modes': self._channels[channel].modes, return {'channel': channel, 'users': names, 'modes': self._channels[channel].modes,
'parse_as': "JOIN"} 'parse_as': "JOIN"}
def _check_puid_collision(self, nick): def _check_puid_collision(self, nick):
@ -741,6 +741,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
# with WHO %cuhsnfar (WHOX) - note, hopcount and realname are separate! # with WHO %cuhsnfar (WHOX) - note, hopcount and realname are separate!
# 0 1 2 3 4 5 6 7 8(-1) # 0 1 2 3 4 5 6 7 8(-1)
# <- :charybdis.midnight.vpn 354 ice #test ~gl localhost charybdis.midnight.vpn GL H*@ GL :realname # <- :charybdis.midnight.vpn 354 ice #test ~gl localhost charybdis.midnight.vpn GL H*@ GL :realname
channel = args[1]
ident = args[2] ident = args[2]
host = args[3] host = args[3]
nick = args[5] nick = args[5]
@ -762,6 +763,7 @@ 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)
@ -813,11 +815,6 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
modes = set(c.modes) modes = set(c.modes)
for user in users.copy(): for user in users.copy():
if user in c.users and 'userhost-in-names' in self.ircv3_caps:
log.debug("(%s) handle_315: Skipping ENDOFWHO -> JOIN for %s on %s, they're already there", self.name, user, channel)
users.remove(user)
continue
# Fill in prefix modes of everyone when doing mock SJOIN. # Fill in prefix modes of everyone when doing mock SJOIN.
try: try:
for mode in c.get_prefix_modes(user): for mode in c.get_prefix_modes(user):