Browse Source

correct pool and uniform headers format

message-debug-mode
Alexander Strizhakov 3 years ago
parent
commit
79f65b4374
No known key found for this signature in database GPG Key ID: 22896A53AEF1381
6 changed files with 14 additions and 10 deletions
  1. +3
    -1
      lib/mix/tasks/pleroma/frontend.ex
  2. +3
    -1
      lib/pleroma/instances/instance.ex
  3. +3
    -3
      lib/pleroma/object/fetcher.ex
  4. +1
    -1
      lib/pleroma/web/rich_media/helpers.ex
  5. +2
    -2
      lib/pleroma/web/web_finger/web_finger.ex
  6. +2
    -2
      test/support/http_request_mock.ex

+ 3
- 1
lib/mix/tasks/pleroma/frontend.ex View File

@@ -124,7 +124,9 @@ defmodule Mix.Tasks.Pleroma.Frontend do
url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])

with {:ok, %{status: 200, body: zip_body}} <-
Pleroma.HTTP.get(url, [], timeout: 120_000, recv_timeout: 120_000) do
Pleroma.HTTP.get(url, [],
adapter: [pool: :media, timeout: 120_000, recv_timeout: 120_000]
) do
unzip(zip_body, dest)
else
e -> {:error, e}


+ 3
- 1
lib/pleroma/instances/instance.ex View File

@@ -150,7 +150,9 @@ defmodule Pleroma.Instances.Instance do
defp scrape_favicon(%URI{} = instance_uri) do
try do
with {:ok, %Tesla.Env{body: html}} <-
Pleroma.HTTP.get(to_string(instance_uri), [{:Accept, "text/html"}]),
Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}],
adapter: [pool: :media]
),
favicon_rel <-
html
|> Floki.parse_document!()


+ 3
- 3
lib/pleroma/object/fetcher.ex View File

@@ -164,12 +164,12 @@ defmodule Pleroma.Object.Fetcher do
date: date
})

[{"signature", signature}]
{"signature", signature}
end

defp sign_fetch(headers, id, date) do
if Pleroma.Config.get([:activitypub, :sign_object_fetches]) do
headers ++ make_signature(id, date)
[make_signature(id, date) | headers]
else
headers
end
@@ -177,7 +177,7 @@ defmodule Pleroma.Object.Fetcher do

defp maybe_date_fetch(headers, date) do
if Pleroma.Config.get([:activitypub, :sign_object_fetches]) do
headers ++ [{"date", date}]
[{"date", date} | headers]
else
headers
end


+ 1
- 1
lib/pleroma/web/rich_media/helpers.ex View File

@@ -96,6 +96,6 @@ defmodule Pleroma.Web.RichMedia.Helpers do
@rich_media_options
end

Pleroma.HTTP.get(url, headers, options)
Pleroma.HTTP.get(url, headers, adapter: options)
end
end

+ 2
- 2
lib/pleroma/web/web_finger/web_finger.ex View File

@@ -136,12 +136,12 @@ defmodule Pleroma.Web.WebFinger do

def find_lrdd_template(domain) do
with {:ok, %{status: status, body: body}} when status in 200..299 <-
HTTP.get("http://#{domain}/.well-known/host-meta", []) do
HTTP.get("http://#{domain}/.well-known/host-meta") do
get_template_from_xml(body)
else
_ ->
with {:ok, %{body: body, status: status}} when status in 200..299 <-
HTTP.get("https://#{domain}/.well-known/host-meta", []) do
HTTP.get("https://#{domain}/.well-known/host-meta") do
get_template_from_xml(body)
else
e -> {:error, "Can't find LRDD template: #{inspect(e)}"}


+ 2
- 2
test/support/http_request_mock.ex View File

@@ -1350,11 +1350,11 @@ defmodule HttpRequestMock do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/relay/relay.json")}}
end

def get("http://localhost:4001/", _, "", Accept: "text/html") do
def get("http://localhost:4001/", _, "", [{"accept", "text/html"}]) do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/7369654.html")}}
end

def get("https://osada.macgirvin.com/", _, "", Accept: "text/html") do
def get("https://osada.macgirvin.com/", _, "", [{"accept", "text/html"}]) do
{:ok,
%Tesla.Env{
status: 200,


Loading…
Cancel
Save