fix merge conflict

Author: edwardslabs

cloudbot/bot.py

@@ -5,15 +5,17 @@
 import re
 import os
 import gc
+from operator import attrgetter
+
 from sqlalchemy import create_engine
 
 from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.schema import MetaData
 
-import cloudbot
 from cloudbot.client import Client
 from cloudbot.config import Config
+from cloudbot.hook import Action
 from cloudbot.reloader import PluginReloader
 from cloudbot.plugin import PluginManager
 from cloudbot.event import Event, CommandEvent, RegexEvent, EventType
@@ -221,23 +223,46 @@ def process(self, event):
         run_before_tasks = []
         tasks = []
         command_prefix = event.conn.config.get('command_prefix', '.')
+        halted = False
+
+        def add_hook(hook, _event, _run_before=False):
+            nonlocal halted
+            if halted:
+                return False
+
+            coro = self.plugin_manager.launch(hook, _event)
+            if _run_before:
+                run_before_tasks.append(coro)
+            else:
+                tasks.append(coro)
+
+            if hook.action is Action.HALTALL:
+                halted = True
+                return False
+            elif hook.action is Action.HALTTYPE:
+                return False
+            return True
 
         # Raw IRC hook
         for raw_hook in self.plugin_manager.catch_all_triggers:
             # run catch-all coroutine hooks before all others - TODO: Make this a plugin argument
