aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-01-06 15:22:35 -0600
committerAlex Gleason <alex@alexgleason.me>2021-01-06 15:22:35 -0600
commit1438fd958325c3d469315c478f06def9e4dd0de3 (patch)
tree738e7e9ce8e0e0af89d9dff411191643cbf45aab /lib/pleroma/docs/json.ex
parent2aeb229de3f59e1704c633c31415e7e834f6ba67 (diff)
parent5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff)
downloadpleroma-1438fd958325c3d469315c478f06def9e4dd0de3.tar.gz
Merge remote-tracking branch 'upstream/develop' into block-behavior
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()