Merge pull request CloudBotIRC#120 from linuxdaemon/gonzobot+remove-old-optout-system

Remove old optout lists in favor of the optout plugin

Author: edwardslabs

plugins/cheer.py

@@ -22,6 +22,5 @@ def cheer(chan, message):
     """
     :type chan: str
     """
-    if chan not in ["#yogscast"]:
-        shit = random.choice(cheers)
-        message(shit, chan)
+    shit = random.choice(cheers)
+    message(shit, chan)

plugins/dogpile.py

@@ -9,13 +9,9 @@
 
 HEADERS = {'User-Agent': 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19'}
 
-opt_out = []
-
 @hook.command("dpis", "gis")
-def dogpileimage(text, chan):
+def dogpileimage(text):
     """Uses the dogpile search engine to search for images."""
-    if chan in opt_out:
-        return
     image_url = search_url + "/images"
     params = {'q': " ".join(text.split())}
     r = requests.get(image_url, params=params, headers=HEADERS)
@@ -29,10 +25,8 @@ def dogpileimage(text, chan):
     return image
 
 @hook.command("dp", "g", "dogpile")
-def dogpile(text, chan):
+def dogpile(text):
     """Uses the dogpile search engine to find shit on the web."""
-    if chan in opt_out:
-        return
     web_url = search_url + "/web"
     params = {'q':" ".join(text.split())}
     r = requests.get(web_url, params=params, headers=HEADERS)

plugins/herald.py

@@ -7,7 +7,6 @@
 from cloudbot import hook
 from cloudbot.util import database
 
-opt_out = []
 delay = 10
 floodcheck = {}
 
@@ -80,9 +79,6 @@ def welcome(nick, message, db, bot, chan):
 
     grab = bot.plugin_manager.find_plugin("grab")
 
-    if chan in opt_out:
-        return
-
     if chan in floodcheck:
         if time.time() - floodcheck[chan] <= delay:
             return

plugins/link_announcer.py

@@ -10,8 +10,6 @@
 # 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 = []
-
 HEADERS = {
     'Accept-Language': 'en-US,en;q=0.5',
     'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36'
@@ -21,10 +19,7 @@
 
 
 @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
-
+def print_url_title(message, match):
     with closing(requests.get(match.group(), headers=HEADERS, stream=True, timeout=3)) as r:
         r.raise_for_status()
         if not r.encoding:
@@ -39,4 +34,4 @@ def print_url_title(message, match, chan):
     html = BeautifulSoup(content, "lxml", from_encoding=encoding)
     title = " ".join(html.title.text.strip().splitlines())
     out = "Title: \x02{}\x02".format(title)
-    message(out, chan)
+    message(out)