projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
lib
/
pleroma
/
web
/
nodeinfo
/
nodeinfo_controller.ex
diff --git
a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index f4867d05bd0c4de0e78d921be7eb06c1f2da8b5c..45f90c57920c412f104002c59574a3f670b28a1c 100644
(file)
--- a/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@
-6,13
+6,11
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
use Pleroma.Web, :controller
alias Pleroma.Config
use Pleroma.Web, :controller
alias Pleroma.Config
- alias Pleroma.Repo
alias Pleroma.Stats
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.MRF
alias Pleroma.Stats
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.MRF
-
- plug(Pleroma.Web.FederatingPlug)
+ alias Pleroma.Web.Federator.Publisher
def schemas(conn, _params) do
response = %{
def schemas(conn, _params) do
response = %{
@@
-86,8
+84,7
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
end
staff_accounts =
end
staff_accounts =
- User.moderator_user_query()
- |> Repo.all()
+ User.all_superusers()
|> Enum.map(fn u -> u.ap_id end)
mrf_user_allowlist =
|> Enum.map(fn u -> u.ap_id end)
mrf_user_allowlist =
@@
-126,6
+123,9
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
end,
if Keyword.get(instance, :allow_relay) do
"relay"
end,
if Keyword.get(instance, :allow_relay) do
"relay"
+ end,
+ if Keyword.get(instance, :safe_dm_mentions) do
+ "safe_dm_mentions"
end
]
|> Enum.filter(& &1)
end
]
|> Enum.filter(& &1)
@@
-136,7
+136,7
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
name: Pleroma.Application.name() |> String.downcase(),
version: Pleroma.Application.version()
},
name: Pleroma.Application.name() |> String.downcase(),
version: Pleroma.Application.version()
},
- protocols:
["ostatus", "activitypub"]
,
+ protocols:
Publisher.gather_nodeinfo_protocol_names()
,
services: %{
inbound: [],
outbound: []
services: %{
inbound: [],
outbound: []