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

Merge pull request #198 from daboross/patch-4 

Fix twitch plugin - Don't assume that data has any elements
This commit is contained in:
Luke Rogers 2014-01-15 12:41:09 -08:00
parent 75908c6ab6 8b6647f521
commit ae1c9d0788
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/twitch.py
View File

@ -92,8 +92,9 @@ def twitch_lookup(location):
views = views + "s" if not views[0:2] == "1 " else views
return h.unescape(fmt.format(title, channel, playing, views))
else:
data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel)[0]
if data:
data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel)
if data and len(data) >= 1:
data = data[0]
title = data['title']
playing = data['meta_game']
viewers = "\x033\x02Online now!\x02\x0f " + str(data["channel_count"]) + " viewer"
@ -102,7 +103,10 @@ def twitch_lookup(location):
print viewers
return h.unescape(fmt.format(title, channel, playing, viewers))
else:
data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel)
try:
data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel)
except:
return
title = data['status']
playing = data['game']
viewers = "\x034\x02Offline\x02\x0f"