pleroma

commit: f1f4b1863fec739dc854e0ab7b0f03644ec42100
parent: 8ca993c789fb3d41450419fc49bfa22542368ba8
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat,  1 Aug 2020 07:25:32 +0000

Merge branch 'fix/user-agent-overriding' into 'develop'

Don't override user-agent header if it's been set

Closes #1923

See merge request pleroma/pleroma!2829
Diffstat:
M
lib/pleroma/http/request_builder.ex
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/http/request_builder.ex b/lib/pleroma/http/request_builder.ex
@@ -34,10 +34,12 @@ defmodule Pleroma.HTTP.RequestBuilder do
   @spec headers(Request.t(), Request.headers()) :: Request.t()
   def headers(request, headers) do
     headers_list =
-      if Pleroma.Config.get([:http, :send_user_agent]) do
+      with true <- Pleroma.Config.get([:http, :send_user_agent]),
+           nil <- Enum.find(headers, fn {key, _val} -> String.downcase(key) == "user-agent" end) do
         [{"user-agent", Pleroma.Application.user_agent()} | headers]
       else
-        headers
+        _ ->
+          headers
       end
 
     %{request | headers: headers_list}