Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 49fea4234ed9fb9e48b1b7303a4c4b9385f8d553..46f085c70de263935c40e2a391b2381a73351d1d 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -935,6 +935,12 @@ config :pleroma, :config_description, [
         key: :show_reactions,
         type: :boolean,
         description: "Let favourites and emoji reactions be viewed through the API."
+      },
+      %{
+        key: :improved_hashtag_timeline,
+        type: :keyword,
+        description:
+          "If `true` / `:prefer_aggregation`, hashtags table and selected strategy will be used for hashtags timeline. When `false`, object-embedded hashtags will be used (slower). Is auto-set to `true` (unless overridden) when HashtagsTableMigrator completes."
       }
     ]
   },
@@ -3358,7 +3364,7 @@ config :pleroma, :config_description, [
         ]
       },
       %{
-        key: Pleroma.Web.MediaProxy,
+        key: Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy,
         type: :keyword,
         description: "Concurrent limits configuration for MediaProxyWarmingPolicy.",
         suggestions: [max_running: 5, max_waiting: 5],