modinfo = {
'author': 'Erebus Team',
'license': 'public domain',
- 'compatible': [1], # compatible module API versions
- 'depends': [], # other modules required to work properly?
+ 'compatible': [1,2],
+ 'depends': [],
+ 'softdeps': [],
}
# http://embed.ly/tools/generator
if 'open.spotify.com' in match or 'spotify:' in match:
for r in spotify_regex:
for sptype, track in r.findall(match):
- bot.msg(chan, unescape(gotspotify(sptype, track)))
+ bot.msg(chan, gotspotify(sptype, track))
elif 'youtube.com' in match or 'youtu.be' in match:
for r in youtube_regex:
for url in r.findall(match):
- bot.msg(chan, unescape(gotyoutube(url)))
+ bot.msg(chan, gotyoutube(url))
elif 'twitch.tv' in match:
for r in twitch_regex:
for uri in r.findall(match):
- bot.msg(chan, unescape(gottwitch(uri)))
+ bot.msg(chan, gottwitch(uri))
else:
- bot.msg(chan, unescape(goturl(match)))
+ bot.msg(chan, goturl(match))
def unescape(line):
return html_parser.unescape(line)
minutes = int(length)/60
seconds = int(length)%60
- return 'Track: %s - %s / %s %s:%.2d %2d%%' % (artist_name, name, album_name, minutes, seconds, popularity)
+ return unescape('Track: %s - %s / %s %s:%.2d %2d%%' % (artist_name, name, album_name, minutes, seconds, popularity))
elif lookup_type == 'album':
album_name = soup.find('album').find('name').string
artist_name = soup.find('artist').find('name').string
released = soup.find('released').string
- return 'Album: %s - %s - %s' % (artist_name, album_name, released)
+ return unescape('Album: %s - %s - %s' % (artist_name, album_name, released))
else:
return 'Unsupported type.'
title = video_info['entry']['title']["$t"]
author = video_info['entry']['author'][0]['name']['$t']
- return "Youtube: %s (%s)" % (title, author)
+ return unescape("Youtube: %s (%s)" % (title, author))
except:
pass
respdata = urllib2.urlopen(url).read()
twitch = json.loads(respdata)
try:
- return 'Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game'])
+ return unescape('Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game']))
except:
return 'Twitch: Channel offline.'
opener = urllib2.build_opener(SmartRedirectHandler())
try:
soup = BeautifulSoup(opener.open(request, timeout=2))
- return 'Title: %s' % soup.title.string
+ return unescape('Title: %s' % (soup.title.string))
except:
return 'Invalid URL/Timeout'