From 9d1b640db4a8336c5441c337a13577d03f5bab50 Mon Sep 17 00:00:00 2001 From: jesopo Date: Fri, 25 Oct 2019 11:52:11 +0100 Subject: [PATCH] re-add list moving CAP objects from `capability_queue` to `capabilities_requested` --- src/IRCServer.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/IRCServer.py b/src/IRCServer.py index efcf1fa3..8fed6f46 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -306,10 +306,16 @@ class Server(IRCObject.Object): return self.send(utils.irc.protocol.capability_ls()) def send_capability_queue(self): # textwrap works here because in ASCII, all chars are 1 bytes: - capabilities = " ".join(self.capability_queue.keys()) - capability_batches = textwrap.wrap(capabilities, + capabilities = list(self.capability_queue.keys()) + capabilities_str = " ".join(capabilities) + capability_batches = textwrap.wrap(capabilities_str, 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: self.send_capability_request(capability_batch)