diff options
| author | lain <lain@soykaf.club> | 2020-10-15 12:28:25 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-15 12:28:25 +0200 |
| commit | 7a2f100061913ec59db9957893eb92bb2d150dc4 (patch) | |
| tree | 0babe5c6063245a0f6c0e912464449151e3da8e6 /lib | |
| parent | b48724afcdd9d46d6533aafdea4df1cc2d23b6ae (diff) | |
| download | pleroma-7a2f100061913ec59db9957893eb92bb2d150dc4.tar.gz pleroma-7a2f100061913ec59db9957893eb92bb2d150dc4.zip | |
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
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 8022f0402..ff7b9e778 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 |