GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

protocols: sed -i 's/_getSid/_get_SID/g'

Browse Source
This commit is contained in:
James Lu 2017-06-16 17:13:04 -07:00
parent a60d746e3b
commit f8155ff74c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocols/clientbot.py
View File

@ -404,7 +404,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
# pseudo-uids and pseudo-sids as we see prefixes. # pseudo-uids and pseudo-sids as we see prefixes.
if ('!' not in sender) and '.' in sender: if ('!' not in sender) and '.' in sender:
# Sender is a server name. XXX: make this check more foolproof # 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: if idsource not in self.irc.servers:
idsource = self.spawnServer(sender, internal=False) idsource = self.spawnServer(sender, internal=False)
else: else:

2
protocols/inspircd.py
View File

@ -759,7 +759,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
# If we receive such a remote SQUIT, just forward it as a regular # 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 # SQUIT, in order to be consistent with other IRCds which make SQUITs
# implicit. # implicit.
target = self._getSid(args[0]) target = self._get_SID(args[0])
if self.irc.isInternalServer(target): if self.irc.isInternalServer(target):
# The target has to be one of our servers in order to work... # The target has to be one of our servers in order to work...
uplink = self.irc.servers[target].uplink uplink = self.irc.servers[target].uplink

4
protocols/ircs2s_common.py
View File

@ -51,7 +51,7 @@ class IRCCommonProtocol(Protocol):
def _squit(self, numeric, command, args): def _squit(self, numeric, command, args):
"""Handles incoming SQUITs.""" """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 # 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. # actually uses the uplink server as the SQUIT target.
@ -165,7 +165,7 @@ class IRCS2SProtocol(IRCCommonProtocol):
sender = sender.lstrip(':') sender = sender.lstrip(':')
# If the sender isn't in numeric format, try to convert it automatically. # 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) sender_uid = self._get_UID(sender)
if sender_sid in self.irc.servers: if sender_sid in self.irc.servers:

2
protocols/p10.py
View File

@ -966,7 +966,7 @@ class P10Protocol(IRCS2SProtocol):
# Why is this the way it is? I don't know... -GL # Why is this the way it is? I don't know... -GL
target = args[1] 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. orig_pingtime = args[0][1:] # Strip the !, used to denote a TS instead of a server name.
currtime = time.time() currtime = time.time()

2
protocols/unreal.py
View File

@ -511,7 +511,7 @@ class UnrealProtocol(TS6BaseProtocol):
"""Handles the SQUIT command.""" """Handles the SQUIT command."""
# <- SQUIT services.int :Read error # <- SQUIT services.int :Read error
# Convert the server name to a SID... # 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. # Then, use the SQUIT handler in TS6BaseProtocol as usual.
return super().handle_squit(numeric, 'SQUIT', args) return super().handle_squit(numeric, 'SQUIT', args)