|
|
|
@ -2,6 +2,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
|
|
|
|
use Pleroma.DataCase
|
|
|
|
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
|
|
|
|
alias Pleroma.Web.ActivityPub.Utils
|
|
|
|
|
alias Pleroma.Web.CommonAPI
|
|
|
|
|
alias Pleroma.{Activity, Object, User}
|
|
|
|
|
alias Pleroma.Builders.ActivityBuilder
|
|
|
|
|
|
|
|
|
@ -130,12 +131,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
|
|
|
|
test "doesn't return blocked activities" do
|
|
|
|
|
activity_one = insert(:note_activity)
|
|
|
|
|
activity_two = insert(:note_activity)
|
|
|
|
|
activity_three = insert(:note_activity)
|
|
|
|
|
user = insert(:user)
|
|
|
|
|
booster = 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)
|
|
|
|
|
assert Enum.member?(activities, activity_three)
|
|
|
|
|
refute Enum.member?(activities, activity_one)
|
|
|
|
|
|
|
|
|
|
{:ok, user} = User.unblock(user, %{ap_id: activity_one.data["actor"]})
|
|
|
|
@ -143,11 +147,26 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
|
|
|
|
activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
|
|
|
|
|
|
|
|
|
|
assert Enum.member?(activities, activity_two)
|
|
|
|
|
assert Enum.member?(activities, activity_three)
|
|
|
|
|
assert Enum.member?(activities, activity_one)
|
|
|
|
|
|
|
|
|
|
{:ok, user} = User.block(user, %{ap_id: activity_three.data["actor"]})
|
|
|
|
|
{:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(activity_three.id, booster)
|
|
|
|
|
%Activity{} = boost_activity = Activity.get_create_activity_by_object_ap_id(id)
|
|
|
|
|
activity_three = Repo.get(Activity, activity_three.id)
|
|
|
|
|
|
|
|
|
|
activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
|
|
|
|
|
|
|
|
|
|
assert Enum.member?(activities, activity_two)
|
|
|
|
|
refute Enum.member?(activities, activity_three)
|
|
|
|
|
refute Enum.member?(activities, boost_activity)
|
|
|
|
|
assert Enum.member?(activities, activity_one)
|
|
|
|
|
|
|
|
|
|
activities = ActivityPub.fetch_activities([], %{"blocking_user" => nil})
|
|
|
|
|
|
|
|
|
|
assert Enum.member?(activities, activity_two)
|
|
|
|
|
assert Enum.member?(activities, activity_three)
|
|
|
|
|
assert Enum.member?(activities, boost_activity)
|
|
|
|
|
assert Enum.member?(activities, activity_one)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|