projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma 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 abcf46034d10c0cc6073eeb6364e8eb02257ab31..533f82f6c33796d9b4b2d8d8d25871ffc279dacc 100644
(file)
--- a/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@
-33,8
+33,11
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
# under software.
def raw_nodeinfo do
stats = Stats.get_stats()
# under software.
def raw_nodeinfo do
stats = Stats.get_stats()
-
- quarantined = Config.get([:instance, :quarantined_instances], [])
+ exclusions = Config.get([:instance, :mrf_transparency_exclusions], [])
+
+ quarantined =
+ Config.get([:instance, :quarantined_instances], [])
+ |> Enum.filter(fn x -> !Enum.member?(exclusions, x) end)
staff_accounts =
User.all_superusers()
staff_accounts =
User.all_superusers()