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

Improve admin actor profile

Browse source
This commit is contained in:
Thomas Sileo 2022-07-31 10:03:45 +02:00
parent 4cbfb396c6
commit 7782a39638
4 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/boxes.py
View file

@ -577,7 +577,7 @@ async def _compute_recipients(
# If we got a local collection, assume it's a collection of actors
if r.startswith(BASE_URL):
for actor in await fetch_actor_collection(db_session, r):
recipients.add(actor.shared_inbox_url or actor.inbox_url)
recipients.add(actor.shared_inbox_url)
continue
@ -588,19 +588,19 @@ async def _compute_recipients(
)
).scalar_one_or_none() # type: ignore
if known_actor:
recipients.add(known_actor.shared_inbox_url or known_actor.inbox_url)
recipients.add(known_actor.shared_inbox_url)
continue
# Fetch the object
raw_object = await ap.fetch(r)
if raw_object.get("type") in ap.ACTOR_TYPES:
saved_actor = await save_actor(db_session, raw_object)
recipients.add(saved_actor.shared_inbox_url or saved_actor.inbox_url)
recipients.add(saved_actor.shared_inbox_url)
else:
# Assume it's a collection of actors
for raw_actor in await ap.parse_collection(payload=raw_object):
actor = RemoteActor(raw_actor)
recipients.add(actor.shared_inbox_url or actor.inbox_url)
recipients.add(actor.shared_inbox_url)
return recipients
@ -640,7 +640,7 @@ async def _get_followers_recipients(
followers = await _get_followers(db_session)
return {
follower.actor.shared_inbox_url or follower.actor.inbox_url # type: ignore
follower.actor.shared_inbox_url # type: ignore
for follower in followers
if follower.actor.ap_id not in actor_ap_ids_to_skip
}