X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fdocs%2Fjson.ex;h=a94c6a47240b045b9778959f0665662c63d31a27;hb=656afe78031c0cde1b4d6ccab6295640e098ac7e;hp=feeb4320e62b10ed56b9160eea548fe83fe9c77d;hpb=992deaa09bea1ed30f5a0e8bc357e27e4fd45be4;p=akkoma

diff --git a/lib/pleroma/docs/json.ex b/lib/pleroma/docs/json.ex
index feeb4320e..a94c6a472 100644
--- a/lib/pleroma/docs/json.ex
+++ b/lib/pleroma/docs/json.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Docs.JSON do
   @behaviour Pleroma.Docs.Generator
   @external_resource "config/description.exs"
@@ -7,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()
@@ -17,7 +25,7 @@ defmodule Pleroma.Docs.JSON do
 
   @spec process(keyword()) :: {:ok, String.t()}
   def process(descriptions) do
-    with path <- "docs/generated_config.json",
+    with path <- "docs/docs/generated_config.json",
          {:ok, file} <- File.open(path, [:write, :utf8]),
          formatted_descriptions <-
            Pleroma.Docs.Generator.convert_to_strings(descriptions),