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

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

View File

@ -737,8 +737,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub 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