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

fixed bug in shorten.py

Browse source
This commit is contained in:
neersighted 2012-03-06 23:06:41 -08:00
parent 37a3cc2030
commit ac03ceb366
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/shorten.py
View file

@ -12,28 +12,30 @@ class ShortenError(Exception):
def __str__(self):
return repr(self.value)
def bitly(url, user, apikey):
try:
if url[:7] != "http://":
url = "http://" + url
params = urlencode({'longUrl': url, 'login': user, 'apiKey': apikey, 'format': 'json'})
j = http.get_json("http://api.bit.ly/v3/shorten?%s" % params)
if j['status_code'] == 200:
return j['data']['url']
raise ShortenError('%s'%j['status_txt'])
raise ShortenError('%s' % j['status_txt'])
except (HTTPError, ShortenError):
return "Could not shorten %s!" % url
@hook.command
def shorten(inp, bot=None):
def shorten(inp, bot = None):
".shorten <url> - Makes an j.mp/bit.ly shortlink to the url provided."
api_user = bot.config.get("api_keys", {}).get("bitly_user", None)
api_user = bot.config.get("api_keys", {}).get("bitly_user", None)
api_key = bot.config.get("api_keys", {}).get("bitly_api", None)
if api_key is None:
return "error: no api key set"
return bitly(inp, api_user, api_key)
@hook.command
def expand(inp, bot=None):
def expand(inp, bot = None):
".expand <url> - Gets the original URL from a shortened link."
try:
url = http.get_url(inp)