Browse Source

Include admins in nodeinfo

tags/v1.1.4
eugenijm 5 years ago
parent
commit
d1de0a30cc
2 changed files with 5 additions and 5 deletions
  1. +1
    -3
      lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
  2. +4
    -2
      test/web/node_info_test.exs

+ 1
- 3
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex View File

@@ -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 =


+ 4
- 2
test/web/node_info_test.exs View File

@@ -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


Loading…
Cancel
Save