From 718e8e1edb537aca984216be39b3be5c8af4e6da Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 16 May 2021 21:39:58 -0500
Subject: Create NsfwApiPolicy

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 66aee3264..d96dc1646 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -404,6 +404,13 @@ config :pleroma, :mrf_object_age,
   threshold: 604_800,
   actions: [:delist, :strip_followers]
 
+config :pleroma, :mrf_nsfw_api,
+  url: "http://127.0.0.1:5000/",
+  threshold: 0.7,
+  mark_sensitive: true,
+  unlist: false,
+  reject: false
+
 config :pleroma, :rich_media,
   enabled: true,
   ignore_hosts: [],
-- 
cgit v1.2.3


From fa2a6d5d6b24657ddbda4ef11d2e6dbcb59545d3 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <penguyman@stronzi.org>
Date: Thu, 7 Apr 2022 18:25:02 +0200
Subject: feat: simple, but not stupid, uploader for IPFS

fix: format fix with credo
---
 config/config.exs      |  4 ++++
 config/description.exs | 24 ++++++++++++++++++++++++
 config/dev.exs         |  4 ++++
 3 files changed, 32 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6a5acda09..7efad0061 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -82,6 +82,10 @@ config :ex_aws, :s3,
   # region: "us-east-1", # may be required for Amazon AWS
   scheme: "https://"
 
