From e154ebbf7933123e91d5b5c6f5070e78eb3e383b Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Sun, 15 Aug 2021 21:53:04 +0300
Subject: Initial meilisearch implementation, doesn't delete posts yet

---
 config/config.exs | 7 ++++++-
 config/test.exs   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4e21ce457..1df7dd44b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -866,9 +866,14 @@ config :pleroma, Pleroma.User.Backup,
 
 config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
-  {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
+  {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]},
+  {Pleroma.Search, [max_running: 20, max_waiting: 50]}
 ]
 
+config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
+
+config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/"
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/config/test.exs b/config/test.exs
index d5c25f65e..d1c356f14 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -133,6 +133,8 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
+config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
+
 # Reduce recompilation time
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
-- 
cgit v1.2.3


From 005947e9f77b40d1b6dd6c05f952df6ecb2aa1fc Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Mon, 23 Aug 2021 23:52:21 +0300
Subject: Add tests for local post indexing for meilisearch

---
 config/test.exs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index d1c356f14..c9b2b51ba 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -133,7 +133,9 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
-config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
+config :pleroma, Pleroma.Search, module: Pleroma.Activity
+
+config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
 
 # Reduce recompilation time
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
-- 
cgit v1.2.3


From a5bb7f9345ff73469c0d776bce5455ec4f27b4ee Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Mon, 23 Aug 2021 23:52:37 +0300
Subject: Add private_key: nil to default meilisearch options

---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1df7dd44b..711775982 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -872,7 +872,7 @@ config :pleroma, ConcurrentLimiter, [
 
 config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
 
-config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/"
+config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-- 
cgit v1.2.3


From e4b7a3f51f270f468c15cc4ce850c847633c030b Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Fri, 29 Oct 2021 00:38:00 +0300
Subject: Modify some meilisearch variables

---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 711775982..b55dd94cb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -867,7 +867,7 @@ config :pleroma, Pleroma.User.Backup,
 config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]},
-  {Pleroma.Search, [max_running: 20, max_waiting: 50]}
+  {Pleroma.Search, [max_running: 30, max_waiting: 50]}
 ]
 
 config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
-- 
cgit v1.2.3


From a6946048fbe049aa223d094d36eb767739ab5ff2 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Wed, 17 Nov 2021 22:29:49 +0300
Subject: Rename Activity.Search to Search.DatabaseSearch

---
 config/config.exs | 2 +-
 config/test.exs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b55dd94cb..f7f3a1454 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -870,7 +870,7 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Search, [max_running: 30, max_waiting: 50]}
 ]
 
-config :pleroma, Pleroma.Search, module: Pleroma.Activity.Search
+config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
 
 config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
 
diff --git a/config/test.exs b/config/test.exs
index c9b2b51ba..ea29be638 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -133,7 +133,7 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
-config :pleroma, Pleroma.Search, module: Pleroma.Activity
+config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
 
 config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
 
-- 
cgit v1.2.3


From 3a11e79de0c7092bf4fe0649e4ab1fcb53eb14a3 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Mon, 20 Dec 2021 17:46:23 +0300
Subject: Add config description for meilisearch

---
 config/description.exs | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 3a2a65272..81fefaf89 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3475,5 +3475,40 @@ config :pleroma, :config_description, [
         ]
       }
     ]
+  },
+  %{
+    group: :pleroma,
+    key: Pleroma.Search,
+    type: :group,
+    description: "General search settings.",
+    children: [
+      %{
+        key: :module,
+        type: :keyword,
+        description: "Selected search module.",
+        suggestion: [Pleroma.Search.DatabaseSearch, Pleroma.Search.Meilisearch]
+      }
+    ]
+  },
+  %{
+    group: :pleroma,
+    key: Pleroma.Search.Meilisearch,
+    type: :group,
+    description: "Meilisearch settings.",
+    children: [
+      %{
+        key: :url,
+        type: :string,
+        description: "Meilisearch URL.",
+        suggestion: ["http://127.0.0.1:7700/"]
+      },
+      %{
+        key: :private_key,
+        type: :string,
+        description:
+          "Private key for meilisearch authentication, or `nil` to disable private key authentication.",
+        suggestion: [nil]
+      }
+    ]
   }
 ]
