Adapt tests for v2/admin/accounts from Mastodon

Signed-off-by: mkljczk <git@mkljczk.pl>

lib/pleroma/user/query.ex

@@ -302,6 +302,11 @@ defmodule Pleroma.User.Query do
     where(query, [u], u.is_admin == true or u.is_moderator == true)
   end
 
+  defp compose_query({:domain, domain}, query) do
+    query
+    |> where([u], like(u.nickname, ^"%#{domain}"))
+  end
+
   defp compose_query(_unsupported_param, query), do: query
 
   defp location_query(query, local) do

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

@@ -22,7 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountController do
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
   @filter_params ~W(
-    local external active needing_approval deactivated nickname name email staff origin status
+    local external active needing_approval deactivated nickname name domain email staff origin status
   )
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate)
@@ -174,6 +174,7 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountController do
     |> maybe_filter_deactivated(params)
     |> maybe_filter_nickname(params)
     |> maybe_filter_name(params)
+    |> maybe_filter_domain(params)
     |> maybe_filter_email(params)
     |> maybe_filter_staff(params)
   end
@@ -184,6 +185,7 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountController do
     |> maybe_filter_status(params)
     |> maybe_filter_nickname(params)
     |> maybe_filter_name(params)
+    |> maybe_filter_domain(params)
     |> maybe_filter_email(params)
   end
 
@@ -232,6 +234,9 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountController do
   defp maybe_filter_name(criteria, %{display_name: name} = _params),
     do: Map.put(criteria, :name, name)
 
+  defp maybe_filter_domain(criteria, %{by_domain: domain} = _params),
+    do: Map.put(criteria, :domain, domain)
+
   defp maybe_filter_email(criteria, %{email: email} = _params),
     do: Map.put(criteria, :email, email)
 

test/pleroma/web/mastodon_api/admin/controllers/account_controller_test.exs

@@ -42,6 +42,94 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountControllerTest do
     end
   end
 
+  # Adapted from https://github.com/mastodon/mastodon/blob/main/spec/requests/api/v2/admin/accounts_spec.rb
+  describe "GET /api/v2/admin/accounts" do
+    setup do
+      remote_account = insert(:user, nickname: "remote@example.org", local: false)
+      other_remote_account = insert(:user, nickname: "other@foo.bar", local: false)
+      # suspended_account = insert(:user)
+      # suspended_remote = insert(:user)
+      disabled_account = insert(:user, is_active: false)
+      pending_account = insert(:user, is_approved: false)
+      admin_account = insert(:user, is_admin: true)
+
+      {:ok,
+       %{
+         remote_account: remote_account,
+         other_remote_account: other_remote_account,
+         disabled_account: disabled_account,
+         pending_account: pending_account,
+         admin_account: admin_account
+       }}
+    end
+
+    # test "returns the correct accounts when called with status active and origin local and permissions staff", %{
+    #   conn: conn,
+    #   admin_account: %{id: admin_account_id}
+    # } do
+    #   assert [%{"id" => ^admin_account_id}] =
+    #            conn
+    #            |> get("/api/v2/admin/accounts?status=active&origin=local&permissions=staff")
+    #            |> json_response_and_validate_schema(200)
+    # end
+
+    test "returns the correct accounts when called with by_domain value and origin remote", %{
+      conn: conn,
+      remote_account: %{id: remote_account_id}
+    } do
+      assert [%{"id" => ^remote_account_id}] =
+               conn
+               |> get("/api/v2/admin/accounts?by_domain=example.org&origin=remote")
+               |> json_response_and_validate_schema(200)
+    end
+
+    # test "returns the correct accounts when called with status suspended", %{
+    #   conn: conn,
+    #   suspended_account: %{id: suspended_account_id}
+    # } do
+    #   assert [%{"id" => ^suspended_account_id}] =
+    #            conn
+    #            |> get("/api/v2/admin/accounts?status=suspended")
+    #            |> json_response_and_validate_schema(200)
+    # end
+
+    test "returns the correct accounts when called with status disabled", %{
+      conn: conn,
+      disabled_account: %{id: disabled_account_id}
+    } do
+      assert [%{"id" => ^disabled_account_id}] =
+               conn
+               |> get("/api/v2/admin/accounts?status=disabled")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "returns the correct accounts when called with status pending", %{
+      conn: conn,
+      pending_account: %{id: pending_account_id}
+    } do
+      assert [%{"id" => ^pending_account_id}] =
+               conn
+               |> get("/api/v2/admin/accounts?status=pending")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "sets the correct pagination headers with limit param", %{
+      conn: conn,
+      admin_account: %{id: admin_account_id}
+    } do
+      response =
+        conn
+        |> get("/api/v2/admin/accounts?limit=1")
+
+      next_url =
+        ~r{<.+?(?<link>/api[^>]+)>; rel=\"next\"}
+        |> Regex.named_captures(get_resp_header(response, "link") |> Enum.at(0))
+        |> Map.get("link")
+
+      next_url =~ "&limit=1&max_id=#{admin_account_id}"
+    end
+  end
+
   describe "GET /api/v1/admin/accounts/:id" do
     test "show admin-level information", %{conn: conn} do
       %{id: id} =