summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-11-02 22:37:26 +0100
committerRoger Braun <roger@rogerbraun.net>2017-11-02 22:37:26 +0100
commita47727adde426ab1e80299f5b5bdb23edabd0cd8 (patch)
tree95bf735809aaf8aec93a48d0158c42883b504597 /test
parent632da6c9273b55984bdd67b8a10672733df7fae5 (diff)
downloadpleroma-a47727adde426ab1e80299f5b5bdb23edabd0cd8.tar.gz
pleroma-a47727adde426ab1e80299f5b5bdb23edabd0cd8.zip
Don't return activities from blocked users.
Diffstat (limited to 'test')
-rw-r--r--test/web/activity_pub/activity_pub_test.exs19
1 files changed, 19 insertions, 0 deletions
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 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest 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