diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-28 13:49:12 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-28 13:49:12 +0000 |
| commit | a7a40bb8f1eaf30f0f0d581089ff3ef45de4087c (patch) | |
| tree | 83490dd67bb54fa88372cbd6169960bb25de3234 /lib | |
| parent | 39c80a3667afec25a187894d67e0d0e9b8713eb1 (diff) | |
| parent | 48380aecccc74b0a376ed1efb55a269b35516566 (diff) | |
| download | pleroma-a7a40bb8f1eaf30f0f0d581089ff3ef45de4087c.tar.gz | |
Merge branch 'fix/blocked-user-boosts' into 'develop'
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 99c169034..984d1162d 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -313,7 +313,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do blocks = info["blocks"] || [] - from(activity in query, where: fragment("not (? = ANY(?))", activity.actor, ^blocks)) + from(activity in query, + where: fragment("not (? = ANY(?))", activity.actor, ^blocks), + where: fragment("not (?->'to' \\?| ?)", activity.data, ^blocks) + ) end defp restrict_blocked(query, _), do: query |