aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-11-14 19:48:47 -0600
committerAlex Gleason <alex@alexgleason.me>2020-11-14 19:48:47 -0600
commit9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (patch)
treecc6b9add45f34878b1ce053b6a408e059768fa6a /lib/pleroma/docs/json.ex
parentdc38dc847207e4724265fbeb111d0a236b75f93f (diff)
parent28da36975dc325bb577ee81fb791fbdc7ec3e7e2 (diff)
downloadpleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.tar.gz
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'lib/pleroma/docs/json.ex')
-rw-r--r--lib/pleroma/docs/json.ex6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/docs/json.ex b/lib/pleroma/docs/json.ex
index 13618b509..a583e2a5b 100644
--- a/lib/pleroma/docs/json.ex
+++ b/lib/pleroma/docs/json.ex
@@ -11,7 +11,11 @@ defmodule Pleroma.Docs.JSON do
@spec compile :: :ok
def compile do
- :persistent_term.put(@term, Pleroma.Docs.Generator.convert_to_strings(@raw_descriptions))
+ descriptions =
+ Pleroma.Web.ActivityPub.MRF.config_descriptions()
+ |> Enum.reduce(@raw_descriptions, fn description, acc -> [description | acc] end)
+
+ :persistent_term.put(@term, Pleroma.Docs.Generator.convert_to_strings(descriptions))
end
@spec compiled_descriptions :: Map.t()