-- 
cgit v1.2.3


From 3179ed0921197a8a8f32a519c7d41dc09011024d Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Mon, 20 Dec 2021 18:48:52 +0300
Subject: Make chunk size configurable

---
 config/config.exs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index f7f3a1454..bcbc59b83 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -872,7 +872,10 @@ config :pleroma, ConcurrentLimiter, [
 
 config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
 
-config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
+config :pleroma, Pleroma.Search.Meilisearch,
+  url: "http://127.0.0.1:7700/",
+  private_key: nil,
+  initial_indexing_chunk_size: 100_000
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-- 
cgit v1.2.3


From 4f2637acc6c46ea39ae38e869903e7ffcc38b34d Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Mon, 20 Dec 2021 19:27:22 +0300
Subject: Add description for initial_indexing_chunk_size

---
 config/description.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 81fefaf89..cea4401ba 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3508,6 +3508,14 @@ config :pleroma, :config_description, [
         description:
           "Private key for meilisearch authentication, or `nil` to disable private key authentication.",
         suggestion: [nil]
+      },
+      %{
+        key: :initial_indexing_chunk_size,
+        type: :int,
+        description:
+          "Amount of posts in a batch when running the initial indexing operation. Should probably not be more than 100000" <>
+            " since there's a limit on maximum insert size",
+        suggestion: [100_000]
       }
     ]
   }
-- 
cgit v1.2.3


From 2bc21c6f1884bae3226f760ed1da39dd9c5f2958 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Sat, 22 Jan 2022 15:23:11 +0300
Subject: Use oban for search indexing

---
 config/config.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index bcbc59b83..3e2f0da3f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -571,7 +571,8 @@ config :pleroma, Oban,
     remote_fetcher: 2,
     attachments_cleanup: 1,
     new_users_digest: 1,
-    mute_expire: 5
+    mute_expire: 5,
+    search_indexing: 1
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
-- 
cgit v1.2.3


From fd2cfc80d2853c27f4d0c07631849da9b8d73e85 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Sat, 22 Jan 2022 17:17:43 +0300
Subject: Change search_indexing = 10 and retries for indexing = 2

---
 config/config.exs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 3e2f0da3f..ce9338014 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -572,7 +572,7 @@ config :pleroma, Oban,
     attachments_cleanup: 1,
     new_users_digest: 1,
     mute_expire: 5,
-    search_indexing: 1
+    search_indexing: 10
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
@@ -583,7 +583,8 @@ config :pleroma, Oban,
 config :pleroma, :workers,
   retries: [
     federator_incoming: 5,
-    federator_outgoing: 5
+    federator_outgoing: 5,
+    search_indexing: 2
   ]
 
 config :pleroma, Pleroma.Formatter,
-- 
cgit v1.2.3


From a7e7db4a29a09dc2193455de696d5cda561db5d4 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 31 May 2023 13:47:15 -0400
Subject: Phoenix.Endpoint.Cowboy2Handler -> Plug.Cowboy.Handler

---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 178b6be99..6c9eb9bfc 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -133,7 +133,7 @@ config :pleroma, Pleroma.Web.Endpoint,
          {"/websocket", Phoenix.Endpoint.CowboyWebSocket,
           {Phoenix.Transports.WebSocket,
            {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
-         {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
+         {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
        ]}
     ]
   ],
-- 
cgit v1.2.3


From ffee478ed0298f2cf29d4d51ed28105119552496 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 31 May 2023 15:30:58 -0400
Subject: Move websocket config for Shoutbox to the Endpoint

This is the modern way of configuring it
---
 config/config.exs | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6c9eb9bfc..fb1903db9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -110,17 +110,6 @@ config :pleroma, :uri_schemes,
     "xmpp"
   ]
 
