projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'static-fe-object-id' into '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 1929842423e9fb64e09e0672b4a2b488d6a103fa..486b9f6a4dce7d685a92e08ea42de1610f7445f5 100644
(file)
--- a/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@
-46,6
+46,7
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
data
|> Map.merge(%{quarantined_instances: quarantined})
data
|> Map.merge(%{quarantined_instances: quarantined})
+ |> Map.put(:enabled, Config.get([:instance, :federating]))
else
%{}
end
else
%{}
end
@@
-58,6
+59,7
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
"polls",
"pleroma_explicit_addressing",
"shareable_emoji_packs",
"polls",
"pleroma_explicit_addressing",
"shareable_emoji_packs",
+ "multifetch",
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,