Added random output, switched API URL

plugins/recipe.py

@@ -2,11 +2,11 @@ import random
 
 from util import hook, http, web
 
-METADATA_URL = "http://omnidator.appspot.com/microdata/json/?url={}"
+metadata_url = "http://omnidator.appspot.com/microdata/json/?url={}"
 
-BASE_URL = "http://www.cookstr.com"
-SEARCH_URL = BASE_URL + "/searches"
-RANDOM_URL = SEARCH_URL + "/surprise"
+base_url = "http://www.cookstr.com"
+search_url = base_url + "/searches"
+random_url = search_url + "/surprise"
 
 # set this to true to censor this plugin!
 censor = True
@@ -29,7 +29,7 @@ class ParseError(Exception):
 def get_data(url):
     """ Uses the omnidator API to parse the metadata from the provided URL """
     try:
-        omni = http.get_json(METADATA_URL.format(url))
+        omni = http.get_json(metadata_url.format(url))
     except (http.HTTPError, http.URLError) as e:
         raise ParseError(e)
     schemas = omni["@"]
@@ -47,7 +47,7 @@ def recipe(inp):
     if inp:
         # get the recipe URL by searching
         try:
-            search = http.get_soup(SEARCH_URL, query=inp.strip())
+            search = http.get_soup(search_url, query=inp.strip())
         except (http.HTTPError, http.URLError) as e:
             return "Could not get recipe: {}".format(e)
 
@@ -63,12 +63,12 @@ def recipe(inp):
         result = random.choice(results)
 
         # extract the URL from the result
-        url = BASE_URL + result.find('div', {'class': 'image-wrapper'}).find('a')['href']
+        url = base_url + result.find('div', {'class': 'image-wrapper'}).find('a')['href']
 
     else:
         # get a random recipe URL
         try:
-            page = http.open(RANDOM_URL)
+            page = http.open(random_url)
         except (http.HTTPError, http.URLError) as e:
             return "Could not get recipe: {}".format(e)
         url = page.geturl()
@@ -87,7 +87,7 @@ def recipe(inp):
 def dinner(inp):
     """dinner - WTF IS FOR DINNER"""
     try:
-        page = http.open(RANDOM_URL)
+        page = http.open(random_url)
     except (http.HTTPError, http.URLError) as e:
         return "Could not get recipe: {}".format(e)
     url = page.geturl()

plugins/urban.py

@@ -1,47 +1,66 @@
 import re
+import random
 
 from util import hook, http, text
 
 
-base_url = 'http://www.urbandictionary.com/iphone/search/define'
+base_url = 'http://api.urbandictionary.com/v0'
+define_url = base_url + "/define"
+random_url = base_url + "/random"
 
-
-@hook.command('u')
-@hook.command
+@hook.command('u', autohelp=False)
+@hook.command(autohelp=False)
 def urban(inp):
     """urban <phrase> [id] -- Looks up <phrase> on urbandictionary.com."""
 
-    # clean and split the input
-    inp = inp.lower().strip()
-    parts = inp.split()
+    if inp:
+        # clean and split the input
+        inp = inp.lower().strip()
+        parts = inp.split()
 
-    # if the last word is a number, set the ID to that number
-    if parts[-1].isdigit():
-        id_num = int(parts[-1])
-        # remove the ID from the input string
-        del parts[-1]
-        inp = " ".join(parts)
+        # if the last word is a number, set the ID to that number
+        if parts[-1].isdigit():
+            id_num = int(parts[-1])
+            # remove the ID from the input string
+            del parts[-1]
+            inp = " ".join(parts)
+        else:
+            id_num = 1
+
+        # fetch the definitions
+        page = http.get_json(define_url, term=inp, referer="http://m.urbandictionary.com")
+
+        if page['result_type'] == 'no_results':
+            return 'Not found.'
     else:
-        id_num = 1
+        # get a random definition!
+        page = http.get_json(random_url, referer="http://m.urbandictionary.com")
+        id_num = None
 
-    # fetch the definitions
-    page = http.get_json(base_url, term=inp, referer="http://m.urbandictionary.com")
     definitions = page['list']
 
-    if page['result_type'] == 'no_results':
-        return 'Not found.'
+    if id_num:
+        # try getting the requested definition
+        try:
+            definition = definitions[id_num - 1]['definition'].replace('\r\n', ' ')
+            definition = re.sub('\s+', ' ', definition).strip()  # remove excess spaces
+            definition = text.truncate_str(definition, 200)
+        except IndexError:
+            return 'Not found.'
 
-    # try getting the requested definition
-    try:
-        definition = definitions[id_num - 1]['definition'].replace('\r\n', ' ')
-        definition = re.sub('\s+', ' ', definition).strip()  # remove excess spaces
-        definition = text.truncate_str(definition, 200)
-    except IndexError:
-        return 'Not found.'
+        url = definitions[id_num - 1]['permalink']
+        output = u"[%i/%i] %s :: %s" % \
+                 (id_num, len(definitions), definition, url)
 
-    url = definitions[id_num - 1]['permalink']
+    else:
+        definition = random.choice(definitions)
 
-    output = u"[%i/%i] %s :: %s" % \
-             (id_num, len(definitions), definition, url)
+        def_text = definition['definition'].replace('\r\n', ' ')
+        def_text = re.sub('\s+', ' ', def_text).strip()  # remove excess spaces
+        def_text = text.truncate_str(def_text, 200)
+
+        name = definition['word']
+        url = definition['permalink']
+        output = u"\x02{}\x02: {} :: {}".format(name, def_text, url)
 
     return output

plugins/youtube.py

@@ -34,7 +34,6 @@ def get_video_description(video_id):
     out += u' - length \x02{}\x02'.format(timeformat.format_time(length, simple=True))
 
     if 'ratingCount' in data:
-        # format
         likes = plural(int(data['likeCount']), "like")
         dislikes = plural(data['ratingCount'] - int(data['likeCount']), "dislike")