aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-12-30 17:10:02 -0600
committerAlex Gleason <alex@alexgleason.me>2020-12-30 17:10:02 -0600
commitcbce88007672dc810cb345bb9872a009cbdc93d8 (patch)
tree45be2517812f2a598d9b6133554038a87d4b9f46 /lib/pleroma/docs/json.ex
parent83770b7b391fdf8bdc22f63047b1cf444a7b16ce (diff)
parent38924166eb3228deb71a2e23f1e8fd3255c6bd85 (diff)
downloadpleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.tar.gz
Merge remote-tracking branch 'upstream/develop' into aliases
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()