mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-06-07 08:18:50 +00:00
Code Issues Projects Releases Wiki Activity

handle get_data exceptions better

Browse source 
Makes exception handling more precise, only raising status for 401s.

Also fixes a string pylint was complaining about.
This commit is contained in:
Hugh Rundle 2023-01-20 19:55:38 +11:00
parent f8c9df4aff
commit e8452011f7
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/activitypub/base_activity.py
View file

@ -306,7 +306,8 @@ def resolve_remote_id(
def get_representative(): def get_representative():
"""Get or create an actor representing the entire instance to sign requests to 'secure mastodon' servers""" """Get or create an actor representing the instance
to sign requests to 'secure mastodon' servers"""
username = f"{INSTANCE_ACTOR_USERNAME}@{DOMAIN}" username = f"{INSTANCE_ACTOR_USERNAME}@{DOMAIN}"
try: try:
user = models.User.objects.get(username=username) user = models.User.objects.get(username=username)

6
bookwyrm/connectors/abstract_connector.py
View file

@ -244,7 +244,11 @@ def get_data(url, params=None, timeout=settings.QUERY_TIMEOUT):
raise ConnectorException(err) raise ConnectorException(err)
if not resp.ok: if not resp.ok:
resp.raise_for_status() if resp.status_code == 401:
# this is probably an AUTHORIZED_FETCH issue
resp.raise_for_status()
else:
raise ConnectorException()
try: try:
data = resp.json() data = resp.json()
except ValueError as err: except ValueError as err: