ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switched to using is.gd for URL shortening

Browse source
This commit is contained in:
Luke Rogers 2012-08-28 16:38:40 +12:00
parent 3fa8d5d312
commit 2871bd3211
4 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/wolframalpha.py
View file

@ -1,10 +1,10 @@
import re
import urllib
from util import hook, http
from urllib import quote_plus
from urllib2 import HTTPError
from util.web import bitly, ShortenError
from util.web import isgd
from util.text import truncate_words
@ -14,8 +14,6 @@ def wolframalpha(inp, bot=None):
"wa <query> -- Computes <query> using Wolfram Alpha."
api_key = bot.config.get("api_keys", {}).get("wolframalpha", None)
bitly_user = bot.config.get("api_keys", {}).get("bitly_user", None)
bitly_key = bot.config.get("api_keys", {}).get("bitly_api", None)
if not api_key:
return "error: missing api key"
@ -26,10 +24,10 @@ def wolframalpha(inp, bot=None):
# get the URL for a user to view this query in a browser
query_url = "http://www.wolframalpha.com/input/?i=" + \
urllib.quote(inp.encode('utf-8'))
quote_plus(inp.encode('utf-8'))
try:
short_url = bitly(query_url, bitly_user, bitly_key)
except (HTTPError, ShortenError):
short_url = isgd(query_url)
except (HTTPError):
short_url = query_url
pod_texts = []