aboutsummaryrefslogtreecommitdiff
path: root/modules/line_handler.py
diff options
context:
space:
mode:
authorGravatar jesopo2018-11-08 17:08:46 +0000
committerGravatar jesopo2018-11-08 17:08:46 +0000
commit2e43c9f3cfc65f80875a8b06374ac16ac50b3211 (patch)
tree5b11688bf06c78d63568fbf8828af2101023c1ae /modules/line_handler.py
parentOnly send 'PROTOCTL NAMESX' when we're not already got IRCv3's multi-prefix CAP (diff)
Add a way to halt CAP before it hits CAP END
Diffstat (limited to 'modules/line_handler.py')
-rw-r--r--modules/line_handler.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/line_handler.py b/modules/line_handler.py
index 0033ea4f..bdb0c70b 100644
--- a/modules/line_handler.py
+++ b/modules/line_handler.py
@@ -292,12 +292,13 @@ class Module(ModuleManager.BaseModule):
elif subcommand == "ack":
event["server"].capabilities.update(capabilities)
if not is_multiline:
- self.events.on("received.cap.ack").call(
+ results = self.events.on("received.cap.ack").call(
capabilities=event["server"].capabilities,
server=event["server"])
- if not event["server"].waiting_for_capabilities():
- event["server"].send_capability_end()
+ if not False in results:
+ if not event["server"].waiting_for_capabilities():
+ event["server"].send_capability_end()
elif subcommand == "nack":
event["server"].send_capability_end()