askiiart/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve inbox processing

Browse source
This commit is contained in:
Thomas Sileo 2022-08-21 09:22:14 +02:00
parent b71bc39f13
commit 827ba5cd2d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/boxes.py
View file

@ -351,6 +351,8 @@ async def fetch_conversation_root(
db_session, ap.get_actor_id(raw_reply) db_session, ap.get_actor_id(raw_reply)
) )
in_reply_to_object = RemoteObject(raw_reply, actor=raw_reply_actor) in_reply_to_object = RemoteObject(raw_reply, actor=raw_reply_actor)
except (ap.ObjectNotFoundError, ap.ObjectIsGoneError):
return await fetch_conversation_root(db_session, obj, is_root=True)
except httpx.HTTPStatusError as http_status_error: except httpx.HTTPStatusError as http_status_error:
if 400 <= http_status_error.response.status_code < 500: if 400 <= http_status_error.response.status_code < 500:
# We may not have access, in this case consider if root # We may not have access, in this case consider if root

2
app/incoming_activities.py
View file

@ -119,7 +119,7 @@ async def process_next_incoming_activity(
) )
except httpx.TimeoutException as exc: except httpx.TimeoutException as exc:
url = exc._request.url if exc._request else None url = exc._request.url if exc._request else None
logger.error(f"HTTP timeout when fetching {url}") logger.error(f"Failed, HTTP timeout when fetching {url}")
next_activity.error = traceback.format_exc() next_activity.error = traceback.format_exc()
_set_next_try(next_activity) _set_next_try(next_activity)
except Exception: except Exception: