jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Fix processing for forwarded transient activities

Browse source
This commit is contained in:
Thomas Sileo 2022-07-27 18:50:10 +02:00
parent 3af56bf2dc
commit a006ba2cc4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/activitypub.py
View file

@ -240,7 +240,7 @@ def object_visibility(ap_activity: RawObject, actor: "Actor") -> VisibilityEnum:
def get_actor_id(activity: RawObject) -> str: def get_actor_id(activity: RawObject) -> str:
if activity["type"] in ["Note", "Article", "Video", "Question", "Page"]: if "attributedTo" in activity:
attributed_to = as_list(activity["attributedTo"]) attributed_to = as_list(activity["attributedTo"])
return get_id(attributed_to[0]) return get_id(attributed_to[0])
else: else:

6
app/boxes.py
View file

@ -1239,6 +1239,12 @@ async def save_to_inbox(
except Exception: except Exception:
raise fastapi.HTTPException(status_code=401, detail="Invalid LD sig") raise fastapi.HTTPException(status_code=401, detail="Invalid LD sig")
# Transient activities from Mastodon like Like are not fetchable and
# will return the actor instead
if raw_object["id"] != raw_object_id:
logger.info(f"Unable to fetch {raw_object_id}")
return None
if ( if (
await db_session.scalar( await db_session.scalar(
select(func.count(models.InboxObject.id)).where( select(func.count(models.InboxObject.id)).where(