Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

.lower() -> .upper() for CAP subcommands. makes a lot more sense.

Browse source
This commit is contained in:
jesopo 2019-05-18 14:57:09 +01:00
parent e7edd9997f
commit 161c60c4f6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/line_handler/ircv3.py
View file

@ -35,10 +35,10 @@ def _caps_offered(server, caps):
def cap(events, event): def cap(events, event):
capabilities = utils.parse.keyvalue(event["args"][-1]) capabilities = utils.parse.keyvalue(event["args"][-1])
subcommand = event["args"][1].lower() subcommand = event["args"][1].upper()
is_multiline = len(event["args"]) > 3 and event["args"][2] == "*" is_multiline = len(event["args"]) > 3 and event["args"][2] == "*"
if subcommand == "ls": if subcommand == "LS":
event["server"].cap_started = True event["server"].cap_started = True
event["server"].server_capabilities.update(capabilities) event["server"].server_capabilities.update(capabilities)
if not is_multiline: if not is_multiline:
@ -57,7 +57,7 @@ def cap(events, event):
event["server"].send_capability_queue() event["server"].send_capability_queue()
else: else:
event["server"].send_capability_end() event["server"].send_capability_end()
elif subcommand == "new": elif subcommand == "NEW":
capabilities_keys = capabilities.keys() capabilities_keys = capabilities.keys()
event["server"].server_capabilities.update(capabilities) event["server"].server_capabilities.update(capabilities)
@ -72,20 +72,20 @@ def cap(events, event):
if event["server"].capability_queue: if event["server"].capability_queue:
event["server"].send_capability_queue() event["server"].send_capability_queue()
elif subcommand == "del": elif subcommand == "DEL":
for capability in capabilities.keys(): for capability in capabilities.keys():
event["server"].agreed_capabilities.discard(capability) event["server"].agreed_capabilities.discard(capability)
del event["server"].server_capabilities[capability] del event["server"].server_capabilities[capability]
events.on("received.cap.del").call(server=event["server"], events.on("received.cap.del").call(server=event["server"],
capabilities=capabilities) capabilities=capabilities)
elif subcommand == "ack": elif subcommand == "ACK":
event["server"].agreed_capabilities.update(capabilities) event["server"].agreed_capabilities.update(capabilities)
events.on("received.cap.ack").call(capabilities=capabilities, events.on("received.cap.ack").call(capabilities=capabilities,
server=event["server"]) server=event["server"])
if subcommand == "ack" or subcommand == "nak": if subcommand == "ACK" or subcommand == "NAK":
ack = subcommand == "ack" ack = subcommand == "ACK"
for capability in capabilities: for capability in capabilities:
cap_obj = event["server"].capability_queue[capability] cap_obj = event["server"].capability_queue[capability]
del event["server"].capability_queue[capability] del event["server"].capability_queue[capability]