From b31a934a804aed3f35442ceafe2080b0955e7317 Mon Sep 17 00:00:00 2001
From: dcc <dcc@logografos.com>
Date: Wed, 15 May 2024 00:57:23 -0700
Subject:  total rebase

---
 lib/pleroma/http/adapter_helper.ex         | 12 ++++++------
 lib/pleroma/http/adapter_helper/default.ex |  0
 lib/pleroma/http/adapter_helper/gun.ex     |  0
 lib/pleroma/http/adapter_helper/hackney.ex |  0
 lib/pleroma/http/ex_aws.ex                 |  0
 lib/pleroma/http/request.ex                |  0
 lib/pleroma/http/request_builder.ex        |  4 ++--
 lib/pleroma/http/tzdata.ex                 |  0
 lib/pleroma/http/web_push.ex               |  6 +++++-
 9 files changed, 13 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 lib/pleroma/http/adapter_helper.ex
 mode change 100755 => 100644 lib/pleroma/http/adapter_helper/default.ex
 mode change 100755 => 100644 lib/pleroma/http/adapter_helper/gun.ex
 mode change 100755 => 100644 lib/pleroma/http/adapter_helper/hackney.ex
 mode change 100755 => 100644 lib/pleroma/http/ex_aws.ex
 mode change 100755 => 100644 lib/pleroma/http/request.ex
 mode change 100755 => 100644 lib/pleroma/http/request_builder.ex
 mode change 100755 => 100644 lib/pleroma/http/tzdata.ex
 mode change 100755 => 100644 lib/pleroma/http/web_push.ex

(limited to 'lib/pleroma/http')

diff --git a/lib/pleroma/http/adapter_helper.ex b/lib/pleroma/http/adapter_helper.ex
old mode 100755
new mode 100644
index 252a6ab..dcb27a2
--- a/lib/pleroma/http/adapter_helper.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@@ -15,8 +15,8 @@ defmodule Pleroma.HTTP.AdapterHelper do
   require Logger
 
   @type proxy ::
-          {Connection.host(), pos_integer()}
-          | {Connection.proxy_type(), Connection.host(), pos_integer()}
+          {host(), pos_integer()}
+          | {proxy_type(), host(), pos_integer()}
 
   @callback options(keyword(), URI.t()) :: keyword()
 
@@ -70,15 +70,15 @@ defmodule Pleroma.HTTP.AdapterHelper do
       {:ok, parse_host(host), port}
     else
       {_, _} ->
-        Logger.warn("Parsing port failed #{inspect(proxy)}")
+        Logger.warning("Parsing port failed #{inspect(proxy)}")
         {:error, :invalid_proxy_port}
 
       :error ->
-        Logger.warn("Parsing port failed #{inspect(proxy)}")
+        Logger.warning("Parsing port failed #{inspect(proxy)}")
         {:error, :invalid_proxy_port}
 
       _ ->
-        Logger.warn("Parsing proxy failed #{inspect(proxy)}")
+        Logger.warning("Parsing proxy failed #{inspect(proxy)}")
         {:error, :invalid_proxy}
     end
   end
@@ -88,7 +88,7 @@ defmodule Pleroma.HTTP.AdapterHelper do
       {:ok, type, parse_host(host), port}
     else
       _ ->
-        Logger.warn("Parsing proxy failed #{inspect(proxy)}")
+        Logger.warning("Parsing proxy failed #{inspect(proxy)}")
         {:error, :invalid_proxy}
     end
   end
diff --git a/lib/pleroma/http/adapter_helper/default.ex b/lib/pleroma/http/adapter_helper/default.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/ex_aws.ex b/lib/pleroma/http/ex_aws.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/request.ex b/lib/pleroma/http/request.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/request_builder.ex b/lib/pleroma/http/request_builder.ex
old mode 100755
new mode 100644
index f16fb3b..0a028a6
--- a/lib/pleroma/http/request_builder.ex
+++ b/lib/pleroma/http/request_builder.ex
@@ -54,12 +54,12 @@ defmodule Pleroma.HTTP.RequestBuilder do
   @doc """
   Add optional parameters to the request
   """
-  @spec add_param(Request.t(), atom(), atom(), any()) :: Request.t()
+  @spec add_param(Request.t(), atom(), atom() | String.t(), any()) :: Request.t()
   def add_param(request, :query, :query, values), do: %{request | query: values}
 
   def add_param(request, :body, :body, value), do: %{request | body: value}
 
-  def add_param(request, :body, key, value) do
+  def add_param(request, :body, key, value) when is_binary(key) do
     request
     |> Map.put(:body, Multipart.new())
     |> Map.update!(
diff --git a/lib/pleroma/http/tzdata.ex b/lib/pleroma/http/tzdata.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/http/web_push.ex b/lib/pleroma/http/web_push.ex
old mode 100755
new mode 100644
index ca399b6..888079c
--- a/lib/pleroma/http/web_push.ex
+++ b/lib/pleroma/http/web_push.ex
@@ -6,7 +6,11 @@ defmodule Pleroma.HTTP.WebPush do
   @moduledoc false
 
   def post(url, payload, headers, options \\ []) do
-    list_headers = Map.to_list(headers)
+    list_headers =
+      headers
+      |> Map.to_list()
+      |> Kernel.++([{"content-type", "octet-stream"}])
+
     Pleroma.HTTP.post(url, payload, list_headers, options)
   end
 end
-- 
cgit v1.2.3