Generalize priorities to all hook types

Author: linuxdaemon

cloudbot/bot.py

@@ -5,6 +5,7 @@
 import re
 import os
 import gc
+from operator import attrgetter
 
 from sqlalchemy import create_engine
 
@@ -299,11 +300,8 @@ def add_hook(hook, _event, _run_before=False):
                                 formatting.get_text_list([command for command, plugin in potential_matches])))
 
             # Regex hooks
-            def regex_priority(t):
-                return t[1].priority
-
             regex_matched = False
-            for regex, regex_hook in sorted(self.plugin_manager.regex_hooks, key=regex_priority, reverse=True):
+            for regex, regex_hook in self.plugin_manager.regex_hooks:
                 if not regex_hook.run_on_cmd and cmd_match:
                     continue
 

cloudbot/plugin.py

@@ -228,8 +228,14 @@ def load_plugin(self, path):
             self.sieves.append(sieve_hook)
             self._log_hook(sieve_hook)
 
-        # sort sieve hooks by priority
-        self.sieves.sort(key=lambda x: x.priority)
+        # Sort hooks
+        self.regex_hooks.sort(key=lambda x: x[1].priority)
+        dicts_of_lists_of_hooks = (self.event_type_hooks, self.raw_triggers)
+        lists_of_hooks = [self.catch_all_triggers, self.sieves]
+        lists_of_hooks.extend(d.values() for d in dicts_of_lists_of_hooks)
+
+        for lst in lists_of_hooks:
+            lst.sort(key=lambda x: x.priority)
 
         # we don't need this anymore
         del plugin.run_on_start
@@ -596,6 +602,7 @@ def __init__(self, _type, plugin, func_hook):
         self.permissions = func_hook.kwargs.pop("permissions", [])
         self.single_thread = func_hook.kwargs.pop("singlethread", False)
         self.action = func_hook.kwargs.pop("action", Action.CONTINUE)
+        self.priority = func_hook.kwargs.pop("priority", Priority.NORMAL)
 
         if func_hook.kwargs:
             # we should have popped all the args, so warn if there are any left
@@ -652,7 +659,6 @@ def __init__(self, plugin, regex_hook):
         :type regex_hook: cloudbot.util.hook._RegexHook
         """
         self.run_on_cmd = regex_hook.kwargs.pop("run_on_cmd", False)
-        self.priority = regex_hook.kwargs.pop("priority", Priority.NORMAL)
         self.only_no_match = regex_hook.kwargs.pop("only_no_match", False)
 
         self.regexes = regex_hook.regexes