Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix order of args for unfollow/2

Browse Source
This commit is contained in:
Mark Felder 2024-07-22 19:11:22 -04:00
parent f79a16c062
commit adb93f7e5d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/following_relationship.ex
View File

@ -200,7 +200,7 @@ defmodule Pleroma.FollowingRelationship do
|> Repo.all() |> Repo.all()
|> Enum.map(fn following_relationship -> |> Enum.map(fn following_relationship ->
Pleroma.Web.CommonAPI.follow(target, following_relationship.follower) Pleroma.Web.CommonAPI.follow(target, following_relationship.follower)
Pleroma.Web.CommonAPI.unfollow(following_relationship.follower, origin) Pleroma.Web.CommonAPI.unfollow(origin, following_relationship.follower)
end) end)
|> case do |> case do
[] -> [] ->

2
lib/pleroma/web/common_api.ex
View File

@ -136,7 +136,7 @@ defmodule Pleroma.Web.CommonAPI do
end end
@spec unfollow(User.t(), User.t()) :: {:ok, User.t()} | {:error, any()} @spec unfollow(User.t(), User.t()) :: {:ok, User.t()} | {:error, any()}
def unfollow(follower, unfollowed) do def unfollow(unfollowed, follower) do
with {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed), with {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed),
{:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed), {:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed),
{:ok, _subscription} <- User.unsubscribe(follower, unfollowed), {:ok, _subscription} <- User.unsubscribe(follower, unfollowed),

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

@ -460,7 +460,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
end end
def unfollow(%{assigns: %{user: follower, account: followed}} = conn, _params) do def unfollow(%{assigns: %{user: follower, account: followed}} = conn, _params) do
with {:ok, follower} <- CommonAPI.unfollow(follower, followed) do with {:ok, follower} <- CommonAPI.unfollow(followed, follower) do
render(conn, "relationship.json", user: follower, target: followed) render(conn, "relationship.json", user: follower, target: followed)
end end
end end

2
test/pleroma/notification_test.exs
View File

@ -353,7 +353,7 @@ defmodule Pleroma.NotificationTest do
assert FollowingRelationship.following?(user, followed_user) assert FollowingRelationship.following?(user, followed_user)
assert [notification] = Notification.for_user(followed_user) assert [notification] = Notification.for_user(followed_user)
CommonAPI.unfollow(user, followed_user) CommonAPI.unfollow(followed_user, user)
{:ok, _, _, _activity_dupe} = CommonAPI.follow(followed_user, user) {:ok, _, _, _activity_dupe} = CommonAPI.follow(followed_user, user)
notification_id = notification.id notification_id = notification.id

8
test/pleroma/web/common_api_test.exs
View File

@ -1434,7 +1434,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert User.subscribed_to?(follower, followed) assert User.subscribed_to?(follower, followed)
{:ok, follower} = CommonAPI.unfollow(follower, followed) {:ok, follower} = CommonAPI.unfollow(followed, follower)
refute User.subscribed_to?(follower, followed) refute User.subscribed_to?(follower, followed)
end end
@ -1446,7 +1446,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert User.endorses?(follower, followed) assert User.endorses?(follower, followed)
{:ok, follower} = CommonAPI.unfollow(follower, followed) {:ok, follower} = CommonAPI.unfollow(followed, follower)
refute User.endorses?(follower, followed) refute User.endorses?(follower, followed)
end end
@ -1459,7 +1459,7 @@ defmodule Pleroma.Web.CommonAPITest do
CommonAPI.follow(followed, follower) CommonAPI.follow(followed, follower)
assert User.get_follow_state(follower, followed) == :follow_pending assert User.get_follow_state(follower, followed) == :follow_pending
assert {:ok, follower} = CommonAPI.unfollow(follower, followed) assert {:ok, follower} = CommonAPI.unfollow(followed, follower)
assert User.get_follow_state(follower, followed) == nil assert User.get_follow_state(follower, followed) == nil
assert %{id: ^activity_id, data: %{"state" => "cancelled"}} = assert %{id: ^activity_id, data: %{"state" => "cancelled"}} =
@ -1481,7 +1481,7 @@ defmodule Pleroma.Web.CommonAPITest do
CommonAPI.follow(followed, follower) CommonAPI.follow(followed, follower)
assert User.get_follow_state(follower, followed) == :follow_pending assert User.get_follow_state(follower, followed) == :follow_pending
assert {:ok, follower} = CommonAPI.unfollow(follower, followed) assert {:ok, follower} = CommonAPI.unfollow(followed, follower)
assert User.get_follow_state(follower, followed) == nil assert User.get_follow_state(follower, followed) == nil
assert %{id: ^activity_id, data: %{"state" => "cancelled"}} = assert %{id: ^activity_id, data: %{"state" => "cancelled"}} =