limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

fix oembed test

Browse source
This commit is contained in:
Floatingghost 2024-06-09 21:17:12 +01:00
parent 840c70c4fa
commit a360836ce3
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/config.exs
View file

@ -192,8 +192,7 @@ config :pleroma, :http,
pool_size: 10, pool_size: 10,
adapter: [], adapter: [],
# see: https://hexdocs.pm/finch/Finch.html#start_link/1 # see: https://hexdocs.pm/finch/Finch.html#start_link/1
pool_max_idle_time: :timer.seconds(30), pool_max_idle_time: :timer.seconds(30)
conn_max_idle_time: :timer.seconds(15)
config :pleroma, :instance, config :pleroma, :instance,
name: "Akkoma", name: "Akkoma",

2
lib/pleroma/application.ex
View file

@ -264,7 +264,7 @@ defmodule Pleroma.Application do
defp http_children do defp http_children do
proxy_url = Config.get([:http, :proxy_url]) proxy_url = Config.get([:http, :proxy_url])
proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url) proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
pool_size = Config.get([:http, :pool_size]) pool_size = Config.get([:http, :pool_size], 10)
pool_timeout = Config.get([:http, :pool_timeout], 60_000) pool_timeout = Config.get([:http, :pool_timeout], 60_000)
connection_timeout = Config.get([:http, :conn_max_idle_time], 10_000) connection_timeout = Config.get([:http, :conn_max_idle_time], 10_000)

2
test/fixtures/rich_media/oembed.html vendored
View file

@ -1,3 +1,3 @@
<link rel="alternate" type="application/json+oembed" <link rel="alternate" type="application/json+oembed"
href="http://example.com/oembed.json" href="https://example.com/oembed.json"
title="Bacon Lollys oEmbed Profile" /> title="Bacon Lollys oEmbed Profile" />