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

Handle CAP ACK -<cap> and ACK from a REQ not sent by ircv3.py

Browse source
This commit is contained in:
jesopo 2019-06-23 11:23:52 +01:00
parent 5028eb02d5
commit ab466756cc
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/line_handler/ircv3.py
View file

@ -84,7 +84,12 @@ def cap(exports, events, event):
events.on("received.cap.del").call(server=event["server"],
capabilities=capabilities)
elif subcommand == "ACK":
event["server"].agreed_capabilities.update(capabilities)
for cap_name, cap_args in capabilities.items():
if cap_name[0] == "-":
event["server"].agreed_capabilities.discard(cap_name[1:])
else:
event["server"].agreed_capabilities.add(cap_name)
events.on("received.cap.ack").call(capabilities=capabilities,
server=event["server"])
@ -115,12 +120,13 @@ def cap(exports, events, event):
if subcommand == "ACK" or subcommand == "NAK":
ack = subcommand == "ACK"
for capability in capabilities:
cap_obj = event["server"].capabilities_requested[capability]
del event["server"].capabilities_requested[capability]
if ack:
cap_obj.ack()
else:
cap_obj.nak()
if capability in event["server"].capabilities_requested:
cap_obj = event["server"].capabilities_requested[capability]
del event["server"].capabilities_requested[capability]
if ack:
cap_obj.ack()
else:
cap_obj.nak()
if (not event["server"].capabilities_requested and
not event["server"].waiting_for_capabilities()):