diff --git a/protocols/hybrid.py b/protocols/hybrid.py index 829e0fb..e22e85e 100644 --- a/protocols/hybrid.py +++ b/protocols/hybrid.py @@ -169,7 +169,7 @@ class HybridProtocol(TS6Protocol): """ # <- :0UY UID dan 1 1451041551 +Facdeiklosuw ~ident localhost 127.0.0.1 0UYAAAAAB * :realname nick = args[0] - self.checkCollision(nick) + self.check_nick_collision(nick) ts, modes, ident, host, ip, uid, account, realname = args[2:10] if account == '*': account = None diff --git a/protocols/inspircd.py b/protocols/inspircd.py index f6331e4..2525c56 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -575,7 +575,7 @@ class InspIRCdProtocol(TS6BaseProtocol): """Handles incoming UID commands (user introduction).""" # :70M UID 70MAAAAAB 1429934638 GL 0::1 hidden-7j810p.9mdf.lrek.0000.0000.IP gl 0::1 1429934638 +Wioswx +ACGKNOQXacfgklnoqvx :realname uid, ts, nick, realhost, host, ident, ip = args[0:7] - self.checkCollision(nick) + self.check_nick_collision(nick) realname = args[-1] self.irc.users[uid] = userobj = IrcUser(nick, ts, uid, numeric, ident, host, realname, realhost, ip) diff --git a/protocols/ircs2s_common.py b/protocols/ircs2s_common.py index 378a772..16edb50 100644 --- a/protocols/ircs2s_common.py +++ b/protocols/ircs2s_common.py @@ -14,7 +14,7 @@ class IRCS2SProtocol(Protocol): self.protocol_caps = {'can-spawn-clients', 'has-ts', 'can-host-relay', 'can-track-servers'} - def checkCollision(self, nick): + def check_nick_collision(self, nick): """ Nick collision checker. """ diff --git a/protocols/p10.py b/protocols/p10.py index 4163303..b9139c4 100644 --- a/protocols/p10.py +++ b/protocols/p10.py @@ -901,7 +901,7 @@ class P10Protocol(IRCS2SProtocol): # <- AB N GL 1 1460673049 ~gl nefarious.midnight.vpn +iw B]AAAB ABAAA :realname nick = args[0] - self.checkCollision(nick) + self.check_nick_collision(nick) ts, ident, host = args[2:5] realhost = host ip = args[-3] diff --git a/protocols/ts6.py b/protocols/ts6.py index 32fd783..8249e28 100644 --- a/protocols/ts6.py +++ b/protocols/ts6.py @@ -499,7 +499,7 @@ class TS6Protocol(TS6BaseProtocol): """Handles incoming EUID commands (user introduction).""" # <- :42X EUID GL 1 1437505322 +ailoswz ~gl 127.0.0.1 127.0.0.1 42XAAAAAB * * :realname nick = args[0] - self.checkCollision(nick) + self.check_nick_collision(nick) ts, modes, ident, host, ip, uid, realhost, accountname, realname = args[2:11] if realhost == '*': realhost = None diff --git a/protocols/unreal.py b/protocols/unreal.py index e576c3d..fbdba61 100644 --- a/protocols/unreal.py +++ b/protocols/unreal.py @@ -390,7 +390,7 @@ class UnrealProtocol(TS6BaseProtocol): # arguments: nick, hopcount?, ts, ident, real-host, UID, services account (0 if none), modes, # displayed host, cloaked (+x) host, base64-encoded IP, and realname nick = args[0] - self.checkCollision(nick) + self.check_nick_collision(nick) ts, ident, realhost, uid, accountname, modestring, host = args[2:9] if host == '*':