Fix order of args for block/2

lib/pleroma/user/import.ex

@@ -31,7 +31,7 @@ def perform(:blocks_import, %User{} = blocker, [_ | _] = identifiers) do
       identifiers,
       fn identifier ->
         with {:ok, %User{} = blocked} <- User.get_or_fetch(identifier),
-             {:ok, _block} <- CommonAPI.block(blocker, blocked) do
+             {:ok, _block} <- CommonAPI.block(blocked, blocker) do
           blocked
         else
           error -> handle_error(:blocks_import, identifier, error)

lib/pleroma/web/common_api.ex

@@ -27,7 +27,7 @@ defmodule Pleroma.Web.CommonAPI do
   require Logger
 
   @spec block(User.t(), User.t()) :: {:ok, Activity.t()} | {:error, any()}
-  def block(blocker, blocked) do
+  def block(blocked, blocker) do
     with {:ok, block_data, _} <- Builder.block(blocker, blocked),
          {:ok, block, _} <- Pipeline.common_pipeline(block_data, local: true) do
       {:ok, block}

lib/pleroma/web/mastodon_api/controllers/account_controller.ex

@@ -495,7 +495,7 @@ def unmute(%{assigns: %{user: muter, account: muted}} = conn, _params) do
 
   @doc "POST /api/v1/accounts/:id/block"
   def block(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do
-    with {:ok, _activity} <- CommonAPI.block(blocker, blocked) do
+    with {:ok, _activity} <- CommonAPI.block(blocked, blocker) do
       render(conn, "relationship.json", user: blocker, target: blocked)
     else
       {:error, message} -> json_response(conn, :forbidden, %{error: message})

test/pleroma/web/activity_pub/side_effects_test.exs

@@ -519,7 +519,7 @@ test "when activation is required", %{delete: delete, user: user} do
       {:ok, like} = CommonAPI.favorite(post.id, user)
       {:ok, reaction} = CommonAPI.react_with_emoji(post.id, user, "👍")
       {:ok, announce} = CommonAPI.repeat(post.id, user)
-      {:ok, block} = CommonAPI.block(user, poster)
+      {:ok, block} = CommonAPI.block(poster, user)
 
       {:ok, undo_data, _meta} = Builder.undo(user, like)
       {:ok, like_undo, _meta} = ActivityPub.persist(undo_data, local: true)
@@ -965,7 +965,7 @@ test "group should not boost it if group is blocking poster", %{
       group: group,
       poster: poster
     } do
-      {:ok, _} = CommonAPI.block(group, poster)
+      {:ok, _} = CommonAPI.block(poster, group)
       create_activity_data = make_create.([group])
       {:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
 

test/pleroma/web/activity_pub/utils_test.exs

@@ -382,9 +382,9 @@ test "fetches last block activities" do
       user1 = insert(:user)
       user2 = insert(:user)
 
-      assert {:ok, %Activity{} = _} = CommonAPI.block(user1, user2)
-      assert {:ok, %Activity{} = _} = CommonAPI.block(user1, user2)
-      assert {:ok, %Activity{} = activity} = CommonAPI.block(user1, user2)
+      assert {:ok, %Activity{} = _} = CommonAPI.block(user2, user1)
+      assert {:ok, %Activity{} = _} = CommonAPI.block(user2, user1)
+      assert {:ok, %Activity{} = activity} = CommonAPI.block(user2, user1)
 
       assert Utils.fetch_latest_block(user1, user2) == activity
     end

test/pleroma/web/common_api_test.exs

@@ -95,7 +95,7 @@ test "it blocks and federates", %{blocker: blocker, blocked: blocked} 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(blocked, blocker)
 
         assert block.local
         assert User.blocks?(blocker, blocked)
@@ -120,7 +120,7 @@ test "it blocks and does not federate if outgoing blocks are disabled", %{
 
       with_mock Pleroma.Web.Federator,
         publish: fn _ -> nil end do
-        assert {:ok, block} = CommonAPI.block(blocker, blocked)
+        assert {:ok, block} = CommonAPI.block(blocked, blocker)
 
         assert block.local
         assert User.blocks?(blocker, blocked)
@@ -1914,7 +1914,7 @@ test "multiple groups mentioned", %{poster: poster, group: group, other_group: o
     end
 
     test "it does not boost if group is blocking poster", %{poster: poster, group: group} do
-      {:ok, _} = CommonAPI.block(group, poster)
+      {:ok, _} = CommonAPI.block(poster, group)
       {:ok, post} = CommonAPI.post(poster, %{status: "hey @#{group.nickname}"})
 
       announces = get_announces_of_object(post.object)

test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs

@@ -148,7 +148,7 @@ test "excludes mentions from blockers when blockers_visible is false" do
     %{user: user, conn: conn} = oauth_access(["read:notifications"])
     blocker = insert(:user)
 
-    {:ok, _} = CommonAPI.block(blocker, user)
+    {:ok, _} = CommonAPI.block(user, blocker)
     {:ok, activity} = CommonAPI.post(blocker, %{status: "hi @#{user.nickname}"})
 
     {:ok, [_notification]} = Notification.create_notifications(activity)

test/pleroma/web/mastodon_api/controllers/suggestion_controller_test.exs

@@ -47,7 +47,7 @@ test "returns v2 suggestions excluding dismissed accounts", %{conn: conn} do
 
   test "returns v2 suggestions excluding blocked accounts", %{conn: conn, user: blocker} do
     blocked = insert(:user, is_suggested: true)
-    {:ok, _} = CommonAPI.block(blocker, blocked)
+    {:ok, _} = CommonAPI.block(blocked, blocker)
 
     res =
       conn