Merge branch 'develop' into gun

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index bcb69bc4105ab35999d3afddf543efdfd44148cf..307f8b5bcd9c8426e38de94a2c3c3fe4e24a4446 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -2465,6 +2465,12 @@ config :pleroma, :config_description, [
         description: "For the search requests (account & status search etc.)",
         suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
       },
+      %{
+        key: :timeline,
+        type: [:tuple, {:list, :tuple}],
+        description: "For requests to timelines (each timeline has it's own limiter)",
+        suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
+      },
       %{
         key: :app_account_creation,
         type: [:tuple, {:list, :tuple}],
@@ -2599,7 +2605,7 @@ config :pleroma, :config_description, [
         key: :adapter,
         type: :module,
         description: "Tesla adapter",
-        suggestions: [Tesla.Adapter.Hackney]
+        suggestions: [Tesla.Adapter.Hackney, Tesla.Adapter.Gun]
       }
     ]
   },