GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

clientbot: check for nick collisions with virtual clients on NICK

Browse Source 
Closes #535.
This commit is contained in:
James Lu 2017-10-07 20:06:48 -07:00
parent 84ff797b5f
commit d7766d54d5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/clientbot.py
View File

@ -977,21 +977,25 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
def handle_nick(self, source, command, args): def handle_nick(self, source, command, args):
"""Handles NICK changes.""" """Handles NICK changes."""
# <- :GL|!~GL@127.0.0.1 NICK :GL_ # <- :GL|!~GL@127.0.0.1 NICK :GL_
newnick = args[0]
if not self.connected.is_set(): if not self.connected.is_set():
# We haven't properly logged on yet, so any initial NICK should be treated as a forced # We haven't properly logged on yet, so any initial NICK should be treated as a forced
# nick change for us. For example, this clause is used to handle forced nick changes # nick change for us. For example, this clause is used to handle forced nick changes
# sent by ZNC, when the login nick and the actual IRC nick of the bouncer differ. # sent by ZNC, when the login nick and the actual IRC nick of the bouncer differ.
self.pseudoclient.nick = args[0] self.pseudoclient.nick = newnick
log.debug('(%s) Pre-auth FNC: Changing our nick to %s', self.name, args[0]) log.debug('(%s) Pre-auth FNC: Changing our nick to %s', self.name, args[0])
return return
elif source == self.pseudoclient.uid: elif source == self.pseudoclient.uid:
self._nick_fails = 0 # Our last nick change succeeded. self._nick_fails = 0 # Our last nick change succeeded.
oldnick = self.users[source].nick oldnick = self.users[source].nick
self.users[source].nick = args[0]
return {'newnick': args[0], 'oldnick': oldnick} # Check for any nick collisions with existing virtual clients.
self._check_nick_collision(newnick)
self.users[source].nick = newnick
return {'newnick': newnick, 'oldnick': oldnick}
def handle_part(self, source, command, args): def handle_part(self, source, command, args):
""" """