-            if not raw_hook.threaded:
-                run_before_tasks.append(
-                    self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
-            else:
-                tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+            run_before = not raw_hook.threaded
+            if not add_hook(raw_hook, Event(hook=raw_hook, base_event=event), _run_before=run_before):
+                # The hook has an action of Action.HALT* so stop adding new tasks
+                break
+
         if event.irc_command in self.plugin_manager.raw_triggers:
             for raw_hook in self.plugin_manager.raw_triggers[event.irc_command]:
-                tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+                if not add_hook(raw_hook, Event(hook=raw_hook, base_event=event)):
+                    # The hook has an action of Action.HALT* so stop adding new tasks
+                    break
 
         # Event hooks
         if event.type in self.plugin_manager.event_type_hooks:
             for event_hook in self.plugin_manager.event_type_hooks[event.type]:
-                tasks.append(self.plugin_manager.launch(event_hook, Event(hook=event_hook, base_event=event)))
+                if not add_hook(event_hook, Event(hook=event_hook, base_event=event)):
+                    # The hook has an action of Action.HALT* so stop adding new tasks
+                    break
 
         if event.type is EventType.message:
             # Commands
@@ -258,7 +283,7 @@ def process(self, event):
                     command_hook = self.plugin_manager.commands[command]
                     command_event = CommandEvent(hook=command_hook, text=text,
                                                  triggered_command=command, base_event=event)
-                    tasks.append(self.plugin_manager.launch(command_hook, command_event))
+                    add_hook(command_hook, command_event)
                 else:
                     potential_matches = []
                     for potential_match, plugin in self.plugin_manager.commands.items():
@@ -269,20 +294,27 @@ def process(self, event):
                             command_hook = potential_matches[0][1]
                             command_event = CommandEvent(hook=command_hook, text=text,
                                                          triggered_command=command, base_event=event)
-                            tasks.append(self.plugin_manager.launch(command_hook, command_event))
+                            add_hook(command_hook, command_event)
                         else:
                             event.notice("Possible matches: {}".format(
                                 formatting.get_text_list([command for command, plugin in potential_matches])))
 
             # Regex hooks
+            regex_matched = False
             for regex, regex_hook in self.plugin_manager.regex_hooks:
                 if not regex_hook.run_on_cmd and cmd_match:
-                    pass
-                else:
-                    regex_match = regex.search(event.content)
-                    if regex_match:
-                        regex_event = RegexEvent(hook=regex_hook, match=regex_match, base_event=event)
-                        tasks.append(self.plugin_manager.launch(regex_hook, regex_event))
+                    continue
+
+                if regex_hook.only_no_match and regex_matched:
+                    continue
+
+                regex_match = regex.search(event.content)
+                if regex_match:
+                    regex_matched = True
+                    regex_event = RegexEvent(hook=regex_hook, match=regex_match, base_event=event)
+                    if not add_hook(regex_hook, regex_event):
+                        # The hook has an action of Action.HALT* so stop adding new tasks
+                        break
 
         # Run the tasks
         yield from asyncio.gather(*run_before_tasks, loop=self.loop)

cloudbot/hook.py

@@ -1,12 +1,32 @@
 import collections
 import inspect
 import re
+import collections
+from enum import Enum, unique, IntEnum
 
 from cloudbot.event import EventType
 
 valid_command_re = re.compile(r"^\w+$")
 
 
+@unique
+class Priority(IntEnum):
+    # Reversed to maintain compatibility with sieve hooks numeric priority
+    LOWEST = 127
+    LOW = 63
+    NORMAL = 0
+    HIGH = -64
+    HIGHEST = -128
+
+
+@unique
+class Action(Enum):
+    """Defines the action to take after executing a hook"""
+    HALTTYPE = 0  # Once this hook executes, no other hook of that type should run
+    HALTALL = 1  # Once this hook executes, No other hook should run
+    CONTINUE = 2  # Normal execution of all hooks
+
+
 class _Hook:
     """
     :type function: function

cloudbot/plugin.py

@@ -7,10 +7,12 @@
 import re
 from collections import defaultdict
 from operator import attrgetter
+from itertools import chain
 
 import sqlalchemy
 
 from cloudbot.event import Event
+from cloudbot.hook import Priority, Action
 from cloudbot.util import database
 
 logger = logging.getLogger("cloudbot")
@@ -254,6 +256,15 @@ def load_plugin(self, path):
         self.sieves.sort(key=lambda x: x.priority)
         self.connect_hooks.sort(key=attrgetter("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(chain.from_iterable(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
 
@@ -643,6 +654,8 @@ 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
@@ -699,6 +712,7 @@ 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.only_no_match = regex_hook.kwargs.pop("only_no_match", False)
 
         self.regexes = regex_hook.regexes
 

plugins/duckhunt.py

@@ -296,10 +296,10 @@ def befriend(nick, chan, message, db, conn, notice):
         return "There is no hunt right now. Use .starthunt to start a game."
     elif game_status[network][chan]['duck_status'] != 1:
         if game_status[network][chan]['no_duck_kick'] == 1:
-            out = "KICK {} {} :You tried befriending a non-existent duck, that's fucking creepy.".format(chan, nick)
+            out = "KICK {} {} :You tried befriending a non-existent duck. That's fucking creepy.".format(chan, nick)
             conn.send(out)
             return
-        return "You tried befriending a non-existent duck, that's fucking creepy."
+        return "You tried befriending a non-existent duck. That's fucking creepy."
     else:
         game_status[network][chan]['shoot_time'] = time()
         deploy = game_status[network][chan]['duck_time']

plugins/link_announcer.py

@@ -4,17 +4,18 @@
 from contextlib import closing
 from cloudbot import hook
 
-# This will match any URL except the patterns defined in blacklist.
-blacklist = '.*(reddit\.com|redd\.it|youtube\.com|youtu\.be|imdb\.com|spotify\.com|twitter\.com|twitch\.tv|amazon\.co|xkcd\.com|amzn\.co|steamcommunity\.com|steampowered\.com|newegg\.com|soundcloud\.com|vimeo\.com|speedtest\.net).*'
-url_re = re.compile('(?!{})http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+~]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'.format(blacklist), re.I)
+from cloudbot.hook import Priority, Action
+
+# This will match any URL, blacklist removed and abstracted to a priority/halting system
+url_re = re.compile(r'https?://(?:[a-zA-Z]|[0-9]|[$-_@.&+~]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', re.I)
 
 opt_out = []
 
 traditional = [
     (1024 ** 5, 'PB'),
-    (1024 ** 4, 'TB'), 
-    (1024 ** 3, 'GB'), 
-    (1024 ** 2, 'MB'), 
+    (1024 ** 4, 'TB'),
+    (1024 ** 3, 'GB'),
+    (1024 ** 2, 'MB'),
     (1024 ** 1, 'KB'),
     (1024 ** 0, 'B'),
     ]
@@ -29,7 +30,8 @@ def bytesto(bytes, system = traditional):
     amount = int(bytes/factor)
     return str(amount) + suffix
 
-@hook.regex(url_re)
+
+@hook.regex(url_re, priority=Priority.LOW, action=Action.HALTTYPE, only_no_match=True)
 def print_url_title(message, match, chan):
     if chan in opt_out:
         return