+config :pleroma, Pleroma.Uploaders.IPFS,
+  post_gateway_url: nil,
+  get_gateway_url: nil
+
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   pack_extensions: [".png", ".gif"],
diff --git a/config/description.exs b/config/description.exs
index 7caad18b4..d87bbb9b8 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -136,6 +136,30 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: Pleroma.Uploaders.IPFS,
+    type: :group,
+    description: "IPFS uploader-related settings",
+    children: [
+      %{
+        key: :get_gateway_url,
+        type: :string,
+        description: "GET Gateway URL",
+        suggestions: [
+          "get_gateway_url"
+        ]
+      },
+      %{
+        key: :post_gateway_url,
+        type: :string,
+        description: "POST Gateway URL",
+        suggestions: [
+          "post_gateway_url"
+        ]
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: Pleroma.Uploaders.S3,
diff --git a/config/dev.exs b/config/dev.exs
index ab3e83c12..89a84bf05 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -58,6 +58,10 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
 
+config :pleroma, Pleroma.Uploaders.IPFS,
+  post_gateway_url: nil,
+  get_gateway_url: nil
+
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else
-- 
cgit v1.2.3


From 43dfa58ebda407a0813d398bee8d0ae3e5c9fd5b Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <penguyman@stronzi.org>
Date: Mon, 11 Apr 2022 15:10:01 +0200
Subject: added tests for ipfs uploader. adapted changelog.md accordingly.
 improved ipfs uploader with external suggestions

fix lint description.exs
---
 config/description.exs | 5 +++--
 config/dev.exs         | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index d87bbb9b8..1fe5f01f0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -147,7 +147,8 @@ config :pleroma, :config_description, [
         type: :string,
         description: "GET Gateway URL",
         suggestions: [
-          "get_gateway_url"
+          "https://ipfs.mydomain.com/<%= cid %>",
+          "https://<%= cid %>.ipfs.mydomain.com/"
         ]
       },
       %{
@@ -155,7 +156,7 @@ config :pleroma, :config_description, [
         type: :string,
         description: "POST Gateway URL",
         suggestions: [
-          "post_gateway_url"
+          "http://localhost:5001/"
         ]
       }
     ]
diff --git a/config/dev.exs b/config/dev.exs
index 89a84bf05..ab3e83c12 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -58,10 +58,6 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
 
-config :pleroma, Pleroma.Uploaders.IPFS,
-  post_gateway_url: nil,
-  get_gateway_url: nil
-
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else
-- 
cgit v1.2.3


From 44659ecd65fb2251f9130fcecf1732b8931104c1 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <penguyman@stronzi.org>
Date: Sat, 16 Apr 2022 09:38:49 +0200
Subject: ipfs: revert to String.replace for cid placeholder

ipfs: fix lint
---
 config/description.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 1fe5f01f0..b180e7308 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -147,8 +147,8 @@ config :pleroma, :config_description, [
         type: :string,
         description: "GET Gateway URL",
         suggestions: [
-          "https://ipfs.mydomain.com/<%= cid %>",
-          "https://<%= cid %>.ipfs.mydomain.com/"
+          "https://ipfs.mydomain.com/{CID}",
+          "https://{CID}.ipfs.mydomain.com/"
         ]
       },
       %{
-- 
cgit v1.2.3


From c899af1d6acad1895240a0247e9b91eca5db08df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 14 Apr 2022 20:09:43 +0200
Subject: Reject requests from specified instances if `authorized_fetch_mode`
 is enabled
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/config.exs      |  1 +
 config/description.exs | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0fc959807..cfa16f766 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -216,6 +216,7 @@ config :pleroma, :instance,
   allow_relay: true,
   public: true,
   quarantined_instances: [],
+  rejected_instances: [],
   static_dir: "instance/static/",
   allowed_post_formats: [
     "text/plain",
diff --git a/config/description.exs b/config/description.exs
index b29348edf..a75f40929 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -714,6 +714,18 @@ config :pleroma, :config_description, [
           {"*.quarantined.com", "Reason"}
         ]
       },
+      %{
+        key: :rejected_instances,
+        type: {:list, :tuple},
+        key_placeholder: "instance",
+        value_placeholder: "reason",
+        description:
+          "List of ActivityPub instances to reject requests from if authorized_fetch_mode is enabled",
+        suggestions: [
+          {"rejected.com", "Reason"},
+          {"*.rejected.com", "Reason"}
+        ]
+      },
       %{
         key: :static_dir,
         type: :string,
-- 
cgit v1.2.3


From 086ba59d0346be870dc7df2660fbb55666bf0af7 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 16 Dec 2023 18:56:46 +0100
Subject: HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index b152981c4..2fed1a152 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1771,6 +1771,12 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Require HTTP signatures for AP fetches"
       },
+      %{
+        key: :authorized_fetch_mode_exceptions,
+        type: {:list, :string},
+        description:
+          "List of IPs (CIDR format accepted) to exempt from HTTP Signatures requirement (for example to allow debugging, you shouldn't otherwise need this)"
+      },
       %{
         key: :note_replies_output_limit,
         type: :integer,
-- 
cgit v1.2.3


From 7dfd148ff8a4f2d349d6d6f92d788effdaab36f3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 9 Dec 2023 18:32:26 -0500
Subject: Logger metadata for inbound federation requests

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 32c8509be..537517688 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -131,13 +131,13 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
-  metadata: [:request_id]
+  metadata: [:actor, :request_id, :type]
 
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "pleroma",
   format: "$metadata[$level] $message",
-  metadata: [:request_id]
+  metadata: [:actor, :request_id, :type]
 
 config :mime, :types, %{
   "application/xml" => ["xml"],
-- 
cgit v1.2.3


From 40823462e7779fb79a4fcd458daa5e7095a6030b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 17 Dec 2023 18:20:22 -0500
Subject: Logger metadata for request path and authenticated user

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 537517688..83e7a33e3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -131,13 +131,13 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
-  metadata: [:actor, :request_id, :type]
+  metadata: [:actor, :path, :request_id, :type, :user]
 
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "pleroma",
   format: "$metadata[$level] $message",
-  metadata: [:actor, :request_id, :type]
+  metadata: [:actor, :path, :request_id, :type, :user]
 
 config :mime, :types, %{
   "application/xml" => ["xml"],
-- 
cgit v1.2.3


From 99cee755d8798c0743b96fb11e55f283f0195b85 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 17 Dec 2023 18:20:34 -0500
Subject: Show Logger metadata in dev

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

(limited to 'config')

diff --git a/config/dev.exs b/config/dev.exs
index fe8de5045..f23719fe3 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -35,8 +35,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 # configured to run both http and https servers on
 # different ports.
 
-# Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n"
+# Do not include timestamps in development logs
+config :logger, :console, format: "$metadata[$level] $message\n"
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.
-- 
cgit v1.2.3


From 462d5aa5cbe3194bad56a7c973e9b200742ef6ca Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 19 Mar 2024 20:53:40 -0400
Subject: logger: remove request_id metadata which is not useful

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 83e7a33e3..383eb3768 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -131,13 +131,13 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
-  metadata: [:actor, :path, :request_id, :type, :user]
+  metadata: [:actor, :path, :type, :user]
 
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "pleroma",
   format: "$metadata[$level] $message",
-  metadata: [:actor, :path, :request_id, :type, :user]
+  metadata: [:actor, :path, :type, :user]
 
 config :mime, :types, %{
   "application/xml" => ["xml"],
-- 
cgit v1.2.3


From cd7e2138d11901fc7a0c8c2f22b7a5d57383a555 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 14 May 2024 14:13:37 +0400
Subject: Search: Basic Qdrant/Ollama search

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b69044a2b..f74eda6b2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -915,6 +915,15 @@ config :pleroma, Pleroma.Application,
 
 config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000
 
+config :pleroma, Pleroma.Search.QdrantSearch,
+  qdrant_url: "http://127.0.0.1:6333/",
+  qdrant_api_key: nil,
+  ollama_url: "http://127.0.0.1:11434",
+  ollama_model: "snowflake-arctic-embed:xs",
+  qdrant_index_configuration: %{
+    vectors: %{size: 384, distance: "Cosine"}
+  }
+
 # 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"
-- 
cgit v1.2.3


From 72ec261a69a7dda7ab95667e425824ab7758b636 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 19 May 2024 12:17:46 +0400
Subject: B QdrantSearch: Switch to OpenAI api

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index f74eda6b2..dd0150c66 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -917,9 +917,10 @@ config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000
 
 config :pleroma, Pleroma.Search.QdrantSearch,
   qdrant_url: "http://127.0.0.1:6333/",
-  qdrant_api_key: nil,
-  ollama_url: "http://127.0.0.1:11434",
-  ollama_model: "snowflake-arctic-embed:xs",
+  qdrant_api_key: "",
+  openai_url: "http://127.0.0.1:11345",
+  openai_model: "snowflake",
+  openai_api_key: "",
   qdrant_index_configuration: %{
     vectors: %{size: 384, distance: "Cosine"}
   }
-- 
cgit v1.2.3


From c139a9f38c06ab4485b98b56b9ad4cce4d57be12 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 19 May 2024 12:39:54 +0400
Subject: B Config: Set default Qdrant embedder to our fastembed-api server

---
 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 dd0150c66..c3b20947d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -919,7 +919,7 @@ config :pleroma, Pleroma.Search.QdrantSearch,
   qdrant_url: "http://127.0.0.1:6333/",
   qdrant_api_key: "",
   openai_url: "http://127.0.0.1:11345",
-  openai_model: "snowflake",
+  openai_model: "snowflake/snowflake-arctic-embed-xs",
   openai_api_key: "",
   qdrant_index_configuration: %{
     vectors: %{size: 384, distance: "Cosine"}
-- 
cgit v1.2.3


From 61a3b793165e92d6f23a2e59fb9b95e06737cf25 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 25 May 2024 14:20:47 -0400
Subject: Search backend healthcheck process

---
 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 b69044a2b..8b9a588b7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -579,7 +579,7 @@ config :pleroma, Oban,
     attachments_cleanup: 1,
     new_users_digest: 1,
     mute_expire: 5,
-    search_indexing: 10,
+    search_indexing: [limit: 10, paused: true],
     rich_media_expiration: 2
   ],
   plugins: [Oban.Plugins.Pruner],
-- 
cgit v1.2.3


From f4c04e6b2dce6d75d148ca520aaef27005ecaa82 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 May 2024 14:21:55 +0400
Subject: QdrantSearch: Add health checks.

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index d891a5218..f388dfe52 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -919,6 +919,9 @@ config :pleroma, Pleroma.Search.QdrantSearch,
   qdrant_url: "http://127.0.0.1:6333/",
   qdrant_api_key: "",
   openai_url: "http://127.0.0.1:11345",
+  # The healthcheck url has to be set to nil when used with the real openai
+  # API, as it doesn't have a healthcheck endpoint.
+  openai_healthcheck_url: "http://127.0.0.1:11345/health",
   openai_model: "snowflake/snowflake-arctic-embed-xs",
   openai_api_key: "",
   qdrant_index_configuration: %{
-- 
cgit v1.2.3


From 3055c1598b43ee9460b88880e2752c68e9cf6edb Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 May 2024 17:22:18 +0400
Subject: IPFSTest: Fix configuration mocking

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 9b4113dd5..3345bb3a9 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -153,6 +153,7 @@ 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.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock
 
 peer_module =
   if String.to_integer(System.otp_release()) >= 25 do
-- 
cgit v1.2.3


From a50c657427a2dfe9d48c25529a179fe634d30e48 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 11:17:02 -0400
Subject: Add a dedicated connection pool for Rich Media

Sharing this pool with regular Media is problematic as Rich Media will connect to many different
domains and thrash the pool, but regular Media will have predictable connections to the webservers
hosting media for the fediverse servers you peer with.
---
 config/config.exs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 8b9a588b7..b8030651f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -827,6 +827,11 @@ config :pleroma, :pools,
     max_waiting: 20,
     recv_timeout: 15_000
   ],
+  rich_media: [
+    size: 25,
+    max_waiting: 20,
+     recv_timeout: 15_000
+   ],
   upload: [
     size: 25,
     max_waiting: 5,
@@ -847,6 +852,10 @@ config :pleroma, :hackney_pools,
     max_connections: 50,
     timeout: 150_000
   ],
+  rich_media: [
+    max_connections: 50,
+    timeout: 150_000
+  ],
   upload: [
     max_connections: 25,
     timeout: 300_000
-- 
cgit v1.2.3


From 6708f154a4f7ad46b4637d4d566b8cf81e3ebb7b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 11:18:58 -0400
Subject: Rework Gun connection pool sizes to make better use of the default
 250 connections

---
 config/config.exs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b8030651f..a025defeb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -818,27 +818,27 @@ config :pleroma, :connections_pool,
 
 config :pleroma, :pools,
   federation: [
-    size: 50,
-    max_waiting: 10,
+    size: 75,
+    max_waiting: 20,
     recv_timeout: 10_000
   ],
   media: [
-    size: 50,
+    size: 75,
     max_waiting: 20,
     recv_timeout: 15_000
   ],
   rich_media: [
     size: 25,
     max_waiting: 20,
-     recv_timeout: 15_000
-   ],
+    recv_timeout: 15_000
+  ],
   upload: [
     size: 25,
-    max_waiting: 5,
+    max_waiting: 20,
     recv_timeout: 15_000
   ],
   default: [
-    size: 10,
+    size: 50,
     max_waiting: 2,
     recv_timeout: 5_000
   ]
-- 
cgit v1.2.3


From 0bddca361d12f347ca9907c5ddb5d1464a17b32a Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 24 Jan 2021 14:56:45 -0600
Subject: DNSRBL in an MRF

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b93de52e1..1fb0f3911 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -410,6 +410,11 @@ config :pleroma, :mrf_vocabulary,
   accept: [],
   reject: []
 
+config :pleroma, :mrf_dnsrbl,
+  nameserver: "127.0.0.1",
+  port: 53,
+  zone: "bl.pleroma.com"
+
 # threshold of 7 days
 config :pleroma, :mrf_object_age,
   threshold: 604_800,
-- 
cgit v1.2.3


From cab6372d7a1bdf50436eff1b4023fd6e05586dbc Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 12:31:29 -0400
Subject: Make user age limit configurable

Switch to milliseconds for consistency with other configuration options in codebase
---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b93de52e1..51773d830 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -430,6 +430,8 @@ config :pleroma, :mrf_force_mention,
   mention_parent: true,
   mention_quoted: true
 
+config :pleroma, :mrf_antimentionspam, user_age_limit: 30_000
+
 config :pleroma, :rich_media,
   enabled: true,
   ignore_hosts: [],
-- 
cgit v1.2.3


From 1c699144d23aa4a86ff8b6ebef7d760ce9e3a4e2 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 May 2024 21:26:40 +0400
Subject: HttpSecurityPlug: Don't allow unsafe-eval by default

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4752bbbde..f861daf04 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -519,7 +519,8 @@ config :pleroma, :http_security,
   sts: false,
   sts_max_age: 31_536_000,
   ct_max_age: 2_592_000,
-  referrer_policy: "same-origin"
+  referrer_policy: "same-origin",
+  allow_unsafe_eval: false
 
 config :cors_plug,
   max_age: 86_400,
diff --git a/config/test.exs b/config/test.exs
index 3345bb3a9..b5c9c6e4a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -154,6 +154,7 @@ 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.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.UnstubbedConfigMock
 
 peer_module =
   if String.to_integer(System.otp_release()) >= 25 do
-- 
cgit v1.2.3


From 0847d9ebafa38007aeef0a6677588211994ab546 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 27 May 2024 14:35:30 +0000
Subject: Oban queue simplification

---
 config/config.exs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b93de52e1..b52021373 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -574,24 +574,14 @@ config :pleroma, Oban,
   log: false,
   queues: [
     activity_expiration: 10,
-    token_expiration: 5,
-    filter_expiration: 1,
-    backup: 1,
     federator_incoming: 5,
     federator_outgoing: 5,
     ingestion_queue: 50,
     web_push: 50,
-    mailer: 10,
     transmogrifier: 20,
-    scheduled_activities: 10,
-    poll_notifications: 10,
     background: 5,
-    remote_fetcher: 2,
-    attachments_cleanup: 1,
-    new_users_digest: 1,
-    mute_expire: 5,
     search_indexing: [limit: 10, paused: true],
-    rich_media_expiration: 2
+    slow: 1
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
-- 
cgit v1.2.3


From 6b8c15a4a1fdbc2a2a4ef194d9519e717470c632 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 14:11:42 -0400
Subject: Remove MediaProxyWarmingPolicy config for ConcurrentLimiter as we are
 not using it

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a025defeb..3c35f439a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -902,7 +902,6 @@ 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: 30, max_waiting: 50]}
 ]
 
-- 
cgit v1.2.3


From ba511a30b923cc9248686702f75a4041d69c7bee Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 14:12:38 -0400
Subject: RichMedia use of ConcurrentLimiter was removed in the refactor

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 3c35f439a..e7e751d8a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -901,7 +901,6 @@ config :pleroma, Pleroma.User.Backup,
   process_chunk_size: 100
 
 config :pleroma, ConcurrentLimiter, [
-  {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
   {Pleroma.Search, [max_running: 30, max_waiting: 50]}
 ]
 
-- 
cgit v1.2.3


From 81e44ced0c7251b5a6b585f297e1e00fad08c6d1 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 May 2024 22:13:20 +0400
Subject: HTTPSecurityPlug: Fix tests

---
 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 b5c9c6e4a..6c88ad3c6 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -154,7 +154,7 @@ 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.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.UnstubbedConfigMock
+config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
 
 peer_module =
   if String.to_integer(System.otp_release()) >= 25 do
-- 
cgit v1.2.3


From f5978da67633110acbc6494ff6f07b3f07424779 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Tue, 28 May 2024 14:00:25 +0400
Subject: HTTPSignaturePlugTest: Rewrite to use mox.

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 6c88ad3c6..0d4c82e0e 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -155,6 +155,10 @@ config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfig
 config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
 config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
+config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
+
+config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug,
+  http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
 
 peer_module =
   if String.to_integer(System.otp_release()) >= 25 do
-- 
cgit v1.2.3


From cfc8d7aade526b8f119683984977064cd3cd3d87 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 28 May 2024 13:14:34 -0400
Subject: IPFS uploader: dialyzer fixes

lib/pleroma/uploaders/ipfs.ex:43:no_return
Function put_file/1 has no local return.
________________________________________________________________________________
lib/pleroma/uploaders/ipfs.ex:49:call
The function call will not succeed.

Pleroma.HTTP.post(
  binary(),
  _mp :: %Tesla.Multipart{
    :boundary => binary(),
    :content_type_params => [binary()],
    :parts => [
      %Tesla.Multipart.Part{
        :body => binary(),
        :dispositions => [any()],
        :headers => [any()]
      },
      ...
    ]
  },
  [],
  [{:params, [{:"cid-version", <<49>>}]}]
)

will never return since the success typing is:
(binary(), binary(), [{binary(), binary()}], Keyword.t()) ::
  {:error, _}
  | {:ok,
     %Tesla.Env{
       :__client__ => %Tesla.Client{
         :adapter => nil | {_, _} | {_, _, _},
         :fun => _,
         :post => [any()],
         :pre => [any()]
       },
       :__module__ => atom(),
       :body => _,
       :headers => [{_, _}],
       :method => :delete | :get | :head | :options | :patch | :post | :put | :trace,
       :opts => [{_, _}],
       :query => [{_, _}],
       :status => nil | integer(),
       :url => binary()
     }}

and the contract is
(Pleroma.HTTP.Request.url(), String.t(), Pleroma.HTTP.Request.headers(), :elixir.keyword()) ::
  {:ok, Tesla.Env.t()} | {:error, any()}
---
 config/config.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index c3b8ae0b7..a40ed28af 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -83,8 +83,8 @@ config :ex_aws, :s3,
   scheme: "https://"
 
 config :pleroma, Pleroma.Uploaders.IPFS,
-  post_gateway_url: nil,
-  get_gateway_url: nil
+  post_gateway_url: "http://localhost:5001",
+  get_gateway_url: "http://localhost:8080"
 
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
-- 
cgit v1.2.3


From c389ea0f42bf01bbc463e9e237162aab3dabf7a7 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 24 Dec 2023 10:45:29 +0100
Subject: Fix compatibility with Loggers in Elixir 1.15+

---
 config/config.exs      | 2 ++
 config/description.exs | 6 +++---
 config/dev.exs         | 2 +-
 config/prod.exs        | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a40ed28af..b0507918b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -132,6 +132,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   ]
 
 # Configures Elixir's Logger
+config :logger, backends: [:console]
+
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
diff --git a/config/description.exs b/config/description.exs
index 12beec842..9780b35a7 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1237,8 +1237,8 @@ config :pleroma, :config_description, [
         key: :backends,
         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}]
+          "Where logs will be sent, Logger.Backends.Console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog.",
+        suggestions: [Logger.Backends.Console, {ExSyslogger, :ex_syslogger}]
       }
     ]
   },
@@ -1278,7 +1278,7 @@ config :pleroma, :config_description, [
   %{
     group: :logger,
     type: :group,
-    key: :console,
+    key: Logger.Backends.Console,
     label: "Console Logger",
     description: "Console logger settings",
     children: [
diff --git a/config/dev.exs b/config/dev.exs
index f23719fe3..14cf4a6dc 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -36,7 +36,7 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 # different ports.
 
 # Do not include timestamps in development logs
-config :logger, :console, format: "$metadata[$level] $message\n"
+config :logger, Logger.Backends.Console, format: "$metadata[$level] $message\n"
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.
diff --git a/config/prod.exs b/config/prod.exs
index 968f596e0..f4a12c077 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -20,7 +20,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, :console, level: :info
+config :logger, Logger.Backends.Console, level: :info
 config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
-- 
cgit v1.2.3


From 41434ffcec47510de86cd9b06eb32521b897a1c9 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Thu, 6 Jun 2024 19:14:38 +0400
Subject: Tests: Don't spawn processes in tests.

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 0d4c82e0e..06cd5da89 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -177,6 +177,12 @@ config :pleroma, Pleroma.Application,
   streamer_registry: false,
   test_http_pools: true
 
+config :pleroma, Pleroma.Web.Streaming,
+  sync_streaming: true
+
+config :pleroma, Pleroma.Web.MastodonAPI.StatusView,
+  sync_fetching: true
+
 config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
 
 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
-- 
cgit v1.2.3


From a734efeff8f4ea9ea909b04abe7ddd5e7a041761 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 12 Jun 2024 15:21:43 -0400
Subject: Formatting

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 06cd5da89..b4b884eab 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -177,11 +177,9 @@ config :pleroma, Pleroma.Application,
   streamer_registry: false,
   test_http_pools: true
 
-config :pleroma, Pleroma.Web.Streaming,
-  sync_streaming: true
+config :pleroma, Pleroma.Web.Streaming, sync_streaming: true
 
-config :pleroma, Pleroma.Web.MastodonAPI.StatusView,
-  sync_fetching: true
+config :pleroma, Pleroma.Web.MastodonAPI.StatusView, sync_fetching: true
 
 config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
 
-- 
cgit v1.2.3


From e628d00a81ce18eaa54c6efb1e48a31d57216368 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 18 Jun 2024 15:25:17 +0000
Subject: Disable Ecto logging in tests

The debug logs are very noisy and can be enabled during analysis of a specific error believed to be SQL-related
---
 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 b4b884eab..9afb2763a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -49,7 +49,8 @@ config :pleroma, Pleroma.Repo,
   hostname: System.get_env("DB_HOST") || "localhost",
   port: System.get_env("DB_PORT") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox,
-  pool_size: System.schedulers_online() * 2
+  pool_size: System.schedulers_online() * 2,
+  log: false
 
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
-- 
cgit v1.2.3


From 85b81cc933c94d8e234d3f5a81ce26b51dd8056f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 19 Jun 2024 10:31:56 -0400
Subject: Remove Logger from ConfigDB descriptions

---
 config/description.exs | 73 --------------------------------------------------
 1 file changed, 73 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 9780b35a7..b7d86dc63 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1228,79 +1228,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :logger,
-    type: :group,
-    description: "Logger-related settings",
-    children: [
-      %{
-        key: :backends,
-        type: [:atom, :tuple, :module],
-        description:
-          "Where logs will be sent, Logger.Backends.Console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog.",
-        suggestions: [Logger.Backends.Console, {ExSyslogger, :ex_syslogger}]
-      }
-    ]
-  },
-  %{
-    group: :logger,
-    type: :group,
-    key: :ex_syslogger,
-    label: "ExSyslogger",
-    description: "ExSyslogger-related settings",
-    children: [
-      %{
-        key: :level,
-        type: {:dropdown, :atom},
-        description: "Log level",
-        suggestions: [:debug, :info, :warning, :error]
-      },
-      %{
-        key: :ident,
-        type: :string,
-        description:
-          "A string that's prepended to every message, and is typically set to the app name",
-        suggestions: ["pleroma"]
-      },
-      %{
-        key: :format,
-        type: :string,
-        description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"",
-        suggestions: ["$metadata[$level] $message"]
-      },
-      %{
-        key: :metadata,
-        type: {:list, :atom},
-        suggestions: [:request_id]
-      }
-    ]
-  },
-  %{
-    group: :logger,
-    type: :group,
-    key: Logger.Backends.Console,
-    label: "Console Logger",
-    description: "Console logger settings",
-    children: [
-      %{
-        key: :level,
-        type: {:dropdown, :atom},
-        description: "Log level",
-        suggestions: [:debug, :info, :warning, :error]
-      },
-      %{
-        key: :format,
-        type: :string,
-        description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"",
-        suggestions: ["$metadata[$level] $message"]
-      },
-      %{
-        key: :metadata,
-        type: {:list, :atom},
-        suggestions: [:request_id]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :frontend_configurations,
-- 
cgit v1.2.3


From 17d04ccc8bcf3f0e033ff4333c6153edf904d4f8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 19 Jun 2024 23:18:38 -0400
Subject: RichMedia backfill processing through Oban

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 9afb2763a..1e8168548 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -180,8 +180,6 @@ config :pleroma, Pleroma.Application,
 
 config :pleroma, Pleroma.Web.Streaming, sync_streaming: true
 
-config :pleroma, Pleroma.Web.MastodonAPI.StatusView, sync_fetching: true
-
 config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
 
 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
-- 
cgit v1.2.3


From e1e099d3bff122a28cfd0c5c340d672050929051 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 19 Jun 2024 23:25:25 -0400
Subject: Set console logs to :info for Elixir 1.15+

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

(limited to 'config')

diff --git a/config/prod.exs b/config/prod.exs
index f4a12c077..2d252bf02 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -21,6 +21,7 @@ config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
 config :logger, Logger.Backends.Console, level: :info
+config :logger, :console, level: :info
 config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
-- 
cgit v1.2.3


From b135fa35a1e6258dbe1a07438213ce2593d86bc2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 24 Jun 2024 09:46:55 -0400
Subject: RichMedia: test that activity is streamed out

---
 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 1e8168548..410b9bbab 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -184,7 +184,8 @@ config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
 
 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
 
-config :pleroma, Pleroma.Web.RichMedia.Backfill, provider: Pleroma.Web.RichMedia.Backfill
+config :pleroma, Pleroma.Web.RichMedia.Backfill,
+  stream_out: Pleroma.Web.ActivityPub.ActivityPubMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From d790df73f68fb8459d11a68dd92b0951386862bd Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 12 Jul 2024 10:12:18 -0400
Subject: Remove the unused ingestion queue

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b0507918b..dd333212c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -587,7 +587,6 @@ config :pleroma, Oban,
     activity_expiration: 10,
     federator_incoming: 5,
     federator_outgoing: 5,
-    ingestion_queue: 50,
     web_push: 50,
     transmogrifier: 20,
     background: 5,
-- 
cgit v1.2.3


From 52b6dd8bff6a17a75d8a3122cd599c0195a3df8d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 15 Jul 2024 10:28:55 -0400
Subject: Increase background job concurrency to 20

---
 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 dd333212c..040c48050 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -589,7 +589,7 @@ config :pleroma, Oban,
     federator_outgoing: 5,
     web_push: 50,
     transmogrifier: 20,
-    background: 5,
+    background: 20,
     search_indexing: [limit: 10, paused: true],
     slow: 1
   ],
-- 
cgit v1.2.3


From 80e16de3bdf447aebd58037bb0a2c7a605e3c38e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 15 Jul 2024 12:00:58 -0400
Subject: Increase slow job queue parallelization

---
 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 040c48050..044f951f6 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -591,7 +591,7 @@ config :pleroma, Oban,
     transmogrifier: 20,
     background: 20,
     search_indexing: [limit: 10, paused: true],
-    slow: 1
+    slow: 5
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
-- 
cgit v1.2.3


From 2ee8f4f0629b950349409d69395015369c45b633 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 23 Jul 2024 09:43:41 -0400
Subject: Fix dialyzer error

lib/pleroma/application.ex:1:pattern_match The pattern can never match the type true.
---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 410b9bbab..5d9541f43 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -187,6 +187,8 @@ config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
 config :pleroma, Pleroma.Web.RichMedia.Backfill,
   stream_out: Pleroma.Web.ActivityPub.ActivityPubMock
 
+config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, enable: false
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 731f7b87d24bd58d5349c7d1f564cd73dbf59aa9 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 24 Jul 2024 15:42:50 -0400
Subject: Pad RichMediaWorker timeout to be 2s longer than the Rich Media HTTP
 timeout

---
 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 044f951f6..a370405e0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -448,7 +448,7 @@ config :pleroma, :rich_media,
     Pleroma.Web.RichMedia.Parsers.TwitterCard,
     Pleroma.Web.RichMedia.Parsers.OEmbed
   ],
-  failure_backoff: 60_000,
+  timeout: 5_000,
   ttl_setters: [
     Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl,
     Pleroma.Web.RichMedia.Parser.TTL.Opengraph
-- 
cgit v1.2.3


From 8c5a68a62e0c6615783d1c3bab549a185a650fd6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 24 Jul 2024 15:52:23 -0400
Subject: Increase Oban.Pruner max_age to 15 mins

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a370405e0..30626d4a1 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -580,6 +580,8 @@ config :pleroma, Pleroma.User,
   ],
   email_blacklist: []
 
+# The Pruner :max_age must be longer than Worker :unique
+# value or it cannot enforce uniqueness.
 config :pleroma, Oban,
   repo: Pleroma.Repo,
   log: false,
@@ -593,7 +595,7 @@ config :pleroma, Oban,
     search_indexing: [limit: 10, paused: true],
     slow: 5
   ],
-  plugins: [Oban.Plugins.Pruner],
+  plugins: [{Oban.Plugins.Pruner, max_age: 900}],
   crontab: [
     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
     {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
-- 
cgit v1.2.3


From 659891921371fd3a8788089fbc96a9158f07f289 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 24 Jul 2024 16:16:37 -0400
Subject: Document the new timeout setting

---
 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 b7d86dc63..10a6e9cdf 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2101,11 +2101,11 @@ config :pleroma, :config_description, [
         ]
       },
       %{
-        key: :failure_backoff,
+        key: :timeout,
         type: :integer,
         description:
-          "Amount of milliseconds after request failure, during which the request will not be retried.",
-        suggestions: [60_000]
+          "Amount of milliseconds after which the HTTP request is forcibly terminated.",
+        suggestions: [5_000]
       }
     ]
   },
-- 
cgit v1.2.3


From 1b9c887dbb8d87814f8d9cc11cfcbc8802348b22 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 25 Jul 2024 12:54:27 -0400
Subject: Extract validate_signature/2 from the HTTPSignaturePlug

This logic only exists in the Plug, so attempting to validate the signature by calling the library function HTTPSignature.validate_conn/2 directly will never work because we do not attempt to construct the (request-target) and @request-target headers with both the commonly misinterpreted and correct implementation of this field. Therefore all attempts to validate a signature from an Oban Job will fail.
---
 config/test.exs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 5d9541f43..8a5694054 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -158,8 +158,7 @@ config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMoc
 config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
 config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
 
-config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug,
-  http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
+config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
 
 peer_module =
   if String.to_integer(System.otp_release()) >= 25 do
-- 
cgit v1.2.3