From 65d55e986acfd59461c3c5b174d465d30f5436ff Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 11 May 2022 16:08:41 -0400 Subject: [PATCH] no 500 for api error --- mastodon/api.py | 12 ++++++++---- requirements.txt | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mastodon/api.py b/mastodon/api.py index 1fd3125f..dae9d7ff 100644 --- a/mastodon/api.py +++ b/mastodon/api.py @@ -330,10 +330,14 @@ def obtain_token(site, request, code): payload['code_verifier'] = 'challenge' else: url = 'https://' + mast_app.domain_name + API_OBTAIN_TOKEN - response = post(url, data=payload, headers=headers, auth=auth) - # {"token_type":"bearer","expires_in":7200,"access_token":"VGpkOEZGR3FQRDJ5NkZ0dmYyYWIwS0dqeHpvTnk4eXp0NV9nWDJ2TEpmM1ZTOjE2NDg3ODMxNTU4Mzc6MToxOmF0OjE","scope":"block.read follows.read offline.access tweet.write users.read mute.read","refresh_token":"b1pXbGEzeUF1WE5yZHJOWmxTeWpvMTBrQmZPd0czLU0tQndZQTUyU3FwRDVIOjE2NDg3ODMxNTU4Mzg6MToxOnJ0OjE"} - if response.status_code != 200: - logger.error(f"Error {url} {response.status_code}") + try: + response = post(url, data=payload, headers=headers, auth=auth) + # {"token_type":"bearer","expires_in":7200,"access_token":"VGpkOEZGR3FQRDJ5NkZ0dmYyYWIwS0dqeHpvTnk4eXp0NV9nWDJ2TEpmM1ZTOjE2NDg3ODMxNTU4Mzc6MToxOmF0OjE","scope":"block.read follows.read offline.access tweet.write users.read mute.read","refresh_token":"b1pXbGEzeUF1WE5yZHJOWmxTeWpvMTBrQmZPd0czLU0tQndZQTUyU3FwRDVIOjE2NDg3ODMxNTU4Mzg6MToxOnJ0OjE"} + if response.status_code != 200: + logger.error(f"Error {url} {response.status_code}") + return None, None + except Exception as e: + logger.error(f"Error {url} {e}") return None, None data = response.json() return data.get('access_token'), data.get('refresh_token', '') diff --git a/requirements.txt b/requirements.txt index 148df4b7..5f19b32b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ dateparser -django~=3.2.10 +django~=3.2.13 django-hstore django-markdownx @ git+https://github.com/alphatownsman/django-markdownx.git@e2637fe9a548084f6e084c33e91f13083d3b4673 django-sass