Merge branch 'gonzobot' into gonzobot+asyncio-threadsafe-wrap

Author: linuxdaemon

cloudbot/__init__.py

@@ -12,7 +12,7 @@
 
 __version__ = "1.0.9"
 
-__all__ = ["util", "bot", "connection", "config", "permissions", "plugin", "event", "hook", "log_dir"]
+__all__ = ["clients", "util", "bot", "client", "config", "event", "hook", "permissions", "plugin", "reloader", "logging_dir"]
 
 
 def _setup():

cloudbot/config.py

@@ -3,11 +3,12 @@
 import os
 import sys
 import time
+from collections import OrderedDict
 
 logger = logging.getLogger("cloudbot")
 
 
-class Config(dict):
+class Config(OrderedDict):
     """
     :type filename: str
     :type path: str
@@ -41,8 +42,10 @@ def load_config(self):
             sys.exit()
 
         with open(self.path) as f:
-            self.update(json.load(f))
-            logger.debug("Config loaded from file.")
+            data = json.load(f, object_pairs_hook=OrderedDict)
+
+        self.update(data)
+        logger.debug("Config loaded from file.")
 
         # reload permissions
         if self.bot.connections:
@@ -51,5 +54,7 @@ def load_config(self):
 
     def save_config(self):
         """saves the contents of the config dict to the config file"""
-        json.dump(self, open(self.path, 'w'), sort_keys=True, indent=4)
+        with open(self.path, 'w') as f:
+            json.dump(self, f, indent=4)
+
         logger.info("Config saved to file.")

plugins/admin_channel.py

@@ -114,7 +114,7 @@ def kick(text, chan, conn, notice, nick, admin_log):
         target = split[1]
         if len(split) > 2:
             reason = " ".join(split[2:])
-            out = "KICK {} {}: {}".format(channel, target, reason)
+            out = "KICK {} {} :{}".format(channel, target, reason)
         else:
             out = "KICK {} {}".format(channel, target)
     else:

plugins/amazon.py

@@ -1,6 +1,7 @@
 import requests
 import re
 from bs4 import BeautifulSoup
+from requests import HTTPError
 
 from cloudbot import hook
 from cloudbot.util import web, formatting, colors
@@ -19,14 +20,14 @@
 
 
 @hook.regex(AMAZON_RE)
-def amazon_url(match):
+def amazon_url(match, reply):
     cc = match.group(1)
     asin = match.group(2)
-    return amazon(asin, _parsed=cc)
+    return amazon(asin, reply, _parsed=cc)
 
 
 @hook.command("amazon", "az")
-def amazon(text, _parsed=False):
+def amazon(text, reply, _parsed=False):
     """<query> -- Searches Amazon for query"""
     headers = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, '
@@ -43,6 +44,12 @@ def amazon(text, _parsed=False):
     else:
         request = requests.get(SEARCH_URL.format(REGION), params=params, headers=headers)
 
+    try:
+        request.raise_for_status()
+    except HTTPError:
+        reply("Amazon API error occurred.")
+        raise
+
     soup = BeautifulSoup(request.text)
 
     # check if there are any results on the amazon page

plugins/bible.py

@@ -11,8 +11,9 @@ def bible(text, reply):
         'formatting':'plain',
         'type':'json'
     }
-    r = requests.get("https://labs.bible.org/api", params=params)
     try:
+        r = requests.get("https://labs.bible.org/api", params=params)
+        r.raise_for_status()
         response = r.json()[0]
     except Exception:
         reply("Something went wrong, either you entered an invalid passage or the API is down.")

plugins/bing.py

@@ -2,6 +2,7 @@
 
 import requests
 from lxml import html
+from requests import HTTPError
 
 from cloudbot import hook
 from cloudbot.util import formatting, filesize, colors
@@ -30,7 +31,7 @@ def bingify(s):
 
 
 @hook.command("bing", "b")
-def bing(text, bot):
+def bing(text, bot, reply):
     """<query> - returns the first bing search result for <query>"""
     api_key = bot.config.get("api_keys", {}).get("bing_azure")
 
@@ -55,6 +56,12 @@ def bing(text, bot):
 
     request = requests.get(API_URL, params=params, auth=(api_key, api_key))
 
+    try:
+        request.raise_for_status()
+    except HTTPError:
+        reply("Bing API error occurred.")
+        raise
+
     # I'm not even going to pretend to know why results are in ['d']['results'][0]
     j = request.json()['d']['results'][0]
 
@@ -72,7 +79,7 @@ def bing(text, bot):
 
 
 @hook.command("bingimage", "bis")
-def bingimage(text, bot):
+def bingimage(text, bot, reply):
     """<query> - returns the first bing image search result for <query>"""
     api_key = bot.config.get("api_keys", {}).get("bing_azure")
 
@@ -98,6 +105,12 @@ def bingimage(text, bot):
 
     request = requests.get(API_URL, params=params, auth=(api_key, api_key))
 
+    try:
+        request.raise_for_status()
+    except HTTPError:
+        reply("Bing API error occurred.")
+        raise
+
     # I'm not even going to pretend to know why results are in ['d']['results'][0]
     j = request.json()['d']['results'][0]
 

plugins/books.py

@@ -1,4 +1,5 @@
 import requests
+from requests import HTTPError
 
 from cloudbot import hook
 from cloudbot.util import formatting, web
@@ -14,12 +15,20 @@ def load_key(bot):
 
 
 @hook.command("books", "gbooks")
-def books(text):
+def books(text, reply):
     """books <query> -- Searches Google Books for <query>."""
     if not dev_key:
         return "This command requires a Google Developers Console API key."
 
-    json = requests.get(book_search_api, params={"q": text, "key": dev_key, "country": "US"}).json()
+    request = requests.get(book_search_api, params={"q": text, "key": dev_key, "country": "US"})
+
+    try:
+        request.raise_for_status()
+    except HTTPError:
+        reply("Bing API error occurred.")
+        raise
+
+    json = request.json()
 
     if json.get('error'):
         if json['error']['code'] == 403:

plugins/brew.py

@@ -1,4 +1,5 @@
 import requests
+from requests import HTTPError
 
 from cloudbot import hook
 
@@ -12,7 +13,7 @@ def load_key(bot):
 
 
 @hook.command('brew')
-def brew(text, bot):
+def brew(text, reply):
     """<query> - returns the first brewerydb search result for <query>"""
 
     if not api_key:
@@ -21,8 +22,11 @@ def brew(text, bot):
     params = {'key': api_key, 'type': 'beer', 'withBreweries': 'Y', 'q': text}
     request = requests.get(api_url, params=params)
 
-    if request.status_code != requests.codes.ok:
-        return "Failed to fetch info ({})".format(request.status_code)
+    try:
+        request.raise_for_status()
+    except HTTPError:
+        reply("Failed to fetch info ({})".format(request.status_code))
+        raise
 
     response = request.json()
 
@@ -58,6 +62,7 @@ def brew(text, bot):
 
     except Exception as e:
         print(e)
-        output = "Error parsing results."
+        reply("Error parsing results.")
+        raise
 
     return output

plugins/cats.py

@@ -1,40 +1,31 @@
 import requests
+from requests import HTTPError
+
 from cloudbot import hook
 
 
+def get_data(url, reply, bot, params=None):
+    try:
+        r = requests.get(url, headers={'User-Agent': bot.user_agent}, params=params)
+        r.raise_for_status()
+    except HTTPError:
+        reply("API error occurred.")
+        raise
+
+    return r
+
+
 @hook.command(autohelp=False)
-def cats(reply):
+def cats(reply, bot):
     """gets a fucking fact about cats."""
+    r = get_data('https://catfact.ninja/fact', reply, bot, params={'max_length': 100})
+    json = r.json()
+    response = json['facts']
+    return response
 
-    attempts = 0
-    while True:
-        try:
-            r = requests.get(
-                'http://catfacts-api.appspot.com/api/facts?number=1')
-        except Exception:
-            if attempts > 2:
-                reply("There was an error contacting the API.")
-                raise
-            else:
-                attempts += 1
-                continue
-        json = r.json()
-        response = json['facts']
-        return response
 
 @hook.command(autohelp=False)
-def catgifs(reply):
+def catgifs(reply, bot):
     """gets a fucking cat gif."""
-    attempts = 0
-    while True:
-        try:
-            r = requests.get("http://marume.herokuapp.com/random.gif")
-        except Exception:
-            if attempts > 2:
-                reply("there was an error finding a cat gif for you.")
-                raise
-            else:
-                attempts += 1
-                continue
-        response = r.url
-        return "OMG A CAT GIF: {}".format(response)
+    r = get_data("http://marume.herokuapp.com/random.gif", reply, bot)
+    return "OMG A CAT GIF: {}".format(r.url)