zaklaus
/
microblog
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix stream

main
Thomas Sileo 2022-07-17 11:40:03 +02:00
parent ca1248351d
commit fb5759cfc1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/boxes.py
View File

@ -437,6 +437,18 @@ async def _compute_recipients(
return recipients return recipients
async def _get_following(db_session: AsyncSession) -> list[models.Follower]:
return (
(
await db_session.scalars(
select(models.Following).options(joinedload(models.Following.actor))
)
)
.unique()
.all()
)
async def _get_followers(db_session: AsyncSession) -> list[models.Follower]: async def _get_followers(db_session: AsyncSession) -> list[models.Follower]:
return ( return (
( (
@ -762,9 +774,9 @@ async def _process_note_object(
if "published" in ro.ap_object: if "published" in ro.ap_object:
ap_published_at = parse_isoformat(ro.ap_object["published"]) ap_published_at = parse_isoformat(ro.ap_object["published"])
followers = await _get_followers(db_session) following = await _get_following(db_session)
is_from_followers = ro.actor.ap_id in {f.ap_actor_id for f in followers} is_from_following = ro.actor.ap_id in {f.ap_actor_id for f in following}
is_reply = bool(ro.in_reply_to) is_reply = bool(ro.in_reply_to)
is_local_reply = ro.in_reply_to and ro.in_reply_to.startswith(BASE_URL) is_local_reply = ro.in_reply_to and ro.in_reply_to.startswith(BASE_URL)
is_mention = False is_mention = False
@ -788,7 +800,7 @@ async def _process_note_object(
activity_object_ap_id=ro.activity_object_ap_id, activity_object_ap_id=ro.activity_object_ap_id,
# Hide replies from the stream # Hide replies from the stream
is_hidden_from_stream=not ( is_hidden_from_stream=not (
(not is_reply and is_from_followers) or is_mention or is_local_reply (not is_reply and is_from_following) or is_mention or is_local_reply
), ),
) )