diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 71e52cb46..75b59f375 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -163,6 +163,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do where: activity.id > ^since end + defp restrict_blocked(query, %{"blocking_user" => user}) do + blocks = user.info["blocks"] || [] + from activity in query, + where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks) + end + defp restrict_blocked(query, _), do: query + def fetch_activities(recipients, opts \\ %{}) do base_query = from activity in Activity, limit: 20, @@ -178,6 +185,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> restrict_type(opts) |> restrict_favorited_by(opts) |> restrict_recent(opts) + |> restrict_blocked(opts) |> Repo.all |> Enum.reverse end |