-websocket_config = [
-  path: "/websocket",
-  serializer: [
-    {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
-    {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
-  ],
-  timeout: 60_000,
-  transport_log: false,
-  compress: false
-]
-
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
@@ -130,9 +119,6 @@ config :pleroma, Pleroma.Web.Endpoint,
       {:_,
        [
          {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
-         {"/websocket", Phoenix.Endpoint.CowboyWebSocket,
-          {Phoenix.Transports.WebSocket,
-           {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
          {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
        ]}
     ]
-- 
cgit v1.2.3


From bf426c53b4e1c025d7857adf485976421175cdf6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 7 Nov 2023 15:11:14 -0500
Subject: Fix digest email processing, consolidate Oban queues

The email related jobs can all share a single Oban queue
---
 config/config.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index e8ae31542..ad3a98f46 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -590,7 +590,6 @@ config :pleroma, Oban,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 1,
-    new_users_digest: 1,
     mute_expire: 5
   ],
   plugins: [Oban.Plugins.Pruner],
-- 
cgit v1.2.3


From c1402af2934219b6ab5dc40a7d87a8c916554647 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 12 Nov 2023 14:49:15 +0400
Subject: B Getting: Add default implementation, delegate, prepare test
 support.

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 23489d452..5e8135a58 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -141,6 +141,8 @@ config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", priv
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
 
+config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 66cb3294ed942d461cabc32881e2a10ebfd182af Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 2 Nov 2022 22:49:55 -0400
Subject: Switch to PromEx for prometheus metrics

Recommending use of the separate HTTP server for exposing the metrics
and securing it externally on your firewall or reverse proxy. It will
listen on port 4021 by default.
---
 config/config.exs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index f2c137872..e2fc12480 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -648,12 +648,26 @@ config :pleroma, Pleroma.Emails.UserEmail,
 
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
 
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
-  enabled: false,
-  auth: false,
-  ip_whitelist: [],
-  path: "/api/pleroma/app_metrics",
-  format: :text
+config :pleroma, Pleroma.PromEx,
+  disabled: false,
+  manual_metrics_start_delay: :no_delay,
+  drop_metrics_groups: [],
+  grafana: [
+    host: System.get_env("GRAFANA_HOST", "http://localhost:3000"),
+    auth_token: System.get_env("GRAFANA_TOKEN"),
+    upload_dashboards_on_start: false,
+    folder_name: "BEAM",
+    annotate_app_lifecycle: true
+  ],
+  metrics_server: [
+    port: 4021,
+    path: "/metrics",
+    protocol: :http,
+    pool_size: 5,
+    cowboy_opts: [],
+    auth_strategy: :none
+  ],
+  datasource: "Prometheus"
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 25,
-- 
cgit v1.2.3


From a5aa8ea79603e22541de04c26293dc87bd2f2ed8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 29 Oct 2023 18:58:57 +0200
Subject: Add support for configuring a favicon and embed PWA manifest in
 server-generated-meta

---
 config/config.exs      | 3 +++
 config/description.exs | 6 ++++++
 2 files changed, 9 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index f2c137872..247e1f25a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -171,6 +171,7 @@ config :pleroma, :instance,
   short_description: "",
   background_image: "/images/city.jpg",
   instance_thumbnail: "/instance/thumbnail.jpeg",
+  favicon: "/favicon.png",
   limit: 5_000,
   description_limit: 5_000,
   remote_limit: 100_000,
@@ -346,6 +347,8 @@ config :pleroma, :manifest,
   icons: [
     %{
       src: "/static/logo.svg",
+      sizes: "144x144",
+      purpose: "any",
       type: "image/svg+xml"
     }
   ],
diff --git a/config/description.exs b/config/description.exs
index b152981c4..27e7f7e9b 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -987,6 +987,12 @@ config :pleroma, :config_description, [
           "The instance thumbnail can be any image that represents your instance and is used by some apps or services when they display information about your instance.",
         suggestions: ["/instance/thumbnail.jpeg"]
       },
+      %{
+        key: :favicon,
+        type: {:string, :image},
+        description: "Favicon of the instance",
+        suggestions: ["/favicon.png"]
+      },
       %{
         key: :show_reactions,
         type: :boolean,
-- 
cgit v1.2.3


From e5beab7f16aec4d0941dbffb5b48a3ccfa62b518 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 10 Dec 2023 17:18:18 +0400
Subject: Config/Test: Don't start promex during testing.

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 5e8135a58..86604212d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -143,6 +143,8 @@ config :phoenix, :plug_init_mode, :runtime
 
 config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
 
+config :pleroma, Pleroma.PromEx, disabled: true
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From c068a218eac02044cb5823abb1917051e1815b4f Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 10 Dec 2023 18:57:46 +0400
Subject: Backup Tests: Split out async tests, use mox.

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 86604212d..1d121e5e9 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -145,6 +145,8 @@ config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
 
 config :pleroma, Pleroma.PromEx, disabled: true
 
+config Pleroma.User.Backup, :config_impl, Pleroma.UnstubbedConfigMock
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 6e3267d1bd5494c8eec7a1b53062f1b51cebf5d6 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 10 Dec 2023 19:19:56 +0400
Subject: Tests: Fix all the tests.

---
 config/test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 1d121e5e9..5724319a2 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -145,7 +145,8 @@ config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
 
 config :pleroma, Pleroma.PromEx, disabled: true
 
-config Pleroma.User.Backup, :config_impl, Pleroma.UnstubbedConfigMock
+# Mox definitions. Only read during compile time.
+Application.put_env(Pleroma.User.Backup, :config_impl, Pleroma.UnstubbedConfigMock)
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 06fc196772a967a44593a10ceaf00396ce6b8de3 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 10 Dec 2023 19:46:25 +0400
Subject: Backup: Fix config

---
 config/test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 5724319a2..071e985dd 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -146,7 +146,7 @@ config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.PromEx, disabled: true
 
 # Mox definitions. Only read during compile time.
-Application.put_env(Pleroma.User.Backup, :config_impl, Pleroma.UnstubbedConfigMock)
+config :pleroma, Pleroma.User.Backup, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 90a47ca050c5839e8b4dc3bac315dc436d49152d Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 11 Dec 2023 09:25:05 +0400
Subject: S3 Test: Remove global state dependencies

---
 config/test.exs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 071e985dd..5dd6a2f5d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -147,6 +147,9 @@ config :pleroma, Pleroma.PromEx, disabled: true
 
 # Mox definitions. Only read during compile time.
 config :pleroma, Pleroma.User.Backup, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMock
+config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 22c4d89dbbc45169dfc325e64527e6dd30f7c422 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 12:48:55 +0400
Subject: ScheduledActivity: Use config mocking

---
 config/test.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 5dd6a2f5d..872173e70 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -150,6 +150,7 @@ config :pleroma, Pleroma.User.Backup, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMock
 config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 00def0875b2014ab18a7b159de855a3c05dd39a4 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 13:28:11 +0400
Subject: RichMediaTest: Use mocked config

---
 config/test.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 872173e70..d6d8af581 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -151,6 +151,7 @@ config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMo
 config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 190120fd7948751fc74eea3a65de19d5b7ed2753 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 14:03:46 +0400
Subject: Tests: More test fixes

---
 config/test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index d6d8af581..cf407ebf2 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -151,7 +151,7 @@ config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMo
 config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From dca41cc4a37999a6971b70ef5e0996e528b79bf5 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 15:25:52 +0400
Subject: EmailTest: use config mock

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index cf407ebf2..cdd3529c4 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -152,6 +152,8 @@ config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
+config :pleroma, Pleroma.Emails.Mailer, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.User, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From cca6c20eb6acd0f510054d1a1050d12ea2a32482 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 19:35:19 +0400
Subject: Revert "EmailTest: use config mock"

This reverts commit dca41cc4a37999a6971b70ef5e0996e528b79bf5.
---
 config/test.exs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index cdd3529c4..cf407ebf2 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -152,8 +152,6 @@ config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Emails.Mailer, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.User, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From cd3abe0b4c4cc02b69713f1882c58e82b1631710 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 28 Nov 2023 19:10:28 +0000
Subject: Fix more Logger warn -> warning

---
 config/benchmark.exs   | 2 +-
 config/description.exs | 6 +++---
 config/test.exs        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index 870ead150..e3e1118ed 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -14,7 +14,7 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, level: :warning
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 
diff --git a/config/description.exs b/config/description.exs
index 27e7f7e9b..626d826f4 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1202,7 +1202,7 @@ config :pleroma, :config_description, [
         key: :level,
         type: {:dropdown, :atom},
         description: "Log level",
-        suggestions: [:debug, :info, :warn, :error]
+        suggestions: [:debug, :info, :warning, :error]
       },
       %{
         key: :ident,
@@ -1235,7 +1235,7 @@ config :pleroma, :config_description, [
         key: :level,
         type: {:dropdown, :atom},
         description: "Log level",
-        suggestions: [:debug, :info, :warn, :error]
+        suggestions: [:debug, :info, :warning, :error]
       },
       %{
         key: :format,
@@ -1937,7 +1937,7 @@ config :pleroma, :config_description, [
         key: :log,
         type: {:dropdown, :atom},
         description: "Logs verbose mode",
-        suggestions: [false, :error, :warn, :info, :debug]
+        suggestions: [false, :error, :warning, :info, :debug]
       },
       %{
         key: :queues,
diff --git a/config/test.exs b/config/test.exs
index cf407ebf2..8a42b863a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -16,7 +16,7 @@ config :pleroma, Pleroma.Captcha,
 
 # Print only warnings and errors during test
 config :logger, :console,
-  level: :warn,
+  level: :warning,
   format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
-- 
cgit v1.2.3


From 1fc53c30773173989f63e779cec196d6d06cab3b Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 18 Jul 2023 22:28:45 +0200
Subject: config/description.exs: Remove quack

Was already removed in f40ccce7e9ad2e9f917fddd798138866c83e514a
---
 config/description.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 626d826f4..c1d1aeacc 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1187,7 +1187,7 @@ config :pleroma, :config_description, [
         type: [:atom, :tuple, :module],
         description:
           "Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog, Quack.Logger - to Slack.",
-        suggestions: [:console, {ExSyslogger, :ex_syslogger}, Quack.Logger]
+        suggestions: [:console, {ExSyslogger, :ex_syslogger}]
       }
     ]
   },
-- 
cgit v1.2.3


From 928bda2e439285ef3e662290c0cc6b782909fb82 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 20 Dec 2023 17:49:30 -0500
Subject: Fix invalid string comparison for OTP versions and replace with
 config

Old way was wrong for multiple reasons. If we do this as a config value it fixes :slave.start/3 being picked up as a compile warning on OTP26.

Also if we want to do any real clustering we'll need something like this to support OTP25 and older.
---
 config/test.exs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 8a42b863a..60cdacb0e 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -153,6 +153,15 @@ config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
 
+peer_module =
+  if String.to_integer(System.otp_release()) >= 25 do
+    :peer
+  else
+    :slave
+  end
+
+config :pleroma, Pleroma.Cluster, peer_module: peer_module
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 017e35fbf128d47c033275a70b76b72f24d7c754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 28 Dec 2023 00:15:32 +0100
Subject: Fix some more typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 config/description.exs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index c1d1aeacc..78e7710cb 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1444,7 +1444,7 @@ config :pleroma, :config_description, [
             label: "Subject line behavior",
             type: :string,
             description: "Allows changing the default behaviour of subject lines in replies.
-          `email`: copy and preprend re:, as in email,
+          `email`: copy and prepend re:, as in email,
           `masto`: copy verbatim, as in Mastodon,
           `noop`: don't copy the subject.",
             suggestions: ["email", "masto", "noop"]
@@ -3096,7 +3096,7 @@ config :pleroma, :config_description, [
               key: :max_waiting,
               type: :integer,
               description:
-                "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made",
+                "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errors when a new request is made",
               suggestions: [10]
             },
             %{
@@ -3362,7 +3362,7 @@ config :pleroma, :config_description, [
       %{
         key: :purge_after_days,
         type: :integer,
-        description: "Remove backup achives after N days",
+        description: "Remove backup archives after N days",
         suggestions: [30]
       },
       %{
-- 
cgit v1.2.3


From 1d816222e00741324fe3a068fb69f16675067a56 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 28 Dec 2023 11:15:43 -0500
Subject: Remove support for multiple federation publisher modules

This also unravels some needless indirection.
---
 config/config.exs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b884b3514..d8f9eb22e 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -192,9 +192,6 @@ config :pleroma, :instance,
   federating: true,
   federation_incoming_replies_max_depth: 100,
   federation_reachability_timeout_days: 7,
-  federation_publisher_modules: [
-    Pleroma.Web.ActivityPub.Publisher
-  ],
   allow_relay: true,
   public: true,
   quarantined_instances: [],
-- 
cgit v1.2.3


From 029aaf3d744184737666b1e553ed92d7708f1fee Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jan 2024 18:14:27 -0500
Subject: Use config to control max_restarts

---
 config/config.exs | 3 +++
 config/test.exs   | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index d8f9eb22e..27fbabc73 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -904,6 +904,9 @@ config :pleroma, Pleroma.Search.Meilisearch,
   private_key: nil,
   initial_indexing_chunk_size: 100_000
 
+config :pleroma, Pleroma.Application,
+  max_restarts: 3
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/config/test.exs b/config/test.exs
index 60cdacb0e..11e115b99 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -162,6 +162,8 @@ peer_module =
 
 config :pleroma, Pleroma.Cluster, peer_module: peer_module
 
+config :pleroma, Pleroma.Application, max_restarts: 100
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From c7eda0b24ade372e4e167ae560a2debb555a6e02 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jan 2024 18:22:49 -0500
Subject: Use config to control loading of custom modules

---
 config/config.exs | 2 ++
 config/test.exs   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 27fbabc73..c6a12a7b2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -905,6 +905,8 @@ config :pleroma, Pleroma.Search.Meilisearch,
   initial_indexing_chunk_size: 100_000
 
 config :pleroma, Pleroma.Application,
+  internal_fetch: true,
+  load_custom_modules: true,
   max_restarts: 3
 
 # Import environment specific config. This must remain at the bottom
diff --git a/config/test.exs b/config/test.exs
index 11e115b99..0a6688823 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -162,7 +162,10 @@ peer_module =
 
 config :pleroma, Pleroma.Cluster, peer_module: peer_module
 
-config :pleroma, Pleroma.Application, max_restarts: 100
+config :pleroma, Pleroma.Application,
+  internal_fetch: false,
+  load_custom_modules: false,
+  max_restarts: 100
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 4bb57d4f25bcdc90a63163ba175b6171c9ddbc33 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jan 2024 18:47:25 -0500
Subject: Use config to control background migrators

---
 config/benchmark.exs | 3 +++
 config/config.exs    | 1 +
 config/test.exs      | 1 +
 3 files changed, 5 insertions(+)

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index e3e1118ed..848344864 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -79,6 +79,9 @@ IO.puts("RUM enabled: #{rum_enabled}")
 
 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
 
+config :pleroma, Pleroma.Application,
+  background_migrators: false
+
 if File.exists?("./config/benchmark.secret.exs") do
   import_config "benchmark.secret.exs"
 else
diff --git a/config/config.exs b/config/config.exs
index c6a12a7b2..be9ddba53 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -905,6 +905,7 @@ config :pleroma, Pleroma.Search.Meilisearch,
   initial_indexing_chunk_size: 100_000
 
 config :pleroma, Pleroma.Application,
+  background_migrators: true,
   internal_fetch: true,
   load_custom_modules: true,
   max_restarts: 3
diff --git a/config/test.exs b/config/test.exs
index 0a6688823..898b0828e 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -163,6 +163,7 @@ peer_module =
 config :pleroma, Pleroma.Cluster, peer_module: peer_module
 
 config :pleroma, Pleroma.Application,
+  background_migrators: false,
   internal_fetch: false,
   load_custom_modules: false,
   max_restarts: 100
-- 
cgit v1.2.3


From 17877f612e6c655290c5dc8bdb82f4b34e8b5b9f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jan 2024 18:51:20 -0500
Subject: Use config to control streamer registry

---
 config/benchmark.exs | 3 ++-
 config/config.exs    | 3 ++-
 config/test.exs      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index 848344864..d30c95946 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -80,7 +80,8 @@ IO.puts("RUM enabled: #{rum_enabled}")
 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
 
 config :pleroma, Pleroma.Application,
-  background_migrators: false
+  background_migrators: false,
+  streamer_registry: false
 
 if File.exists?("./config/benchmark.secret.exs") do
   import_config "benchmark.secret.exs"
diff --git a/config/config.exs b/config/config.exs
index be9ddba53..7ff3aaa22 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -908,7 +908,8 @@ config :pleroma, Pleroma.Application,
   background_migrators: true,
   internal_fetch: true,
   load_custom_modules: true,
-  max_restarts: 3
+  max_restarts: 3,
+  streamer_registry: true
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
diff --git a/config/test.exs b/config/test.exs
index 898b0828e..afdb71d1d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -166,7 +166,8 @@ config :pleroma, Pleroma.Application,
   background_migrators: false,
   internal_fetch: false,
   load_custom_modules: false,
-  max_restarts: 100
+  max_restarts: 100,
+  streamer_registry: false
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 23301003717a5e154f54c14a5b8cb10ea2033e1a Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jan 2024 19:10:57 -0500
Subject: Use config to control starting all HTTP pools in test env

---
 config/test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index afdb71d1d..28d0364c6 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -167,7 +167,8 @@ config :pleroma, Pleroma.Application,
   internal_fetch: false,
   load_custom_modules: false,
   max_restarts: 100,
-  streamer_registry: false
+  streamer_registry: false,
+  test_http_pools: true
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From 653b14e1c798bbddc34821fa56f32fef9c227f01 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 21 Jan 2024 14:40:14 -0500
Subject: Use config to control Uploader callback timeout

---
 config/config.exs | 2 ++
 config/test.exs   | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 7ff3aaa22..bb17ab145 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -911,6 +911,8 @@ config :pleroma, Pleroma.Application,
   max_restarts: 3,
   streamer_registry: true
 
+config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/config/test.exs b/config/test.exs
index 28d0364c6..40e93705d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -170,6 +170,8 @@ config :pleroma, Pleroma.Application,
   streamer_registry: false,
   test_http_pools: true
 
+config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From eb4dd50f533380218bcde1a4107e2c0d38b4ec0d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 21 Jan 2024 14:57:29 -0500
Subject: Use config to control inclusion of test emoji

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 40e93705d..9d752bdf8 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -172,6 +172,8 @@ config :pleroma, Pleroma.Application,
 
 config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
 
+config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 64ad451a7b8a2ac89079a1bc32680e9cf08ef24e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 13 Feb 2024 19:21:45 -0500
Subject: Websocket refactor to use Phoenix.Socket.Transport

This will make us compatible with Cowboy and Bandit
---
 config/config.exs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index bb17ab145..435387a64 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -114,14 +114,7 @@ config :pleroma, :uri_schemes,
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
   http: [
-    ip: {127, 0, 0, 1},
-    dispatch: [
-      {:_,
-       [
-         {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
-         {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
-       ]}
-    ]
+    ip: {127, 0, 0, 1}
   ],
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
-- 
cgit v1.2.3


From 202721e80c3dbd1aa5607d86ba8f86f7c95efdf1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 15 Feb 2024 09:46:08 -0500
Subject: Remove Cowboy-specific HTTP options

These were only used in dev and served no specific purpose. The equivalent settings for Bandit are under a key called :http1_options and the default values are set to 10_000.
---
 config/dev.exs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/dev.exs b/config/dev.exs
index ab3e83c12..fe8de5045 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -8,8 +8,7 @@ import Config
 # with brunch.io to recompile .js and .css sources.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [
-    port: 4000,
-    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
+    port: 4000
   ],
   protocol: "http",
   debug_errors: true,
-- 
cgit v1.2.3


From acb9e46074346ad28ad6444a170bdd5e00c74910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 27 Feb 2024 13:25:26 +0100
Subject: Add some missing fields to instanceV2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 config/description.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 78e7710cb..6c13bde31 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -566,6 +566,14 @@ config :pleroma, :config_description, [
           "Cool instance"
         ]
       },
+      %{
+        key: :status_page,
+        type: :string,
+        description: "A page where people can see the status of the server during an outage",
+        suggestions: [
+          "https://status.pleroma.example.org"
+        ]
+      },
       %{
         key: :limit,
         type: :integer,
-- 
cgit v1.2.3