From 46b420aa602050d7b3bff33a6b51d54852b2adb3 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Fri, 25 Sep 2020 09:39:49 +0300
Subject: [PATCH] need_confirmed -> unconfirmed
---
lib/pleroma/user/query.ex | 4 ++--
lib/pleroma/web/admin_api/controllers/user_controller.ex | 2 +-
test/pleroma/web/admin_api/search_test.exs | 2 +-
test/web/admin_api/controllers/user_controller_test.exs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/user/query.ex b/lib/pleroma/user/query.ex
index 2933e7fb4..711439eef 100644
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@ -43,7 +43,7 @@ defmodule Pleroma.User.Query do
active: boolean(),
deactivated: boolean(),
need_approval: boolean(),
- need_confirmed: boolean(),
+ unconfirmed: boolean(),
is_admin: boolean(),
is_moderator: boolean(),
super_users: boolean(),
@@ -157,7 +157,7 @@ defp compose_query({:need_approval, _}, query) do
where(query, [u], u.approval_pending)
end
- defp compose_query({:need_confirmed, _}, query) do
+ defp compose_query({:unconfirmed, _}, query) do
where(query, [u], u.confirmation_pending)
end
diff --git a/lib/pleroma/web/admin_api/controllers/user_controller.ex b/lib/pleroma/web/admin_api/controllers/user_controller.ex
index 5e049aa0f..db6ef3220 100644
--- a/lib/pleroma/web/admin_api/controllers/user_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/user_controller.ex
@@ -259,7 +259,7 @@ def list(conn, params) do
end
end
- @filters ~w(local external active deactivated need_approval need_confirmed is_admin is_moderator)
+ @filters ~w(local external active deactivated need_approval unconfirmed is_admin is_moderator)
@spec maybe_parse_filters(String.t()) :: %{required(String.t()) => true} | %{}
defp maybe_parse_filters(filters) when is_nil(filters) or filters == "", do: %{}
diff --git a/test/pleroma/web/admin_api/search_test.exs b/test/pleroma/web/admin_api/search_test.exs
index 27ca396e6..82da86f7f 100644
--- a/test/pleroma/web/admin_api/search_test.exs
+++ b/test/pleroma/web/admin_api/search_test.exs
@@ -184,7 +184,7 @@ test "it returns unconfirmed user" do
insert(:user)
{:ok, _results, total} = Search.user()
- {:ok, [^unconfirmed], count} = Search.user(%{need_confirmed: true})
+ {:ok, [^unconfirmed], count} = Search.user(%{unconfirmed: true})
assert total == 3
assert count == 1
end
diff --git a/test/web/admin_api/controllers/user_controller_test.exs b/test/web/admin_api/controllers/user_controller_test.exs
index 347258058..6384f8ddc 100644
--- a/test/web/admin_api/controllers/user_controller_test.exs
+++ b/test/web/admin_api/controllers/user_controller_test.exs
@@ -644,7 +644,7 @@ test "only unconfirmed users", %{conn: conn} do
result =
conn
- |> get("/api/pleroma/admin/users?filters=need_confirmed")
+ |> get("/api/pleroma/admin/users?filters=unconfirmed")
|> json_response(200)
users =