darkkirb/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Include admins in nodeinfo

Closes #689

See merge request pleroma/pleroma!899
This commit is contained in:
rinpatch 2019-03-05 07:05:44 +00:00
commit bcd8ef65e0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
View file

@ -6,7 +6,6 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.Repo
alias Pleroma.Stats alias Pleroma.Stats
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web alias Pleroma.Web
@ -86,8 +85,7 @@ def raw_nodeinfo do
end end
staff_accounts = staff_accounts =
User.moderator_user_query() User.all_superusers()
|> Repo.all()
|> Enum.map(fn u -> u.ap_id end) |> Enum.map(fn u -> u.ap_id end)
mrf_user_allowlist = mrf_user_allowlist =

6
test/web/node_info_test.exs
View file

@ -8,7 +8,8 @@ defmodule Pleroma.Web.NodeInfoTest do
import Pleroma.Factory import Pleroma.Factory
test "nodeinfo shows staff accounts", %{conn: conn} do 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 =
conn conn
@ -16,7 +17,8 @@ test "nodeinfo shows staff accounts", %{conn: conn} do
assert result = json_response(conn, 200) 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 end
test "nodeinfo shows restricted nicknames", %{conn: conn} do test "nodeinfo shows restricted nicknames", %{conn: conn} do