From a360836ce3ea14fcad543f50d824da3d5d259f0f Mon Sep 17 00:00:00 2001
From: Floatingghost <hannah@coffee-and-dreams.uk>
Date: Sun, 9 Jun 2024 21:17:12 +0100
Subject: [PATCH] fix oembed test

---
 config/config.exs                    | 3 +--
 lib/pleroma/application.ex           | 2 +-
 test/fixtures/rich_media/oembed.html | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 067f5f315..cea2b5c44 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -192,8 +192,7 @@ config :pleroma, :http,
   pool_size: 10,
   adapter: [],
   # see: https://hexdocs.pm/finch/Finch.html#start_link/1
-  pool_max_idle_time: :timer.seconds(30),
-  conn_max_idle_time: :timer.seconds(15)
+  pool_max_idle_time: :timer.seconds(30)
 
 config :pleroma, :instance,
   name: "Akkoma",
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index a7ae3d13c..506fc3daf 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -264,7 +264,7 @@ defmodule Pleroma.Application do
   defp http_children do
     proxy_url = Config.get([:http, :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)
     connection_timeout = Config.get([:http, :conn_max_idle_time], 10_000)
 
diff --git a/test/fixtures/rich_media/oembed.html b/test/fixtures/rich_media/oembed.html
index 55f17004b..5429630d0 100644
--- a/test/fixtures/rich_media/oembed.html
+++ b/test/fixtures/rich_media/oembed.html
@@ -1,3 +1,3 @@
 <link rel="alternate" type="application/json+oembed"
-  href="http://example.com/oembed.json"
+  href="https://example.com/oembed.json"
   title="Bacon Lollys oEmbed Profile" />