Commit bcd8ef65 authored by rinpatch's avatar rinpatch
Browse files

Merge branch 'add-admin-to-node-info' into 'develop'

Include admins in nodeinfo

Closes #689

See merge request !899
parents 682cc94d d1de0a30
Pipeline #8589 failed with stages
in 3 minutes and 33 seconds
......@@ -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 @@ def raw_nodeinfo do
staff_accounts =
|> Repo.all()
|> u -> u.ap_id end)
mrf_user_allowlist =
......@@ -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 =
......@@ -16,7 +17,8 @@ test "nodeinfo shows staff accounts", %{conn: conn} 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"]
test "nodeinfo shows restricted nicknames", %{conn: conn} do
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment