foxing/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'

Browse source 
Fix missing announces in MastoAPI home timeline

Closes #762

See merge request pleroma/pleroma!983
This commit is contained in:
rinpatch 2019-03-27 09:37:08 +00:00
commit 6da1999fc8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -737,8 +737,13 @@ defp restrict_muted_reblogs(query, %{"muting_user" => %User{info: info}}) do
from( from(
activity in query, activity in query,
where: fragment("not ?->>'type' = 'Announce'", activity.data), where:
where: fragment("not ? = ANY(?)", activity.actor, ^muted_reblogs) fragment(
"not ( ?->>'type' = 'Announce' and ? = ANY(?))",
activity.data,
activity.actor,
^muted_reblogs
)
) )
end end