AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 24 Projects 2 Releases 14 Packages Wiki Activity

fix follow state on block

Browse source
This commit is contained in:
FloatingGhost 2022-07-23 19:27:50 +01:00
parent cb6e7359af
commit 0bb8342118
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/user.ex
View file

@ -1448,13 +1448,19 @@ def block(%User{} = blocker, %User{} = blocked) do
blocker blocker
end end
# clear any requested follows as well # clear any requested follows from both sides as well
blocked = blocked =
case CommonAPI.reject_follow_request(blocked, blocker) do case CommonAPI.reject_follow_request(blocked, blocker) do
{:ok, %User{} = updated_blocked} -> updated_blocked {:ok, %User{} = updated_blocked} -> updated_blocked
nil -> blocked nil -> blocked
end end
blocker =
case CommonAPI.reject_follow_request(blocker, blocked) do
{:ok, %User{} = updated_blocker} -> updated_blocker
nil -> blocker
end
unsubscribe(blocked, blocker) unsubscribe(blocked, blocker)
unfollowing_blocked = Config.get([:activitypub, :unfollow_blocked], true) unfollowing_blocked = Config.get([:activitypub, :unfollow_blocked], true)

16
test/pleroma/web/common_api_test.exs
View file

@ -61,9 +61,11 @@ test "it posts a poll" do
describe "blocking" do describe "blocking" do
setup do setup do
blocker = insert(:user) blocker = insert(:user)
blocked = insert(:user) blocked = insert(:user, local: false)
User.follow(blocker, blocked) CommonAPI.follow(blocker, blocked)
User.follow(blocked, blocker) CommonAPI.follow(blocked, blocker)
CommonAPI.accept_follow_request(blocker, blocked)
CommonAPI.accept_follow_request(blocked, blocked)
%{blocker: blocker, blocked: blocked} %{blocker: blocker, blocked: blocked}
end end
@ -72,6 +74,9 @@ test "it blocks and federates", %{blocker: blocker, blocked: blocked} do
with_mock Pleroma.Web.Federator, with_mock Pleroma.Web.Federator,
publish: fn _ -> nil end do publish: fn _ -> nil end do
assert User.get_follow_state(blocker, blocked) == :follow_accept
refute is_nil(Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(blocker, blocked))
assert {:ok, block} = CommonAPI.block(blocker, blocked) assert {:ok, block} = CommonAPI.block(blocker, blocked)
assert block.local assert block.local
@ -79,6 +84,11 @@ test "it blocks and federates", %{blocker: blocker, blocked: blocked} do
refute User.following?(blocker, blocked) refute User.following?(blocker, blocked)
refute User.following?(blocked, blocker) refute User.following?(blocked, blocker)
refute User.get_follow_state(blocker, blocked)
assert %{data: %{"state" => "reject"}} =
Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(blocker, blocked)
assert called(Pleroma.Web.Federator.publish(block)) assert called(Pleroma.Web.Federator.publish(block))
end end
end end