diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-27 09:37:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-27 09:37:08 +0000 |
| commit | 6da1999fc8fc40cd340817e934520efc86c8e2c2 (patch) | |
| tree | 05e49b0d61a0d4529472601752250bf40b68f5e0 | |
| parent | b2e163ec574e4354f088a16a7bd7a83f5956e54b (diff) | |
| parent | ce6d64bbd8570c0c8bc46efe8a5a338876687df8 (diff) | |
| download | pleroma-6da1999fc8fc40cd340817e934520efc86c8e2c2.tar.gz pleroma-6da1999fc8fc40cd340817e934520efc86c8e2c2.zip | |
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'
Fix missing announces in MastoAPI home timeline
Closes #762
See merge request pleroma/pleroma!983
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 9 |
1 files 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 index 0d9a89d0b..6e1ed7ec9 100644 --- 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 |