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

hybrid: Use standard handle_events (with our special additions), don't lower() commands anymore since that isn't done now

Browse Source
This commit is contained in:
Daniel Oaks 2016-03-30 13:40:35 +10:00
parent c71010f1b0
commit 89c88d9111
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
protocols/hybrid.py
View File

@ -167,19 +167,21 @@ class HybridProtocol(TS6BaseProtocol):
"""Event handler for the Hybrid protocol. """Event handler for the Hybrid protocol.
This passes most commands to the various handle_ABCD() functions This passes most commands to the various handle_ABCD() functions
elsewhere in this module, coersing various sender prefixes from nicks elsewhere defined protocol modules, coersing various sender prefixes
to UIDs wherever possible. from nicks and server names to UIDs and SIDs respectively,
whenever possible.
Commands sent without an explicit sender prefix will have them set to
the SID of the uplink server.
""" """
data = data.split(" ") data = data.split(" ")
if not data:
# No data??
return
try: # Message starts with a SID/UID prefix. try: # Message starts with a SID/UID prefix.
args = self.parseTS6Args(data) args = self.parseTS6Args(data)
sender = args[0] sender = args[0]
command = args[1] command = args[1]
args = args[2:] args = args[2:]
# If the sender isn't in UID format, try to convert it automatically # If the sender isn't in UID format, try to convert it automatically.
# Unreal's protocol, for example, isn't quite consistent with this yet!
sender_server = self._getSid(sender) sender_server = self._getSid(sender)
if sender_server in self.irc.servers: if sender_server in self.irc.servers:
# Sender is a server when converted from name to SID. # Sender is a server when converted from name to SID.
@ -187,6 +189,7 @@ class HybridProtocol(TS6BaseProtocol):
else: else:
# Sender is a user. # Sender is a user.
numeric = self._getNick(sender) numeric = self._getNick(sender)
# parseTS6Args() will raise IndexError if the TS6 sender prefix is missing. # parseTS6Args() will raise IndexError if the TS6 sender prefix is missing.
except IndexError: except IndexError:
# Raw command without an explicit sender; assume it's being sent by our uplink. # Raw command without an explicit sender; assume it's being sent by our uplink.
@ -194,8 +197,9 @@ class HybridProtocol(TS6BaseProtocol):
numeric = self.irc.uplink numeric = self.irc.uplink
command = args[0] command = args[0]
args = args[1:] args = args[1:]
try: try:
command = self.hook_map.get(command.upper(), command).lower() command = self.hook_map.get(command.upper(), command)
func = getattr(self, 'handle_'+command.lower()) func = getattr(self, 'handle_'+command.lower())
except AttributeError: # unhandled command except AttributeError: # unhandled command
# self._send(self.irc.sid, 'ERROR', 'Unknown Command') # self._send(self.irc.sid, 'ERROR', 'Unknown Command')