Update link_announcer.py to priority/halting system; add regex_hook param 'only_no_match'

Author: linuxdaemon

cloudbot/bot.py

@@ -304,12 +304,17 @@ def add_hook(hook, _event, _run_before=False):
             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):
                 if not regex_hook.run_on_cmd and cmd_match:
                     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

cloudbot/plugin.py

@@ -653,6 +653,7 @@ def __init__(self, plugin, regex_hook):
         """
         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
 

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).*'
-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