aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/docs/json.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-11-21 19:47:46 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-11-21 19:47:46 +0300
commit489b12cde48d0ed6b16914c5a831b1e992d0d059 (patch)
tree2928b5b9111339f16a5642c4ec07c82851c4f7ed /lib/pleroma/docs/json.ex
parentccc2cf0e87f47618163da588ead76846c64cba7a (diff)
parentecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff)
downloadpleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.tar.gz
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
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()