From 2d21dfa22931bdb887ccccba4a33e6fa4755e94b Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 26 Nov 2019 13:41:40 +0000 Subject: utils.http.Response.data should always be `bytes` - add .decode and .soup --- modules/spotify.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'modules/spotify.py') diff --git a/modules/spotify.py b/modules/spotify.py index 962b0a62..9438b149 100644 --- a/modules/spotify.py +++ b/modules/spotify.py @@ -24,12 +24,11 @@ class Module(ModuleManager.BaseModule): page = utils.http.request(URL_TOKEN, method="POST", headers={"Authorization": "Basic %s" % bearer}, - post_data={"grant_type": "client_credentials"}, - json=True) + post_data={"grant_type": "client_credentials"}).json() - token = page.data["access_token"] + token = page["access_token"] self._token = token - self._token_expires = time.time()+page.data["expires_in"] + self._token_expires = time.time()+page["expires_in"] return token @utils.hook("received.command.sp", alias_of="spotify") @@ -42,11 +41,10 @@ class Module(ModuleManager.BaseModule): token = self._get_token() page = utils.http.request(URL_SEARCH, get_params={"type": "track", "limit": 1, "q": event["args"]}, - headers={"Authorization": "Bearer %s" % token}, - json=True) + headers={"Authorization": "Bearer %s" % token}).json() if page: - if len(page.data["tracks"]["items"]): - item = page.data["tracks"]["items"][0] + if len(page["tracks"]["items"]): + item = page["tracks"]["items"][0] title = item["name"] artist_name = item["artists"][0]["name"] url = item["external_urls"]["spotify"] -- cgit v1.3.1-10-gc9f91