PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-04-26 04:51:08 -05:00
Code Issues Projects Releases Wiki Activity

LastFM: return API error messages as is

Browse Source 
This requires https://github.com/ProgVal/Limnoria/pull/1487 (on older versions, a generic HTTP error will be shown instead)
This commit is contained in:
James Lu 2021-08-01 22:40:33 +02:00
parent 9e3e49ee70
commit 9352e383d8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LastFM/plugin.py
View File

@ -42,6 +42,7 @@ import supybot.log as log
import supybot.ircdb as ircdb
import json
import urllib.error
from datetime import datetime
from .local import accountsdb
@ -80,15 +81,20 @@ class LastFM(callbacks.Plugin):
# see https://www.last.fm/api/show/user.getRecentTracks
url = "%sapi_key=%s&method=user.getrecenttracks&user=%s&format=json" % (self.APIURL, apiKey, user)
self.log.debug("LastFM.np: url %s", url)
try:
f = utils.web.getUrl(url).decode("utf-8")
except utils.web.Error as e:
if isinstance(e.__cause__, urllib.error.HTTPError):
# When receiving an HTTP error, try reading and showing the API response anyways
# This requires a Limnoria version > 2021-08-01
f = e.__cause__.read().decode("utf-8")
else:
irc.error(str(e), Raise=True)
self.log.debug("LastFM.np: url %s", url)
data = json.loads(f)
if "error" in data:
irc.error("%s: %s" % (data["error"], data.get("message")), Raise=True)
irc.error("LastFM API Error %s: %s" % (data["error"], data.get("message")), Raise=True)
elif "recenttracks" not in data:
irc.error("No recenttracks data found for %s" % user, Raise=True)