tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Use runtime configuration for HTTP clients user-agent

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-04-09 10:43:45 +02:00
parent e991d7d373
commit 5ac02bae5d
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
5 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/service/http/activity_pub.ex
View file

@ -5,28 +5,26 @@ defmodule Mobilizon.Service.HTTP.ActivityPub do
alias Mobilizon.Config alias Mobilizon.Config
@adapter Application.get_env(:tesla, __MODULE__, [])[:adapter] || Tesla.Adapter.Hackney
@default_opts [ @default_opts [
recv_timeout: 20_000 recv_timeout: 20_000
] ]
@user_agent Config.instance_user_agent()
def client(options \\ []) do def client(options \\ []) do
headers = Keyword.get(options, :headers, []) headers = Keyword.get(options, :headers, [])
adapter = Application.get_env(:tesla, __MODULE__, [])[:adapter] || Tesla.Adapter.Hackney
opts = Keyword.merge(@default_opts, Keyword.get(options, :opts, [])) opts = Keyword.merge(@default_opts, Keyword.get(options, :opts, []))
middleware = [ middleware = [
{Tesla.Middleware.Headers, {Tesla.Middleware.Headers,
[{"User-Agent", @user_agent}, {"Accept", "application/activity+json"}] ++ headers}, [{"User-Agent", Config.instance_user_agent()}, {"Accept", "application/activity+json"}] ++
headers},
Tesla.Middleware.FollowRedirects, Tesla.Middleware.FollowRedirects,
{Tesla.Middleware.Timeout, timeout: 10_000}, {Tesla.Middleware.Timeout, timeout: 10_000},
{Tesla.Middleware.JSON, {Tesla.Middleware.JSON,
decode_content_types: ["application/activity+json", "application/ld+json"]} decode_content_types: ["application/activity+json", "application/ld+json"]}
] ]
adapter = {@adapter, opts} Tesla.client(middleware, {adapter, opts})
Tesla.client(middleware, adapter)
end end
def get(client, url) do def get(client, url) do

4
lib/service/http/geospatial_client.ex
View file

@ -13,13 +13,11 @@ defmodule Mobilizon.Service.HTTP.GeospatialClient do
adapter(Tesla.Adapter.Hackney, @default_opts) adapter(Tesla.Adapter.Hackney, @default_opts)
@user_agent Config.instance_user_agent()
plug(Tesla.Middleware.FollowRedirects) plug(Tesla.Middleware.FollowRedirects)
plug(Tesla.Middleware.Timeout, timeout: 10_000) plug(Tesla.Middleware.Timeout, timeout: 10_000)
plug(Tesla.Middleware.Headers, [{"User-Agent", @user_agent}]) plug(Tesla.Middleware.Headers, [{"User-Agent", Config.instance_user_agent()}])
plug(Tesla.Middleware.JSON) plug(Tesla.Middleware.JSON)
end end

4
lib/service/http/remote_media_downloader_client.ex
View file

@ -12,11 +12,9 @@ defmodule Mobilizon.Service.HTTP.RemoteMediaDownloaderClient do
adapter(Tesla.Adapter.Hackney, @default_opts) adapter(Tesla.Adapter.Hackney, @default_opts)
@user_agent Config.instance_user_agent()
plug(Tesla.Middleware.FollowRedirects) plug(Tesla.Middleware.FollowRedirects)
plug(Tesla.Middleware.Timeout, timeout: 10_000) plug(Tesla.Middleware.Timeout, timeout: 10_000)
plug(Tesla.Middleware.Headers, [{"User-Agent", @user_agent}]) plug(Tesla.Middleware.Headers, [{"User-Agent", Config.instance_user_agent()}])
end end

4
lib/service/http/rich_media_preview_client.ex
View file

@ -12,11 +12,9 @@ defmodule Mobilizon.Service.HTTP.RichMediaPreviewClient do
adapter(Tesla.Adapter.Hackney, @default_opts) adapter(Tesla.Adapter.Hackney, @default_opts)
@user_agent Config.instance_user_agent()
plug(Tesla.Middleware.FollowRedirects) plug(Tesla.Middleware.FollowRedirects)
plug(Tesla.Middleware.Timeout, timeout: 10_000) plug(Tesla.Middleware.Timeout, timeout: 10_000)
plug(Tesla.Middleware.Headers, [{"User-Agent", @user_agent}]) plug(Tesla.Middleware.Headers, [{"User-Agent", Config.instance_user_agent()}])
end end

4
lib/service/http/webfinger_client.ex
View file

@ -13,14 +13,12 @@ defmodule Mobilizon.Service.HTTP.WebfingerClient do
adapter(Tesla.Adapter.Hackney, @default_opts) adapter(Tesla.Adapter.Hackney, @default_opts)
@user_agent Config.instance_user_agent()
plug(Tesla.Middleware.FollowRedirects) plug(Tesla.Middleware.FollowRedirects)
plug(Tesla.Middleware.Timeout, timeout: 10_000) plug(Tesla.Middleware.Timeout, timeout: 10_000)
plug(Tesla.Middleware.Headers, [ plug(Tesla.Middleware.Headers, [
{"User-Agent", @user_agent}, {"User-Agent", Config.instance_user_agent()},
{"Accept", "application/json, application/activity+json, application/jrd+json"} {"Accept", "application/json, application/activity+json, application/jrd+json"}
]) ])