moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong relationship direction

This commit is contained in:
Tusooa Zhu 2022-09-14 20:24:04 -04:00
parent 9022d855cd
commit ea60c4e709
No known key found for this signature in database
GPG Key ID: 7B467EDE43A08224
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View File

@ -481,7 +481,7 @@ def remove_from_followers(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _p
def remove_from_followers(%{assigns: %{user: followed, account: follower}} = conn, _params) do def remove_from_followers(%{assigns: %{user: followed, account: follower}} = conn, _params) do
with {:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do with {:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
render(conn, "relationship.json", user: follower, target: followed) render(conn, "relationship.json", user: followed, target: follower)
else else
nil -> nil ->
render_error(conn, :not_found, "Record not found") render_error(conn, :not_found, "Record not found")

17
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
View File

@ -1985,7 +1985,22 @@ test "removing user from followers", %{conn: conn, user: user} do
CommonAPI.follow(other_user, user) CommonAPI.follow(other_user, user)
assert %{"id" => other_user_id, "followed_by" => false} = assert %{"id" => ^other_user_id, "followed_by" => false} =
conn
|> post("/api/v1/accounts/#{other_user_id}/remove_from_followers")
|> json_response_and_validate_schema(200)
refute User.following?(other_user, user)
end
test "removing remote user from followers", %{conn: conn, user: user} do
%{id: other_user_id} = other_user = insert(:user, local: false)
CommonAPI.follow(other_user, user)
assert User.following?(other_user, user)
assert %{"id" => ^other_user_id, "followed_by" => false} =
conn conn
|> post("/api/v1/accounts/#{other_user_id}/remove_from_followers") |> post("/api/v1/accounts/#{other_user_id}/remove_from_followers")
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200)