pleroma

commit: b23b007d000b524b4997fcf975d1963fa832c720
parent a4bd89c77e668ac3c17289c3ee9b8574efe47072
Author: feld <feld@feld.me>
Date:   Fri,  7 Jun 2024 21:52:55 +0000

Merge branch 'feld/cleanup' into 'develop'

Minor cleanup commits

See merge request pleroma/pleroma!4142
Diffstat:
A
changelog.d/cleanup.skip
0

M
lib/pleroma/application.ex
2
--
M
lib/pleroma/http/adapter_helper/gun.ex
2
+-

3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/changelog.d/cleanup.skip b/changelog.d/cleanup.skip
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -292,8 +292,6 @@ defmodule Pleroma.Application do
     config = Config.get(ConcurrentLimiter, [])
 
     [
-      Pleroma.Web.RichMedia.Helpers,
-      Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy,
       Pleroma.Search
     ]
     |> Enum.each(fn module ->
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
     retry_timeout: 1_000
   ]
 
-  @type pool() :: :federation | :upload | :media | :default
+  @type pool() :: :federation | :upload | :media | :rich_media | :default
 
   @spec options(keyword(), URI.t()) :: keyword()
   def options(incoming_opts \\ [], %URI{} = uri) do