X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdescription.exs;h=c5ae63915bf2def4d5f9c33d839a95364e3ebb47;hb=bf9d631fcaca072ae7adfdc77c78c1e4dfeffc5c;hp=537b9d9964acc57910b1e785e096a798f1452c69;hpb=171cefd88972c6ec1f37a2e014a9a484ae91ab9a;p=akkoma

diff --git a/config/description.exs b/config/description.exs
index 537b9d996..c5ae63915 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1,5 +1,5 @@
 use Mix.Config
-alias Pleroma.Docs.Formatter
+alias Pleroma.Docs.Generator
 
 websocket_config = [
   path: "/websocket",
@@ -24,7 +24,7 @@ config :pleroma, :config_description, [
         type: :module,
         description: "Module which will be used for uploads",
         suggestions: [
-          Formatter.uploaders_list()
+          Generator.uploaders_list()
         ]
       },
       %{
@@ -32,13 +32,14 @@ config :pleroma, :config_description, [
         type: {:list, :module},
         description: "List of filter modules for uploads",
         suggestions: [
-          Formatter.filters_list()
+          Generator.filters_list()
         ]
       },
       %{
         key: :link_name,
         type: :boolean,
-        description: "If enabled Pleroma will add name parameter to the url off the upload",
+        description:
+          "If enabled, a name parameter will be added to the url of the upload. For example `https://instance.tld/media/imagehash.png?name=realname.png`",
         suggestions: [
           true,
           false
@@ -55,7 +56,8 @@ config :pleroma, :config_description, [
       %{
         key: :proxy_remote,
         type: :boolean,
-        description: "If enabled, Pleroma will proxy media requests instead of redirecting to it",
+        description:
+          "If enabled, requests to media stored using a remote uploader will be proxied instead of being redirected.",
         suggestions: [
           true,
           false
@@ -64,8 +66,7 @@ config :pleroma, :config_description, [
       %{
         key: :proxy_opts,
         type: :keyword,
-        description: "Proxy options, see `Pleroma.ReverseProxy` documentation",
-        suggestions: ["somehow created link to Pleroma.ReverseProxy options"]
+        description: "Proxy options, see `Pleroma.ReverseProxy` documentation"
       }
     ]
   },
@@ -93,7 +94,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :bucket,
-        type: :strings,
+        type: :string,
         description: "S3 bucket",
         suggestions: [
           "bucket"
@@ -629,7 +630,7 @@ config :pleroma, :config_description, [
         description: "A list of MRF policies enabled",
         suggestions: [
           Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
-          Formatter.mrf_list()
+          Generator.mrf_list()
         ]
       },
       %{
@@ -1920,7 +1921,7 @@ config :pleroma, :config_description, [
         type: {:list, :module},
         description: "list of Rich Media parsers",
         suggestions: [
-          Formatter.richmedia_parsers()
+          Generator.richmedia_parsers()
         ]
       },
       %{
@@ -2809,5 +2810,28 @@ config :pleroma, :config_description, [
         suggestions: [["Authorization", "Content-Type", "Idempotency-Key"]]
       }
     ]
+  },
+  %{
+    group: :pleroma,
+    key: :web_cache_ttl,
+    type: :group,
+    description:
+      "The expiration time for the web responses cache. Values should be in milliseconds or `nil` to disable expiration.",
+    children: [
+      %{
+        key: :activity_pub,
+        type: :integer,
+        description:
+          "activity pub routes (except question activities). Defaults to `nil` (no expiration).",
+        suggestions: [30_000, nil]
+      },
+      %{
+        key: :activity_pub_question,
+        type: :integer,
+        description:
+          "activity pub routes (question activities). Defaults to `30_000` (30 seconds).",
+        suggestions: [30_000]
+      }
+    ]
   }
 ]