re-add list moving CAP objects from capability_queue to capabilities_requested

This commit is contained in:
jesopo 2019-10-25 11:52:11 +01:00
parent 7d958be513
commit 9d1b640db4

View file

@ -306,10 +306,16 @@ class Server(IRCObject.Object):
return self.send(utils.irc.protocol.capability_ls()) return self.send(utils.irc.protocol.capability_ls())
def send_capability_queue(self): def send_capability_queue(self):
# textwrap works here because in ASCII, all chars are 1 bytes: # textwrap works here because in ASCII, all chars are 1 bytes:
capabilities = " ".join(self.capability_queue.keys()) capabilities = list(self.capability_queue.keys())
capability_batches = textwrap.wrap(capabilities, capabilities_str = " ".join(capabilities)
capability_batches = textwrap.wrap(capabilities_str,
IRCLine.LINE_MAX-len("CAP REQ :")) IRCLine.LINE_MAX-len("CAP REQ :"))
for cap_name in capabilities:
cap = self.capability_queue[cap_name]
del self.capability_queue[cap_name]
self.capabilities_requested[cap_name] = cap
for capability_batch in capability_batches: for capability_batch in capability_batches:
self.send_capability_request(capability_batch) self.send_capability_request(capability_batch)