From 5fa3d66a39dc22bff9a1d0345ebb70448b060e82 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Sun, 16 Jun 2019 15:33:20 +0100
Subject: Return all caps through received.cap.ls|new and check if valid in
 line_handler, remove server.cap_started

---
 modules/ircv3_resume.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'modules/ircv3_resume.py')

diff --git a/modules/ircv3_resume.py b/modules/ircv3_resume.py
index 19afb3b4..1750e954 100644
--- a/modules/ircv3_resume.py
+++ b/modules/ircv3_resume.py
@@ -24,10 +24,9 @@ class Module(ModuleManager.BaseModule):
 
     @utils.hook("received.cap.ls")
     def on_cap_ls(self, event):
-        if CAP.available(event["capabilities"]):
-            cap = CAP.copy()
-            cap.on_ack(lambda: self._cap_ack(event["server"]))
-            return cap
+        cap = CAP.copy()
+        cap.on_ack(lambda: self._cap_ack(event["server"]))
+        return cap
 
     def _cap_ack(self, server):
         server.wait_for_capability("resume")
@@ -39,7 +38,7 @@ class Module(ModuleManager.BaseModule):
         if event["args"][0] == "SUCCESS":
             resume_channels = event["server"].get_setting("resume-channels", [])
             self.log.info("Successfully resumed session")
-            event["server"].cap_started = False
+            event["server"].clear_waiting_capabilities()
 
         elif event["args"][0] == "TOKEN":
             token = self._get_token(event["server"])
-- 
cgit v1.3.1-10-gc9f91