694cbbe81f
Previously, any commit written in January would throw an error because the array key for January was falsely '1' instead of the integer 1. This would lead to the moth name not being found and the error occuring. This PR fixes that problem by changing the key of January to the integer 1. **How to reproduce:** Ask your CloudBot to `xkcd Regular Expressions`, an error will be shown in console.
44 lines
1.4 KiB
Python
44 lines
1.4 KiB
Python
import re
|
|
|
|
from util import hook, http
|
|
|
|
|
|
xkcd_re = (r'(.*:)//(www.xkcd.com|xkcd.com)(.*)', re.I)
|
|
months = {1: 'January', 2: 'February', 3: 'March', 4: 'April', 5: 'May', 6: 'June', 7: 'July', 8: 'August',
|
|
9: 'September', 10: 'October', 11: 'November', 12: 'December'}
|
|
|
|
|
|
def xkcd_info(xkcd_id, url=False):
|
|
""" takes an XKCD entry ID and returns a formatted string """
|
|
data = http.get_json("http://www.xkcd.com/" + xkcd_id + "/info.0.json")
|
|
date = "%s %s %s" % (data['day'], months[int(data['month'])], data['year'])
|
|
if url:
|
|
url = " | http://xkcd.com/" + xkcd_id.replace("/", "")
|
|
return "xkcd: \x02%s\x02 (%s)%s" % (data['title'], date, url if url else "")
|
|
|
|
|
|
def xkcd_search(term):
|
|
search_term = http.quote_plus(term)
|
|
soup = http.get_soup("http://www.ohnorobot.com/index.pl?s={}&Search=Search&"
|
|
"comic=56&e=0&n=0&b=0&m=0&d=0&t=0".format(search_term))
|
|
result = soup.find('li')
|
|
if result:
|
|
url = result.find('div', {'class': 'tinylink'}).text
|
|
xkcd_id = url[:-1].split("/")[-1]
|
|
print xkcd_id
|
|
return xkcd_info(xkcd_id, url=True)
|
|
else:
|
|
return "No results found!"
|
|
|
|
|
|
@hook.regex(*xkcd_re)
|
|
def xkcd_url(match):
|
|
xkcd_id = match.group(3).split(" ")[0].split("/")[1]
|
|
return xkcd_info(xkcd_id)
|
|
|
|
|
|
@hook.command
|
|
def xkcd(inp):
|
|
"""xkcd <search term> - Search for xkcd comic matching <search term>"""
|
|
return xkcd_search(inp)
|