Make google_translate use google_dev_key, @foxlet util/web can do goo.gl

Author: dmptrluke

plugins/books.py

@@ -1,35 +1,24 @@
 import requests
-import json
 
 from cloudbot import hook
-from cloudbot.util import formatting
+from cloudbot.util import formatting, web
 
 base_url = 'https://www.googleapis.com/books/v1/'
 book_search_api = base_url + 'volumes?'
 
 
-# shrt by petermanser - https://github.com/petermanser/shrt/blob/master/shrt.py
-def shrt(url):
-    r = requests.post('https://www.googleapis.com/urlshortener/v1/url',
-                      data=json.dumps({"longUrl": url}),
-                      headers={'content-type': 'application/json'})
-
-    content = json.loads(r.content.decode("UTF-8"))
-    if r.status_code == 200:
-        return content['id']
-    else:
-        return "%s: %s" % (content['code'], content['message'])
-
-
 @hook.on_start()
 def load_key(bot):
     global dev_key
-    dev_key = bot.config.get("api_keys", {}).get("google_dev_key")
+    dev_key = bot.config.get("api_keys", {}).get("google_dev_key", None)
 
 
 @hook.command("books", "gbooks")
 def books(text):
     """books <query> -- Searches Google Books for <query>."""
+    if not dev_key:
+        return "No Google API key."
+
     json = requests.get(book_search_api, params={"q": text, "key": dev_key}).json()
 
     if 'error' in json:
@@ -58,6 +47,6 @@ def books(text):
     except KeyError:
         pages = ''
 
-    link = shrt(book['infoLink'])
+    link = web.shorten(book['infoLink'], service="goo.gl")
 
     return "\x02{}\x02 by \x02{}\x02 ({}){} - {} - {}".format(title, author, year, pages, description, link)

plugins/google_translate.py

@@ -25,6 +25,9 @@ def goog_trans(api_key, text, source, target):
     request = requests.get(url, params=params)
     parsed = request.json()
 
+    if 'error' in parsed:
+        return "Google API error."
+
     if not source:
         return '(%(detectedSourceLanguage)s) %(translatedText)s' % (parsed['data']['translations'][0])
     return '%(translatedText)s' % parsed['data']['translations'][0]
@@ -48,9 +51,9 @@ def translate(text, bot):
     """[source language [target language]] <sentence> - translates <sentence> from source language (default autodetect)
      to target language (default English) using Google Translate"""
 
-    api_key = bot.config.get("api_keys", {}).get("googletranslate", None)
+    api_key = bot.config.get("api_keys", {}).get("google_dev_key", None)
     if not api_key:
-        return "This command requires a paid API key."
+        return "No Google API key."
 
     args = text.split(' ', 2)