diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-10-19 04:26:35 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-10-19 04:26:35 +0000 |
| commit | 0495a07dc77d81abf46cbe166ae3fec14f705809 (patch) | |
| tree | 106033d9ae6ad32875bcda54599058c91e1129e6 /lib | |
| parent | be611b143bf2840c039aaf63dbf1a73d9f9daf7b (diff) | |
| parent | 7a2f100061913ec59db9957893eb92bb2d150dc4 (diff) | |
| download | pleroma-0495a07dc77d81abf46cbe166ae3fec14f705809.tar.gz pleroma-0495a07dc77d81abf46cbe166ae3fec14f705809.zip | |
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 9c33775f2..d17c892a7 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -827,7 +827,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do query = from([activity] in query, where: fragment("not (? = ANY(?))", activity.actor, ^mutes), - where: fragment("not (?->'to' \\?| ?)", activity.data, ^mutes) + where: + fragment( + "not (?->'to' \\?| ?) or ? = ?", + activity.data, + ^mutes, + activity.actor, + ^user.ap_id + ) ) unless opts[:skip_preload] do |