3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00

ngircd: run check_nick_collision in handle_nick, per #375

This commit is contained in:
James Lu 2017-07-07 03:16:56 -07:00
parent bd79c71b85
commit c5d06b2d41

View File

@ -185,7 +185,7 @@ class NgIRCdProtocol(IRCS2SProtocol):
raise LookupError('No such PyLink client/server %r exists' % source) raise LookupError('No such PyLink client/server %r exists' % source)
self.apply_modes(target, modes) self.apply_modes(target, modes)
modes = list(modes) modes = list(modes) # Work around TypeError in the expand PUID section
if utils.isChannel(target): if utils.isChannel(target):
msgprefix = ':%s MODE %s ' % (self._expandPUID(source), target) msgprefix = ':%s MODE %s ' % (self._expandPUID(source), target)
@ -434,6 +434,7 @@ class NgIRCdProtocol(IRCS2SProtocol):
# <- :ngircd.midnight.local NICK GL 1 ~gl localhost 1 +io :realname # <- :ngircd.midnight.local NICK GL 1 ~gl localhost 1 +io :realname
nick = args[0] nick = args[0]
assert source in self.servers, "Server %r tried to introduce nick %r but isn't in the servers index?" % (source, nick) assert source in self.servers, "Server %r tried to introduce nick %r but isn't in the servers index?" % (source, nick)
self.check_nick_collision(nick)
ident = args[2] ident = args[2]
host = args[3] host = args[3]