diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-05 07:05:44 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-05 07:05:44 +0000 |
| commit | bcd8ef65e00fb357ec7c990c43a957366d186ddf (patch) | |
| tree | 0e25bd27fdfc986337a1142b0f4fddac3d0658f0 | |
| parent | 682cc94db11404ad658f566634c1e641cc575091 (diff) | |
| parent | d1de0a30ccbc33a45b5b164e1cb910f4717296e9 (diff) | |
| download | pleroma-bcd8ef65e00fb357ec7c990c43a957366d186ddf.tar.gz | |
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 4 | ||||
| -rw-r--r-- | test/web/node_info_test.exs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index f4867d05b..8c775ce24 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -6,7 +6,6 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do use Pleroma.Web, :controller alias Pleroma.Config - alias Pleroma.Repo alias Pleroma.Stats alias Pleroma.User alias Pleroma.Web @@ -86,8 +85,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do end staff_accounts = - User.moderator_user_query() - |> Repo.all() + User.all_superusers() |> Enum.map(fn u -> u.ap_id end) mrf_user_allowlist = diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs index 763549bd1..038feecc1 100644 --- a/test/web/node_info_test.exs +++ b/test/web/node_info_test.exs @@ -8,7 +8,8 @@ defmodule Pleroma.Web.NodeInfoTest do import Pleroma.Factory test "nodeinfo shows staff accounts", %{conn: conn} do - user = insert(:user, %{local: true, info: %{is_moderator: true}}) + moderator = insert(:user, %{local: true, info: %{is_moderator: true}}) + admin = insert(:user, %{local: true, info: %{is_admin: true}}) conn = conn @@ -16,7 +17,8 @@ defmodule Pleroma.Web.NodeInfoTest do assert result = json_response(conn, 200) - assert user.ap_id in result["metadata"]["staffAccounts"] + assert moderator.ap_id in result["metadata"]["staffAccounts"] + assert admin.ap_id in result["metadata"]["staffAccounts"] end test "nodeinfo shows restricted nicknames", %{conn: conn} do |