logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 8ac4458630026387a5394b427daa409b0d2667ba
parent a6fc97ffecc7c48d46354c28af2275bafe4b7301
Author: feld <feld@feld.me>
Date:   Fri, 29 Dec 2023 17:00:58 +0000

Merge branch 'finch-redirects' into 'develop'

Fix following redirects with Finch

See merge request pleroma/pleroma!4023

Diffstat:

Achangelog.d/finch_redirects.fix1+
Mlib/pleroma/http.ex4++++
2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/changelog.d/finch_redirects.fix b/changelog.d/finch_redirects.fix @@ -0,0 +1 @@ +Following HTTP Redirects when the HTTP Adapter is Finch diff --git a/lib/pleroma/http.ex b/lib/pleroma/http.ex @@ -106,6 +106,10 @@ defmodule Pleroma.HTTP do [Tesla.Middleware.FollowRedirects, Pleroma.Tesla.Middleware.ConnectionPool] end + defp adapter_middlewares({Tesla.Adapter.Finch, _}) do + [Tesla.Middleware.FollowRedirects] + end + defp adapter_middlewares(_) do if Pleroma.Config.get(:env) == :test do # Emulate redirects in test env, which are handled by adapters in other environments