pleroma

commit: 6da1999fc8fc40cd340817e934520efc86c8e2c2
parent: b2e163ec574e4354f088a16a7bd7a83f5956e54b
Author: rinpatch <rinpatch@sdf.org>
Date:   Wed, 27 Mar 2019 09:37:08 +0000

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

Fix missing announces in MastoAPI home timeline

Closes #762

See merge request pleroma/pleroma!983
Diffstat:
M
lib/pleroma/web/activity_pub/activity_pub.ex
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -737,8 +737,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
     from(
       activity in query,
-      where: fragment("not ?->>'type' = 'Announce'", activity.data),
-      where: fragment("not ? = ANY(?)", activity.actor, ^muted_reblogs)
+      where:
+        fragment(
+          "not ( ?->>'type' = 'Announce' and ? = ANY(?))",
+          activity.data,
+          activity.actor,
+          ^muted_reblogs
+        )
     )
   end