Add client type filter for hooks

Author: linuxdaemon

cloudbot/bot.py

@@ -239,6 +239,9 @@ def add_hook(hook, _event, _run_before=False):
             if halted:
                 return False
 
+            if hook.clients and _event.conn.type not in hook.clients:
+                return True
+
             coro = self.plugin_manager.launch(hook, _event)
             if _run_before:
                 run_before_tasks.append(coro)

cloudbot/clients/irc.py

@@ -104,16 +104,15 @@ def describe_server(self):
 
     @asyncio.coroutine
     def try_connect(self):
-        timeout = self.config["connection"].get("timeout", 30)
         while True:
             try:
-                yield from self.connect(timeout)
+                yield from self.connect(self.timeout)
             except (asyncio.TimeoutError, OSError):
                 logger.exception("[%s] Error occurred while connecting", self.name)
             else:
                 break
 
-            yield from asyncio.sleep(random.randrange(timeout))
+            yield from asyncio.sleep(random.randrange(self.timeout))
 
     @asyncio.coroutine
     def connect(self, timeout=None):
@@ -148,6 +147,7 @@ def connect(self, timeout=None):
         tasks = [
             self.bot.plugin_manager.launch(hook, Event(bot=self.bot, conn=self, hook=hook))
             for hook in self.bot.plugin_manager.connect_hooks
+            if not hook.clients or self.type in hook.clients
         ]
         # TODO stop connecting if a connect hook fails?
         yield from asyncio.gather(*tasks)

cloudbot/plugin.py

@@ -730,6 +730,13 @@ def __init__(self, _type, plugin, func_hook):
         self.action = func_hook.kwargs.pop("action", Action.CONTINUE)
         self.priority = func_hook.kwargs.pop("priority", Priority.NORMAL)
 
+        clients = func_hook.kwargs.pop("clients", [])
+
+        if isinstance(clients, str):
+            clients = [clients]
+
+        self.clients = clients
+
         if func_hook.kwargs:
             # we should have popped all the args, so warn if there are any left
             logger.warning("Ignoring extra args {} from {}".format(func_hook.kwargs, self.description))

plugins/core/cap.py

@@ -8,7 +8,7 @@
 from cloudbot.util.parsers.irc import CapList
 
 
-@hook.connect(priority=-10)
+@hook.connect(priority=-10, clients="irc")
 def send_cap_ls(conn):
     conn.cmd("CAP", "LS", "302")
     conn.memory.setdefault("available_caps", set()).clear()

plugins/core/core_connect.py

@@ -1,7 +1,7 @@
 from cloudbot import hook
 
 
-@hook.connect(priority=0)
+@hook.connect(priority=0, clients="irc")
 def conn_pass(conn):
     conn.set_pass(conn.config["connection"].get("password"))
 
@@ -11,7 +11,7 @@ def conn_nick(conn):
     conn.set_nick(conn.nick)
 
 
-@hook.connect(priority=20)
+@hook.connect(priority=20, clients="irc")
 def conn_user(conn):
     conn.cmd(
         "USER", conn.config.get('user', 'cloudbot'), "3", "*",