From f8155ff74ceac177b0eea49fe8b8bab147e42505 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 16 Jun 2017 17:13:04 -0700 Subject: [PATCH] protocols: sed -i 's/_getSid/_get_SID/g' --- protocols/clientbot.py | 2 +- protocols/inspircd.py | 2 +- protocols/ircs2s_common.py | 4 ++-- protocols/p10.py | 2 +- protocols/unreal.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/protocols/clientbot.py b/protocols/clientbot.py index 4ddffe1..5db94e7 100644 --- a/protocols/clientbot.py +++ b/protocols/clientbot.py @@ -404,7 +404,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol): # pseudo-uids and pseudo-sids as we see prefixes. if ('!' not in sender) and '.' in sender: # Sender is a server name. XXX: make this check more foolproof - idsource = self._getSid(sender) + idsource = self._get_SID(sender) if idsource not in self.irc.servers: idsource = self.spawnServer(sender, internal=False) else: diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 2525c56..d982a8f 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -759,7 +759,7 @@ class InspIRCdProtocol(TS6BaseProtocol): # If we receive such a remote SQUIT, just forward it as a regular # SQUIT, in order to be consistent with other IRCds which make SQUITs # implicit. - target = self._getSid(args[0]) + target = self._get_SID(args[0]) if self.irc.isInternalServer(target): # The target has to be one of our servers in order to work... uplink = self.irc.servers[target].uplink diff --git a/protocols/ircs2s_common.py b/protocols/ircs2s_common.py index 86571c6..5dbfe70 100644 --- a/protocols/ircs2s_common.py +++ b/protocols/ircs2s_common.py @@ -51,7 +51,7 @@ class IRCCommonProtocol(Protocol): def _squit(self, numeric, command, args): """Handles incoming SQUITs.""" - split_server = self._getSid(args[0]) + split_server = self._get_SID(args[0]) # Normally we'd only need to check for our SID as the SQUIT target, but Nefarious # actually uses the uplink server as the SQUIT target. @@ -165,7 +165,7 @@ class IRCS2SProtocol(IRCCommonProtocol): sender = sender.lstrip(':') # If the sender isn't in numeric format, try to convert it automatically. - sender_sid = self._getSid(sender) + sender_sid = self._get_SID(sender) sender_uid = self._get_UID(sender) if sender_sid in self.irc.servers: diff --git a/protocols/p10.py b/protocols/p10.py index 9800f09..34ebe80 100644 --- a/protocols/p10.py +++ b/protocols/p10.py @@ -966,7 +966,7 @@ class P10Protocol(IRCS2SProtocol): # Why is this the way it is? I don't know... -GL target = args[1] - sid = self._getSid(target) + sid = self._get_SID(target) orig_pingtime = args[0][1:] # Strip the !, used to denote a TS instead of a server name. currtime = time.time() diff --git a/protocols/unreal.py b/protocols/unreal.py index 7e3b5e5..12325ac 100644 --- a/protocols/unreal.py +++ b/protocols/unreal.py @@ -511,7 +511,7 @@ class UnrealProtocol(TS6BaseProtocol): """Handles the SQUIT command.""" # <- SQUIT services.int :Read error # Convert the server name to a SID... - args[0] = self._getSid(args[0]) + args[0] = self._get_SID(args[0]) # Then, use the SQUIT handler in TS6BaseProtocol as usual. return super().handle_squit(numeric, 'SQUIT', args)