From a47727adde426ab1e80299f5b5bdb23edabd0cd8 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 2 Nov 2017 22:37:26 +0100
Subject: [PATCH] Don't return activities from blocked users.
---
lib/pleroma/web/activity_pub/activity_pub.ex | 8 ++++++++
test/web/activity_pub/activity_pub_test.exs | 19 +++++++++++++++++++
2 files changed, 27 insertions(+)
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 @@ defp restrict_recent(query, _) 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 @@ def fetch_activities(recipients, opts \\ %{}) do
|> restrict_type(opts)
|> restrict_favorited_by(opts)
|> restrict_recent(opts)
+ |> restrict_blocked(opts)
|> Repo.all
|> Enum.reverse
end
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index a088e97be..4c73c0b8a 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -80,6 +80,25 @@ test "retrieves activities that have a given context" do
end
end
+ test "doesn't return blocked activities" do
+ activity_one = insert(:note_activity)
+ activity_two = insert(:note_activity)
+ user = insert(:user)
+ {:ok, user} = User.block(user, %{ap_id: activity_one.data["actor"]})
+
+ activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
+
+ assert Enum.member?(activities, activity_two)
+ refute Enum.member?(activities, activity_one)
+
+ {:ok, user} = User.unblock(user, %{ap_id: activity_one.data["actor"]})
+
+ activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
+
+ assert Enum.member?(activities, activity_two)
+ assert Enum.member?(activities, activity_one)
+ end
+
describe "public fetch activities" do
test "retrieves public activities" do
%{public: public} = ActivityBuilder.public_and_non_public