logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: 842090945aa5700faa222e47985cad542d375314
parent c49dece0ddf7f6704afde2e1fc969537e423a455
Author: Mark Felder <feld@feld.me>
Date:   Wed, 30 Jul 2025 15:42:49 -0700

Ensure Hackney and Finch both get the default middleware

Diffstat:

Mlib/pleroma/http.ex7++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/http.ex b/lib/pleroma/http.ex @@ -110,10 +110,6 @@ defmodule Pleroma.HTTP do extra_middleware end - defp adapter_middlewares({Tesla.Adapter.Finch, _}, extra_middleware) do - default_middleware() ++ extra_middleware - end - defp adapter_middlewares(_, extra_middleware) do # A lot of tests are written expecting unencoded URLs # and the burden of fixing that is high. Also it makes @@ -127,8 +123,9 @@ defmodule Pleroma.HTTP do # Emulate redirects in test env, which are handled by adapters in other environments [Tesla.Middleware.FollowRedirects] + # Hackney and Finch true -> - extra_middleware + default_middleware() ++ extra_middleware end end