From a72f9cff232c6afd7aff8ab41b21d82779d8a086 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:03:54 +0200
Subject: [PATCH 001/163] Elixir 1.19: Fix typing violation on struct updates
 in Pleroma.Marker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    warning: a struct for Pleroma.Marker is expected on struct update:

        %Pleroma.Marker{marker | user: user}

    but got type:

        dynamic()

    where "marker" was given the type:

        # type: dynamic()
        # from: lib/pleroma/marker.ex
        {:ok, marker}

    when defining the variable "marker", you must also pattern match on "%Pleroma.Marker{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 81 │       {:ok, marker} -> %__MODULE__{marker | user: user}
    │                        ~
    │
    └─ lib/pleroma/marker.ex:81:24: Pleroma.Marker.get_marker/2
---
 lib/pleroma/marker.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/marker.ex b/lib/pleroma/marker.ex
index 68b054e4d..4f645240e 100644
--- a/lib/pleroma/marker.ex
+++ b/lib/pleroma/marker.ex
@@ -78,7 +78,7 @@ defmodule Pleroma.Marker do
 
   defp get_marker(user, timeline) do
     case Repo.find_resource(get_query(user, timeline)) do
-      {:ok, marker} -> %__MODULE__{marker | user: user}
+      {:ok, %__MODULE__{} = marker} -> %__MODULE__{marker | user: user}
       _ -> %__MODULE__{timeline: timeline, user_id: user.id}
     end
   end

From 0fc046a75e0499a068cbdee82f9c559407a7521b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:06:02 +0200
Subject: [PATCH 002/163] Elixir 1.19: Fix typing violation on struct updates
 in MFA.Changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    warning: a struct for Pleroma.MFA.Settings is expected on struct update:

        %Pleroma.MFA.Settings{settings | enabled: false}

    but got type:

        dynamic()

    where "settings" was given the type:

        # type: dynamic()
        # from: lib/pleroma/mfa/changeset.ex:11:14
        settings = Pleroma.MFA.fetch_settings(Ecto.Changeset.apply_changes(changeset))

    when defining the variable "settings", you must also pattern match on "%Pleroma.MFA.Settings{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 17 │       put_change(changeset, %Settings{settings | enabled: false})
    │                             ~
    │
    └─ lib/pleroma/mfa/changeset.ex:17:29: Pleroma.MFA.Changeset.disable/2

---

    warning: a struct for Pleroma.MFA.Settings is expected on struct update:

        %Pleroma.MFA.Settings{
          settings
          | totp: %Pleroma.MFA.Settings.TOTP{confirmed: false, delivery_type: "app", secret: nil}
        }

    but got type:

        dynamic()

    where "settings" was given the type:

        # type: dynamic()
        # from: lib/pleroma/mfa/changeset.ex:23:74
        %Pleroma.User{multi_factor_authentication_settings: settings} = user

    when defining the variable "settings", you must also pattern match on "%Pleroma.MFA.Settings{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 25 │     |> put_change(%Settings{settings | totp: %Settings.TOTP{}})
    │                   ~
    │
    └─ lib/pleroma/mfa/changeset.ex:25:19: Pleroma.MFA.Changeset.disable_totp/1
---
 lib/pleroma/mfa/changeset.ex | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/mfa/changeset.ex b/lib/pleroma/mfa/changeset.ex
index 3ec3cfe91..890cb2193 100644
--- a/lib/pleroma/mfa/changeset.ex
+++ b/lib/pleroma/mfa/changeset.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.MFA.Changeset do
   alias Pleroma.User
 
   def disable(%Ecto.Changeset{} = changeset, force \\ false) do
-    settings =
+    %Settings{} = settings =
       changeset
       |> Ecto.Changeset.apply_changes()
       |> MFA.fetch_settings()
@@ -20,20 +20,20 @@ defmodule Pleroma.MFA.Changeset do
     end
   end
 
-  def disable_totp(%User{multi_factor_authentication_settings: settings} = user) do
+  def disable_totp(%User{multi_factor_authentication_settings: %Settings{} = settings} = user) do
     user
     |> put_change(%Settings{settings | totp: %Settings.TOTP{}})
   end
 
-  def confirm_totp(%User{multi_factor_authentication_settings: settings} = user) do
-    totp_settings = %Settings.TOTP{settings.totp | confirmed: true}
+  def confirm_totp(%User{multi_factor_authentication_settings: %Settings{} = settings} = user) do
+    totp_settings = %Settings.TOTP{%Settings.TOTP{} = settings.totp | confirmed: true}
 
     user
     |> put_change(%Settings{settings | totp: totp_settings, enabled: true})
   end
 
   def setup_totp(%User{} = user, attrs) do
-    mfa_settings = MFA.fetch_settings(user)
+    %Settings{} = mfa_settings = MFA.fetch_settings(user)
 
     totp_settings =
       %Settings.TOTP{}
@@ -46,7 +46,7 @@ defmodule Pleroma.MFA.Changeset do
   def cast_backup_codes(%User{} = user, codes) do
     user
     |> put_change(%Settings{
-      user.multi_factor_authentication_settings
+      %Settings{} = user.multi_factor_authentication_settings
       | backup_codes: codes
     })
   end

From 0d3085937ca728c572f19798d21dce12dcf7b89e Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:09:03 +0200
Subject: [PATCH 003/163] Elixir 1.19: Fix typing violation on struct updates
 in Pleroma.Upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    warning: a struct for Pleroma.Upload is expected on struct update:

        %Pleroma.Upload{
          upload
          | path:
              case upload.path do
                x when x === false or x === nil ->
                  <<to_string(upload.id)::binary, "/", to_string(upload.name)::binary>>

                x ->
                  x
              end
        }

    but got type:

        dynamic()

    where "upload" was given the type:

        # type: dynamic()
        # from: lib/pleroma/upload.ex:95:24
        {:ok, upload} <- prepare_upload(upload, opts)

    when defining the variable "upload", you must also pattern match on "%Pleroma.Upload{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 96 │          upload = %__MODULE__{upload | path: upload.path || "#{upload.id}/#{upload.name}"},
    │                   ~
    │
    └─ lib/pleroma/upload.ex:96:19: Pleroma.Upload.store/2
---
 lib/pleroma/upload.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 06d8005bc..350ff6cb3 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -93,7 +93,7 @@ defmodule Pleroma.Upload do
   def store(upload, opts \\ []) do
     opts = get_opts(opts)
 
-    with {:ok, upload} <- prepare_upload(upload, opts),
+    with {:ok, %__MODULE__{} = upload} <- prepare_upload(upload, opts),
          upload = %__MODULE__{upload | path: upload.path || "#{upload.id}/#{upload.name}"},
          {:ok, upload} <- Pleroma.Upload.Filter.filter(opts.filters, upload),
          description = get_description(upload),

From 6f62cb0ed38c5d2bbdb6e304a287553bad8584f1 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:09:51 +0200
Subject: [PATCH 004/163] Elixir 1.19: Fix typing violation on struct updates
 in Web.ApiSpec.Cast*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

     warning: a struct for Plug.Conn is expected on struct update:

         %Plug.Conn{conn | query_params: query_params}

     but got type:

         dynamic()

     where "conn" was given the type:

         # type: dynamic()
         # from: lib/pleroma/web/api_spec/cast_and_validate.ex:109:43
         conn

     when defining the variable "conn", you must also pattern match on "%Plug.Conn{}".

     hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

         user = some_function()
         %User{user | name: "John Doe"}

     it is enough to write:

         %User{} = user = some_function()
         %{user | name: "John Doe"}

     typing violation found at:
     │
 133 │         conn = %Conn{conn | query_params: query_params}
     │                ~
     │
     └─ lib/pleroma/web/api_spec/cast_and_validate.ex:133:16: Pleroma.Web.ApiSpec.CastAndValidate.cast_and_validate/6
---
 lib/pleroma/web/api_spec/cast_and_validate.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/api_spec/cast_and_validate.ex b/lib/pleroma/web/api_spec/cast_and_validate.ex
index 672d1c4a1..57ea8e9b3 100644
--- a/lib/pleroma/web/api_spec/cast_and_validate.ex
+++ b/lib/pleroma/web/api_spec/cast_and_validate.ex
@@ -106,7 +106,7 @@ defmodule Pleroma.Web.ApiSpec.CastAndValidate do
     OpenApiSpex.cast_and_validate(spec, operation, conn, content_type, cast_opts)
   end
 
-  defp cast_and_validate(spec, operation, conn, content_type, false = _strict, cast_opts) do
+  defp cast_and_validate(spec, operation, %Conn{} = conn, content_type, false = _strict, cast_opts) do
     case OpenApiSpex.cast_and_validate(spec, operation, conn, content_type) do
       {:ok, conn} ->
         {:ok, conn}

From 7c79e4416f78b317d8a3bda4cacd23f3d955df46 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:11:33 +0200
Subject: [PATCH 005/163] Elixir 1.19: Fix typing violation on struct updates
 in Web.ApiSpec.Rend*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    warning: a struct for OpenApiSpex.Cast.Error is expected on struct update:

        %OpenApiSpex.Cast.Error{err | name: err.value}

    but got type:

        dynamic(%{..., name: nil, reason: :invalid_enum})

    where "err" was given the type:

        # type: dynamic(%{..., name: nil, reason: :invalid_enum})
        # from: lib/pleroma/web/api_spec/render_error.ex:20:45
        %{name: nil, reason: :invalid_enum} = err

    when defining the variable "err", you must also pattern match on "%OpenApiSpex.Cast.Error{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 21 │           %OpenApiSpex.Cast.Error{err | name: err.value}
    │           ~
    │
    └─ lib/pleroma/web/api_spec/render_error.ex:21:11: Pleroma.Web.ApiSpec.RenderError.call/2
---
 lib/pleroma/web/api_spec/render_error.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/api_spec/render_error.ex b/lib/pleroma/web/api_spec/render_error.ex
index 3539af6e4..acf510774 100644
--- a/lib/pleroma/web/api_spec/render_error.ex
+++ b/lib/pleroma/web/api_spec/render_error.ex
@@ -17,10 +17,10 @@ defmodule Pleroma.Web.ApiSpec.RenderError do
   def call(conn, errors) do
     errors =
       Enum.map(errors, fn
-        %{name: nil, reason: :invalid_enum} = err ->
+        %OpenApiSpex.Cast.Error{name: nil, reason: :invalid_enum} = err ->
           %OpenApiSpex.Cast.Error{err | name: err.value}
 
-        %{name: nil} = err ->
+        %OpenApiSpex.Cast.Error{name: nil} = err ->
           %OpenApiSpex.Cast.Error{err | name: List.last(err.path)}
 
         err ->

From 6a926bf605b6e33c0fe9242fc0b2c1b8f68b655d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 16 Oct 2025 15:12:41 +0200
Subject: [PATCH 006/163] Elixir 1.19: Fix typing violation on struct updates
 in CommonAPI.Activity*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

     warning: a struct for Pleroma.Web.CommonAPI.ActivityDraft is expected on struct update:

         %Pleroma.Web.CommonAPI.ActivityDraft{draft | object: object}

     but got type:

         dynamic()

     where "draft" was given the type:

         # type: dynamic()
         # from: lib/pleroma/web/common_api/activity_draft.ex:91:22
         draft

     when defining the variable "draft", you must also pattern match on "%Pleroma.Web.CommonAPI.ActivityDraft{}".

     hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

         user = some_function()
         %User{user | name: "John Doe"}

     it is enough to write:

         %User{} = user = some_function()
         %{user | name: "John Doe"}

     typing violation found at:
     │
 102 │     %__MODULE__{draft | object: object}
     │     ~
     │
     └─ lib/pleroma/web/common_api/activity_draft.ex:102:5: Pleroma.Web.CommonAPI.ActivityDraft.listen_object/1
---
 lib/pleroma/web/common_api/activity_draft.ex | 46 ++++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index c0b98508c..c5959276a 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -88,7 +88,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     |> validate()
   end
 
-  defp listen_object(draft) do
+  defp listen_object(%__MODULE__{} = draft) do
     object =
       draft.params
       |> Map.take([:album, :artist, :title, :length])
@@ -102,20 +102,20 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     %__MODULE__{draft | object: object}
   end
 
-  defp put_params(draft, params) do
+  defp put_params(%__MODULE__{} = draft, params) do
     params = Map.put_new(params, :in_reply_to_status_id, params[:in_reply_to_id])
     %__MODULE__{draft | params: params}
   end
 
-  defp status(%{params: %{status: status}} = draft) do
+  defp status(%__MODULE__{params: %{status: status}} = draft) do
     %__MODULE__{draft | status: String.trim(status)}
   end
 
-  defp summary(%{params: params} = draft) do
+  defp summary(%__MODULE__{params: params} = draft) do
     %__MODULE__{draft | summary: Map.get(params, :spoiler_text, "")}
   end
 
-  defp full_payload(%{status: status, summary: summary} = draft) do
+  defp full_payload(%__MODULE__{status: status, summary: summary} = draft) do
     full_payload = String.trim(status <> summary)
 
     case Utils.validate_character_limit(full_payload, draft.attachments) do
@@ -124,7 +124,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
-  defp attachments(%{params: params} = draft) do
+  defp attachments(%__MODULE__{params: params} = draft) do
     attachments = Utils.attachments_from_ids(params, draft.user)
     draft = %__MODULE__{draft | attachments: attachments}
 
@@ -134,9 +134,9 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
-  defp in_reply_to(%{params: %{in_reply_to_status_id: ""}} = draft), do: draft
+  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: ""}} = draft), do: draft
 
-  defp in_reply_to(%{params: %{in_reply_to_status_id: id}} = draft) when is_binary(id) do
+  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: id}} = draft) when is_binary(id) do
     # If a post was deleted all its activities (except the newly added Delete) are purged too,
     # thus lookup by Create db ID will yield nil just as if it never existed in the first place.
     #
@@ -166,13 +166,13 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
-  defp in_reply_to(%{params: %{in_reply_to_status_id: %Activity{} = in_reply_to}} = draft) do
+  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: %Activity{} = in_reply_to}} = draft) do
     %__MODULE__{draft | in_reply_to: in_reply_to}
   end
 
   defp in_reply_to(draft), do: draft
 
-  defp quote_post(%{params: %{quoted_status_id: id}} = draft) when not_empty_string(id) do
+  defp quote_post(%__MODULE__{params: %{quoted_status_id: id}} = draft) when not_empty_string(id) do
     case Activity.get_by_id_with_object(id) do
       %Activity{} = activity ->
         %__MODULE__{draft | quote_post: activity}
@@ -188,12 +188,12 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
 
   defp quote_post(draft), do: draft
 
-  defp in_reply_to_conversation(draft) do
+  defp in_reply_to_conversation(%__MODULE__{} = draft) do
     in_reply_to_conversation = Participation.get(draft.params[:in_reply_to_conversation_id])
     %__MODULE__{draft | in_reply_to_conversation: in_reply_to_conversation}
   end
 
-  defp visibility(%{params: params} = draft) do
+  defp visibility(%__MODULE__{params: params} = draft) do
     case CommonAPI.get_visibility(params, draft.in_reply_to, draft.in_reply_to_conversation) do
       {visibility, "direct"} when visibility != "direct" ->
         add_error(draft, dgettext("errors", "The message visibility must be direct"))
@@ -226,14 +226,14 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
 
   defp quoting_visibility(draft), do: draft
 
-  defp expires_at(draft) do
+  defp expires_at(%__MODULE__{} = draft) do
     case CommonAPI.check_expiry_date(draft.params[:expires_in]) do
       {:ok, expires_at} -> %__MODULE__{draft | expires_at: expires_at}
       {:error, message} -> add_error(draft, message)
     end
   end
 
-  defp poll(draft) do
+  defp poll(%__MODULE__{} = draft) do
     case Utils.make_poll_data(draft.params) do
       {:ok, {poll, poll_emoji}} ->
         %__MODULE__{draft | extra: poll, emoji: Map.merge(draft.emoji, poll_emoji)}
@@ -243,7 +243,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
-  defp content(%{mentions: mentions} = draft) do
+  defp content(%__MODULE__{mentions: mentions} = draft) do
     {content_html, mentioned_users, tags} = Utils.make_content_html(draft)
 
     mentioned_ap_ids =
@@ -257,22 +257,22 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     %__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
   end
 
-  defp to_and_cc(draft) do
+  defp to_and_cc(%__MODULE__{} = draft) do
     {to, cc} = Utils.get_to_and_cc(draft)
     %__MODULE__{draft | to: to, cc: cc}
   end
 
-  defp context(draft) do
+  defp context(%__MODULE__{} = draft) do
     context = Utils.make_context(draft.in_reply_to, draft.in_reply_to_conversation)
     %__MODULE__{draft | context: context}
   end
 
-  defp sensitive(draft) do
+  defp sensitive(%__MODULE__{} = draft) do
     sensitive = draft.params[:sensitive]
     %__MODULE__{draft | sensitive: sensitive}
   end
 
-  defp language(draft) do
+  defp language(%__MODULE__{} = draft) do
     language =
       with language <- draft.params[:language],
            true <- good_locale_code?(language) do
@@ -284,7 +284,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     %__MODULE__{draft | language: language}
   end
 
-  defp object(draft) do
+  defp object(%__MODULE__{} = draft) do
     emoji = Map.merge(Pleroma.Emoji.Formatter.get_emoji_map(draft.full_payload), draft.emoji)
 
     # Sometimes people create posts with subject containing emoji,
@@ -328,12 +328,12 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     %__MODULE__{draft | object: object}
   end
 
-  defp preview?(draft) do
+  defp preview?(%__MODULE__{} = draft) do
     preview? = Pleroma.Web.Utils.Params.truthy_param?(draft.params[:preview])
     %__MODULE__{draft | preview?: preview?}
   end
 
-  defp changes(draft) do
+  defp changes(%__MODULE__{} = draft) do
     direct? = draft.visibility == "direct"
     additional = %{"cc" => draft.cc, "directMessage" => direct?}
 
@@ -359,7 +359,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
   defp with_valid(%{valid?: true} = draft, func), do: func.(draft)
   defp with_valid(draft, _func), do: draft
 
-  defp add_error(draft, message) do
+  defp add_error(%__MODULE__{} = draft, message) do
     %__MODULE__{draft | valid?: false, errors: [message | draft.errors]}
   end
 

From 9040434886526e082bf675e46e8cadb3f64e7fe9 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 16:40:19 +0100
Subject: [PATCH 007/163] Elixir 1.19: Fix typing violations in ActivityPubTest

---
 test/pleroma/web/activity_pub/activity_pub_test.exs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs
index 37ec87a9b..13146619a 100644
--- a/test/pleroma/web/activity_pub/activity_pub_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@ -1524,8 +1524,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       %{test_file: test_file}
     end
 
-    test "strips / from filename", %{test_file: file} do
-      file = %Plug.Upload{file | filename: "../../../../../nested/bad.jpg"}
+    test "strips / from filename", %{test_file: %Plug.Upload{} = file} do
+      file = %{file | filename: "../../../../../nested/bad.jpg"}
       {:ok, %Object{} = object} = ActivityPub.upload(file)
       [%{"href" => href}] = object.data["url"]
       assert Regex.match?(~r"/bad.jpg$", href)
@@ -1786,10 +1786,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
     {:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
     {:ok, list} = Pleroma.List.follow(list, member)
 
-    {:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
+    {:ok, %Activity{} = activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
 
     activity = Repo.preload(activity, :bookmark)
-    activity = %Activity{activity | thread_muted?: !!activity.thread_muted?}
+    activity = %{activity | thread_muted?: !!activity.thread_muted?}
 
     assert ActivityPub.fetch_activities([], %{user: user}) == [activity]
   end
@@ -1989,7 +1989,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       assert User.following?(follower, old_user)
       assert User.following?(follower_move_opted_out, old_user)
 
-      assert {:ok, activity} = ActivityPub.move(old_user, new_user)
+      assert {:ok, %Activity{} = activity} = ActivityPub.move(old_user, new_user)
 
       assert %Activity{
                actor: ^old_ap_id,
@@ -2021,7 +2021,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       assert User.following?(follower_move_opted_out, old_user)
       refute User.following?(follower_move_opted_out, new_user)
 
-      activity = %Activity{activity | object: nil}
+      activity = %{activity | object: nil}
 
       assert [%Notification{activity: ^activity}] = Notification.for_user(follower)
 

From 349d858fdade27c7a016a55ac69a435dadb59d2c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 16:42:26 +0100
Subject: [PATCH 008/163] Elixir 1.19: Fix typing violation in
 MediaControllerTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

warning: a struct for Plug.Upload is expected on struct update:

         %Plug.Upload{image | filename: "../../../../../nested/file.jpg"}

     but got type:

         dynamic()

     where "image" was given the type:

         # type: dynamic()
         # from: test/pleroma/web/mastodon_api/controllers/media_controller_test.exs:132:42
         %{conn: conn, image: image}

     when defining the variable "image", you must also pattern match on "%Plug.Upload{}".

     hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

         user = some_function()
         %User{user | name: "John Doe"}

     it is enough to write:

         %User{} = user = some_function()
         %{user | name: "John Doe"}

     typing violation found at:
     │
 133 │       image = %Plug.Upload{
     │               ~
     │
     └─ test/pleroma/web/mastodon_api/controllers/media_controller_test.exs:133:15: Pleroma.Web.MastodonAPI.MediaControllerTest."test Upload media Do not allow nested filename"/1
---
 .../web/mastodon_api/controllers/media_controller_test.exs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
index ae86078d7..fc083fd0e 100644
--- a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
@@ -129,8 +129,8 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
       assert :ok == File.rm(Path.absname("test/tmp/large_binary.data"))
     end
 
-    test "Do not allow nested filename", %{conn: conn, image: image} do
-      image = %Plug.Upload{
+    test "Do not allow nested filename", %{conn: conn, image: %Plug.Upload{} = image} do
+      image = %{
         image
         | filename: "../../../../../nested/file.jpg"
       }

From f3d9880f07e70f4e83e25e13aab537e2ea3c89ba Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 16:44:37 +0100
Subject: [PATCH 009/163] Elixir 1.19: Fix typing violation in RepoTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

warning: a struct for Pleroma.Web.OAuth.Token is expected on struct update:

        %Pleroma.Web.OAuth.Token{Pleroma.Factory.insert(:oauth_token) | user: user}

    but got type:

        dynamic()

    you must assign "Pleroma.Factory.insert(:oauth_token)" to variable and pattern match on "%Pleroma.Web.OAuth.Token{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 27 │       token = %Pleroma.Web.OAuth.Token{insert(:oauth_token) | user: user}
    │               ~
    │
    └─ test/pleroma/repo_test.exs:27:15: Pleroma.RepoTest."test get_assoc/2 get assoc from preloaded data"/1
---
 test/pleroma/repo_test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/repo_test.exs b/test/pleroma/repo_test.exs
index 9c0f5d028..721175bda 100644
--- a/test/pleroma/repo_test.exs
+++ b/test/pleroma/repo_test.exs
@@ -24,7 +24,8 @@ defmodule Pleroma.RepoTest do
   describe "get_assoc/2" do
     test "get assoc from preloaded data" do
       user = %User{name: "Agent Smith"}
-      token = %Pleroma.Web.OAuth.Token{insert(:oauth_token) | user: user}
+      %Pleroma.Web.OAuth.Token{} = token = insert(:oauth_token)
+      token = %{token | user: user}
       assert Repo.get_assoc(token, :user) == {:ok, user}
     end
 

From d1ce6f9833036aacc585963046043f1a5c4f5b14 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 16:48:55 +0100
Subject: [PATCH 010/163] Elixir 1.19: Fix typing violation in MarkerTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

warning: a struct for Pleroma.Marker is expected on struct update:

        %Pleroma.Marker{refresh_record(marker) | unread_count: 2}

    but got type:

        dynamic()

    where "marker" was given the type:

        # type: dynamic()
        # from: test/pleroma/marker_test.exs:35:14
        marker = Pleroma.Factory.insert(:marker, user: user)

    you must assign "refresh_record(marker)" to variable and pattern match on "%Pleroma.Marker{}".

    hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

        user = some_function()
        %User{user | name: "John Doe"}

    it is enough to write:

        %User{} = user = some_function()
        %{user | name: "John Doe"}

    typing violation found at:
    │
 43 │              ) == [%Marker{refresh_record(marker) | unread_count: 2}]
    │                    ~
    │
    └─ test/pleroma/marker_test.exs:43:20: Pleroma.MarkerTest."test get_markers/2 returns user markers"/1
---
 test/pleroma/marker_test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/marker_test.exs b/test/pleroma/marker_test.exs
index 819dde9be..7f573ac7a 100644
--- a/test/pleroma/marker_test.exs
+++ b/test/pleroma/marker_test.exs
@@ -36,11 +36,12 @@ defmodule Pleroma.MarkerTest do
       insert(:notification, user: user, activity: insert(:note_activity))
       insert(:notification, user: user, activity: insert(:note_activity))
       insert(:marker, timeline: "home", user: user)
+      %Marker{} = refreshed_marker = refresh_record(marker)
 
       assert Marker.get_markers(
                user,
                ["notifications"]
-             ) == [%Marker{refresh_record(marker) | unread_count: 2}]
+             ) == [%{refreshed_marker | unread_count: 2}]
     end
   end
 

From 5777d8e8d3c33bc70bb3cda6b7bb72592a310e16 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 17:01:36 +0100
Subject: [PATCH 011/163] Elixir 1.19: Fix deprecation warning when invoking
 ParallelCompiler

warning: you must pass return_diagnostics: true when invoking Kernel.ParallelCompiler functions
  (elixir 1.19.5) lib/kernel/parallel_compiler.ex:324: Kernel.ParallelCompiler.spawn_workers/3
  (pleroma 2.10.0-7-ga7a74d5e-elixir-1-19+test) lib/pleroma/html.ex:13: Pleroma.HTML.compile_scrubbers/0
  (pleroma 2.10.0-7-ga7a74d5e-elixir-1-19+test) lib/pleroma/application.ex:48: Pleroma.Application.start/2
  (kernel 10.5) application_master.erl:299: :application_master.start_it_old/4

warning: you must pass return_diagnostics: true when invoking Kernel.ParallelCompiler functions
  (elixir 1.19.5) lib/kernel/parallel_compiler.ex:324: Kernel.ParallelCompiler.spawn_workers/3
  (pleroma 2.10.0-7-ga7a74d5e-elixir-1-19+test) lib/pleroma/application.ex:121: Pleroma.Application.load_custom_modules/0
  (pleroma 2.10.0-7-ga7a74d5e-elixir-1-19+test) lib/pleroma/application.ex:60: Pleroma.Application.start/2
  (kernel 10.5) application_master.erl:299: :application_master.start_it_old/4
---
 lib/pleroma/utils.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/utils.ex b/lib/pleroma/utils.ex
index 73001c987..61d122a47 100644
--- a/lib/pleroma/utils.ex
+++ b/lib/pleroma/utils.ex
@@ -17,7 +17,7 @@ defmodule Pleroma.Utils do
     dir
     |> File.ls!()
     |> Enum.map(&Path.join(dir, &1))
-    |> Kernel.ParallelCompiler.compile()
+    |> Kernel.ParallelCompiler.compile(return_diagnostics: true)
   end
 
   @doc """

From 94ea3dffd1c49fadc6a80c34127ea59c7fd87311 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 17:05:31 +0100
Subject: [PATCH 012/163] Elixir 1.19: Fix ConfigDBTest regex tests

It is not possible match regexes anymore as this worked by accident
previously. Instead, at least check that the sources of the regex (the
regex itself) match.

Notice the +1 difference in the regex Reference below.

1) test to_elixir_types/1 complex keyword with sigil (Pleroma.ConfigDBTest)
   test/pleroma/config_db_test.exs:460
   Assertion with == failed
   code:  assert ConfigDB.to_elixir_types([
            %{"tuple" => [":federated_timeline_removal", []]},
            %{"tuple" => [":reject", ["~r/comp[lL][aA][iI][nN]er/"]]},
            %{"tuple" => [":replace", []]}
          ]) == [federated_timeline_removal: [], reject: [~r/comp[lL][aA][iI][nN]er/], replace: []]
   left:  [federated_timeline_removal: [], reject: [%Regex{opts: [], re_pattern: {:re_pattern, 0, 0, 0, #Reference<0.230935836.591265794.259515>}, source: "comp[lL][aA][iI][nN]er"}], replace: []]
   right: [federated_timeline_removal: [], reject: [%Regex{opts: [], re_pattern: {:re_pattern, 0, 0, 0, #Reference<0.230935836.591265794.259516>}, source: "comp[lL][aA][iI][nN]er"}], replace: []]
   stacktrace:
     test/pleroma/config_db_test.exs:461: (test)
---
 test/pleroma/config_db_test.exs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/pleroma/config_db_test.exs b/test/pleroma/config_db_test.exs
index d68e4e6fa..59beba48e 100644
--- a/test/pleroma/config_db_test.exs
+++ b/test/pleroma/config_db_test.exs
@@ -273,24 +273,24 @@ defmodule Pleroma.ConfigDBTest do
     end
 
     test "sigil" do
-      assert ConfigDB.to_elixir_types("~r[comp[lL][aA][iI][nN]er]") == ~r/comp[lL][aA][iI][nN]er/
+      assert ConfigDB.to_elixir_types("~r[comp[lL][aA][iI][nN]er]").source == ~r/comp[lL][aA][iI][nN]er/.source
     end
 
     test "link sigil" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/") == ~r/https:\/\/example.com/
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/").source == ~r/https:\/\/example.com/.source
     end
 
     test "link sigil with um modifiers" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/um") ==
-               ~r/https:\/\/example.com/um
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/um").source ==
+               ~r/https:\/\/example.com/um.source
     end
 
     test "link sigil with i modifier" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/i") == ~r/https:\/\/example.com/i
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/i").source == ~r/https:\/\/example.com/i.source
     end
 
     test "link sigil with s modifier" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/s") == ~r/https:\/\/example.com/s
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/s").source == ~r/https:\/\/example.com/s.source
     end
 
     test "raise if valid delimiter not found" do
@@ -460,11 +460,11 @@ defmodule Pleroma.ConfigDBTest do
     test "complex keyword with sigil" do
       assert ConfigDB.to_elixir_types([
                %{"tuple" => [":federated_timeline_removal", []]},
-               %{"tuple" => [":reject", ["~r/comp[lL][aA][iI][nN]er/"]]},
+               %{"tuple" => [":reject", [~r/comp[lL][aA][iI][nN]er/.source]]},
                %{"tuple" => [":replace", []]}
              ]) == [
                federated_timeline_removal: [],
-               reject: [~r/comp[lL][aA][iI][nN]er/],
+               reject: [~r/comp[lL][aA][iI][nN]er/.source],
                replace: []
              ]
     end

From cbacc0f146eaad98eb31574142a076658ae98f3f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 17:13:10 +0100
Subject: [PATCH 013/163] Elixir 1.19: Fix MRFTest regex tests

It is no longer possible to match regexes. Instead at least match that
the sources of the regexes (regexes themselves) are the same.

Notice the +1 Reference number below.

2) test subdomain_match/2 wildcard domains with one subdomain (Pleroma.Web.ActivityPub.MRFTest)
   test/pleroma/web/activity_pub/mrf_test.exs:36
   Assertion with == failed
   code:  assert regexes == [~r/^(.*\.)*unsafe.tld$/i]
   left:  [%Regex{opts: [:caseless], re_pattern: {:re_pattern, 1, 0, 0, #Reference<0.378940835.3277193222.129648>}, source: "^(.*\\.)*unsafe.tld$"}]
   right: [%Regex{opts: [:caseless], re_pattern: {:re_pattern, 1, 0, 0, #Reference<0.378940835.3277193222.129649>}, source: "^(.*\\.)*unsafe.tld$"}]
   stacktrace:
     test/pleroma/web/activity_pub/mrf_test.exs:39: (test)
---
 test/pleroma/web/activity_pub/mrf_test.exs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/pleroma/web/activity_pub/mrf_test.exs b/test/pleroma/web/activity_pub/mrf_test.exs
index 25548e3da..6656a01b8 100644
--- a/test/pleroma/web/activity_pub/mrf_test.exs
+++ b/test/pleroma/web/activity_pub/mrf_test.exs
@@ -11,17 +11,21 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
   alias Pleroma.Web.ActivityPub.MRF
 
   test "subdomains_regex/1" do
-    assert MRF.subdomains_regex(["unsafe.tld", "*.unsafe.tld"]) == [
-             ~r/^unsafe.tld$/i,
-             ~r/^(.*\.)*unsafe.tld$/i
+    regexes = MRF.subdomains_regex(["unsafe.tld", "*.unsafe.tld"])
+    matchable_regexes = Enum.map(regexes, fn r -> r.source end)
+
+    assert matchable_regexes == [
+             ~r/^unsafe.tld$/i.source,
+             ~r/^(.*\.)*unsafe.tld$/i.source
            ]
   end
 
   describe "subdomain_match/2" do
     test "common domains" do
       regexes = MRF.subdomains_regex(["unsafe.tld", "unsafe2.tld"])
+      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert regexes == [~r/^unsafe.tld$/i, ~r/^unsafe2.tld$/i]
+      assert matchable_regexes == [~r/^unsafe.tld$/i.source, ~r/^unsafe2.tld$/i.source]
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "unsafe2.tld")
@@ -31,8 +35,9 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "wildcard domains with one subdomain" do
       regexes = MRF.subdomains_regex(["*.unsafe.tld"])
+      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert regexes == [~r/^(.*\.)*unsafe.tld$/i]
+      assert matchable_regexes == [~r/^(.*\.)*unsafe.tld$/i.source]
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "sub.unsafe.tld")
@@ -42,8 +47,9 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "wildcard domains with two subdomains" do
       regexes = MRF.subdomains_regex(["*.unsafe.tld"])
+      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert regexes == [~r/^(.*\.)*unsafe.tld$/i]
+      assert matchable_regexes == [~r/^(.*\.)*unsafe.tld$/i.source]
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "sub.sub.unsafe.tld")
@@ -53,8 +59,9 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "matches are case-insensitive" do
       regexes = MRF.subdomains_regex(["UnSafe.TLD", "UnSAFE2.Tld"])
+      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert regexes == [~r/^UnSafe.TLD$/i, ~r/^UnSAFE2.Tld$/i]
+      assert matchable_regexes == [~r/^UnSafe.TLD$/i.source, ~r/^UnSAFE2.Tld$/i.source]
 
       assert MRF.subdomain_match?(regexes, "UNSAFE.TLD")
       assert MRF.subdomain_match?(regexes, "UNSAFE2.TLD")

From 3c7cd8b043237fb0ece9c314b73e335dfd28ffcb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 17:28:06 +0100
Subject: [PATCH 014/163] Elixir 1.19: Fix Mastodon StatusControllerTest
 DateTime difference

---
 .../web/mastodon_api/controllers/status_controller_test.exs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 298e92366..8477ae03f 100644
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@ -3068,7 +3068,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
              |> json_response_and_validate_schema(:ok)
 
     {:ok, a_expires_at, 0} = DateTime.from_iso8601(a_expires_at)
-    assert DateTime.diff(expires_at, a_expires_at) == 0
+    assert DateTime.diff(DateTime.truncate(expires_at, :second), DateTime.truncate(a_expires_at, :second)) == 0
 
     %{conn: conn} = oauth_access(["read:statuses"])
 

From dd2f0a32d8a0ab918cf840b937158e5b6d9418b3 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 9 Jan 2026 20:16:30 +0100
Subject: [PATCH 015/163] lint

---
 lib/pleroma/mfa/changeset.ex                         |  7 ++++---
 lib/pleroma/web/api_spec/cast_and_validate.ex        |  9 ++++++++-
 lib/pleroma/web/common_api/activity_draft.ex         | 10 +++++++---
 test/pleroma/config_db_test.exs                      | 12 ++++++++----
 test/pleroma/web/activity_pub/activity_pub_test.exs  |  3 ++-
 .../controllers/status_controller_test.exs           |  6 +++++-
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/lib/pleroma/mfa/changeset.ex b/lib/pleroma/mfa/changeset.ex
index 890cb2193..2045c3a7c 100644
--- a/lib/pleroma/mfa/changeset.ex
+++ b/lib/pleroma/mfa/changeset.ex
@@ -8,7 +8,8 @@ defmodule Pleroma.MFA.Changeset do
   alias Pleroma.User
 
   def disable(%Ecto.Changeset{} = changeset, force \\ false) do
-    %Settings{} = settings =
+    %Settings{} =
+      settings =
       changeset
       |> Ecto.Changeset.apply_changes()
       |> MFA.fetch_settings()
@@ -26,7 +27,7 @@ defmodule Pleroma.MFA.Changeset do
   end
 
   def confirm_totp(%User{multi_factor_authentication_settings: %Settings{} = settings} = user) do
-    totp_settings = %Settings.TOTP{%Settings.TOTP{} = settings.totp | confirmed: true}
+    totp_settings = %Settings.TOTP{(%Settings.TOTP{} = settings.totp) | confirmed: true}
 
     user
     |> put_change(%Settings{settings | totp: totp_settings, enabled: true})
@@ -46,7 +47,7 @@ defmodule Pleroma.MFA.Changeset do
   def cast_backup_codes(%User{} = user, codes) do
     user
     |> put_change(%Settings{
-      %Settings{} = user.multi_factor_authentication_settings
+      (%Settings{} = user.multi_factor_authentication_settings)
       | backup_codes: codes
     })
   end
diff --git a/lib/pleroma/web/api_spec/cast_and_validate.ex b/lib/pleroma/web/api_spec/cast_and_validate.ex
index 57ea8e9b3..95bd4d9cf 100644
--- a/lib/pleroma/web/api_spec/cast_and_validate.ex
+++ b/lib/pleroma/web/api_spec/cast_and_validate.ex
@@ -106,7 +106,14 @@ defmodule Pleroma.Web.ApiSpec.CastAndValidate do
     OpenApiSpex.cast_and_validate(spec, operation, conn, content_type, cast_opts)
   end
 
-  defp cast_and_validate(spec, operation, %Conn{} = conn, content_type, false = _strict, cast_opts) do
+  defp cast_and_validate(
+         spec,
+         operation,
+         %Conn{} = conn,
+         content_type,
+         false = _strict,
+         cast_opts
+       ) do
     case OpenApiSpex.cast_and_validate(spec, operation, conn, content_type) do
       {:ok, conn} ->
         {:ok, conn}
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index c5959276a..6c84ef656 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -136,7 +136,8 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
 
   defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: ""}} = draft), do: draft
 
-  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: id}} = draft) when is_binary(id) do
+  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: id}} = draft)
+       when is_binary(id) do
     # If a post was deleted all its activities (except the newly added Delete) are purged too,
     # thus lookup by Create db ID will yield nil just as if it never existed in the first place.
     #
@@ -166,13 +167,16 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
-  defp in_reply_to(%__MODULE__{params: %{in_reply_to_status_id: %Activity{} = in_reply_to}} = draft) do
+  defp in_reply_to(
+         %__MODULE__{params: %{in_reply_to_status_id: %Activity{} = in_reply_to}} = draft
+       ) do
     %__MODULE__{draft | in_reply_to: in_reply_to}
   end
 
   defp in_reply_to(draft), do: draft
 
-  defp quote_post(%__MODULE__{params: %{quoted_status_id: id}} = draft) when not_empty_string(id) do
+  defp quote_post(%__MODULE__{params: %{quoted_status_id: id}} = draft)
+       when not_empty_string(id) do
     case Activity.get_by_id_with_object(id) do
       %Activity{} = activity ->
         %__MODULE__{draft | quote_post: activity}
diff --git a/test/pleroma/config_db_test.exs b/test/pleroma/config_db_test.exs
index 59beba48e..98b56a146 100644
--- a/test/pleroma/config_db_test.exs
+++ b/test/pleroma/config_db_test.exs
@@ -273,11 +273,13 @@ defmodule Pleroma.ConfigDBTest do
     end
 
     test "sigil" do
-      assert ConfigDB.to_elixir_types("~r[comp[lL][aA][iI][nN]er]").source == ~r/comp[lL][aA][iI][nN]er/.source
+      assert ConfigDB.to_elixir_types("~r[comp[lL][aA][iI][nN]er]").source ==
+               ~r/comp[lL][aA][iI][nN]er/.source
     end
 
     test "link sigil" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/").source == ~r/https:\/\/example.com/.source
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/").source ==
+               ~r/https:\/\/example.com/.source
     end
 
     test "link sigil with um modifiers" do
@@ -286,11 +288,13 @@ defmodule Pleroma.ConfigDBTest do
     end
 
     test "link sigil with i modifier" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/i").source == ~r/https:\/\/example.com/i.source
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/i").source ==
+               ~r/https:\/\/example.com/i.source
     end
 
     test "link sigil with s modifier" do
-      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/s").source == ~r/https:\/\/example.com/s.source
+      assert ConfigDB.to_elixir_types("~r/https:\/\/example.com/s").source ==
+               ~r/https:\/\/example.com/s.source
     end
 
     test "raise if valid delimiter not found" do
diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs
index 13146619a..9aafc41a5 100644
--- a/test/pleroma/web/activity_pub/activity_pub_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@ -1786,7 +1786,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
     {:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
     {:ok, list} = Pleroma.List.follow(list, member)
 
-    {:ok, %Activity{} = activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
+    {:ok, %Activity{} = activity} =
+      CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
 
     activity = Repo.preload(activity, :bookmark)
     activity = %{activity | thread_muted?: !!activity.thread_muted?}
diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 8477ae03f..11e96a6ac 100644
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@ -3068,7 +3068,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
              |> json_response_and_validate_schema(:ok)
 
     {:ok, a_expires_at, 0} = DateTime.from_iso8601(a_expires_at)
-    assert DateTime.diff(DateTime.truncate(expires_at, :second), DateTime.truncate(a_expires_at, :second)) == 0
+
+    assert DateTime.diff(
+             DateTime.truncate(expires_at, :second),
+             DateTime.truncate(a_expires_at, :second)
+           ) == 0
 
     %{conn: conn} = oauth_access(["read:statuses"])
 

From 926cad3a76972835d340a7cabb0e90b8c01f51eb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 10 Jan 2026 16:42:09 +0100
Subject: [PATCH 016/163] Elixir 1.19: Refactor Logger configuration to what
 Elixir 1.15+ expects

Elixir 1.19 started emitting warnings about our use of:
config :logger, :console and
config :logger, backends: []
which got split in 1.15 to :default_handler, :default_formatter, and
LoggerBackends.add(backend) respectively.

On Pleroma startup it is now necessary to add the additional logger
backends at runtime (done with configure_logger() in application.ex).
New config key :pleroma, :logger_backends: [] has replaced the older
backends array. The logger_backends package is now used to facilitate
usage of other logger backends besides the default one (:logger_std_h
from OTP).

Warnings were added to Pleroma startup to warn about the usage of
:logger, backends and additional logic was introduced to make addition
of ExSyslogger to admin's configuration less dumb.

Ref: https://hexdocs.pm/logger/1.15.0/Logger.html#module-backends-and-backwards-compatibility
---
 config/config.exs                |  9 +++++----
 config/dev.exs                   |  2 +-
 config/prod.exs                  |  3 +--
 config/test.exs                  |  6 +++---
 docs/configuration/cheatsheet.md | 25 +++++++++++++------------
 lib/pleroma/application.ex       | 32 ++++++++++++++++++++++++++++++++
 6 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 5bf2c5c2e..08311146e 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -132,11 +132,12 @@ config :pleroma, Pleroma.Web.Endpoint,
     "SameSite=Lax"
   ]
 
-# Configures Elixir's Logger
-config :logger, backends: [:console]
+# config :logger, :console has been changed in 1.15+ and split into
+# :default_handler and :default_formatter. It started emitting warnings in 1.19.
+# See https://hexdocs.pm/logger/1.19.0/Logger.html#module-backends-and-backwards-compatibility
+config :logger, :default_handler, level: :debug
 
-config :logger, :console,
-  level: :debug,
+config :logger, :default_formatter,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:actor, :path, :type, :user]
 
diff --git a/config/dev.exs b/config/dev.exs
index 14cf4a6dc..e86bdb7fd 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, Logger.Backends.Console, format: "$metadata[$level] $message\n"
+config :logger, :default_formatter, 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 2d252bf02..1dfbbe937 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -20,8 +20,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 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, :default_handler, level: :info
 config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
diff --git a/config/test.exs b/config/test.exs
index 9652b7d4b..bac5e4df3 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -15,9 +15,9 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, :console,
-  level: :warning,
-  format: "\n[$level] $message\n"
+config :logger, :default_handler, level: :warning
+
+config :logger, :default_formatter, format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 9efa1c8b3..2ab2652b8 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -858,12 +858,14 @@ Web Push Notifications configuration. You can use the mix task `mix web_push.gen
 * ``private_key``: VAPID private key
 
 ## :logger
-* `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog
+* Logging to console/stdout is done by default, use `{ExSyslogger, :ex_syslogger}` to log to syslog
 
 An example to enable ONLY ExSyslogger (f/ex in ``prod.secret.exs``) with info and debug suppressed:
 ```elixir
-config :logger,
-  backends: [{ExSyslogger, :ex_syslogger}]
+config :pleroma,
+  logger_backends: [{ExSyslogger, :ex_syslogger}]
+
+config :logger, default_handler: false
 
 config :logger, :ex_syslogger,
   level: :warning
@@ -871,8 +873,8 @@ config :logger, :ex_syslogger,
 
 Another example, keeping console output and adding the pid to syslog output:
 ```elixir
-config :logger,
-  backends: [:console, {ExSyslogger, :ex_syslogger}]
+config :pleroma,
+  logger_backends: [{ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
   level: :warning,
@@ -883,23 +885,22 @@ See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_s
 
 An example of logging info to local syslog, but debug to console:
 ```elixir
-config :logger,
-  backends: [ {ExSyslogger, :ex_syslogger}, :console ],
-  level: :info
+config :pleroma,
+  logger_backends: [ {ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
   level: :info,
   ident: "pleroma",
   format: "$metadata[$level] $message"
 
-config :logger, :console,
-  level: :debug,
+config :logger, :default_handler,
+  level: :debug
+
+config :logger, :default_formatter,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:request_id]
 ```
 
-
-
 ## Database options
 
 ### RUM indexing for full text search
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 8e1c5de0d..7355a501a 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -43,6 +43,7 @@ defmodule Pleroma.Application do
     # every time the application is restarted, so we disable module
     # conflicts at runtime
     Code.compiler_options(ignore_module_conflict: true)
+    configure_logger()
     Pleroma.Telemetry.Logger.attach()
     Config.Holder.save_default()
     Pleroma.HTML.compile_scrubbers()
@@ -113,6 +114,37 @@ defmodule Pleroma.Application do
     Supervisor.start_link(children, opts)
   end
 
+  def configure_logger do
+    if Application.get_env(:logger, :backends) do
+      Logger.warning(
+        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger_backends: [...]' instead."
+      )
+    end
+
+    Config.get([:logger_backends], [])
+    |> Enum.each(fn backend ->
+      backend = backend_to_logger(backend)
+
+      case LoggerBackends.add(backend) do
+        {:ok, _} ->
+          Logger.debug("Successfully added logger backend: #{inspect(backend)}")
+
+        {:error, reason} ->
+          Logger.error("Failed to add logger backend #{inspect(backend)}: #{inspect(reason)}")
+      end
+    end)
+  end
+
+  defp backend_to_logger({:ex_syslogger = backend, name}) do
+    Logger.warning(
+      "Configuration {:#{backend}, :#{name}} is incorrect. Use {ExSyslogger, :#{name}} instead!"
+    )
+
+    {ExSyslogger, name}
+  end
+
+  defp backend_to_logger(backend), do: backend
+
   def load_custom_modules do
     dir = Config.get([:modules, :runtime_dir])
 

From 0393f0f92dcd68f7615b98139a35055d272e242a Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 12 Jan 2026 18:03:24 +0100
Subject: [PATCH 017/163] Elixir 1.19: Move Logger backends under a specific
 config key

---
 docs/configuration/cheatsheet.md | 12 ++++++------
 lib/pleroma/application.ex       |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 2ab2652b8..01d81f6ca 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -862,8 +862,8 @@ Web Push Notifications configuration. You can use the mix task `mix web_push.gen
 
 An example to enable ONLY ExSyslogger (f/ex in ``prod.secret.exs``) with info and debug suppressed:
 ```elixir
-config :pleroma,
-  logger_backends: [{ExSyslogger, :ex_syslogger}]
+config :pleroma, :logger,
+  backends: [{ExSyslogger, :ex_syslogger}]
 
 config :logger, default_handler: false
 
@@ -873,8 +873,8 @@ config :logger, :ex_syslogger,
 
 Another example, keeping console output and adding the pid to syslog output:
 ```elixir
-config :pleroma,
-  logger_backends: [{ExSyslogger, :ex_syslogger}]
+config :pleroma, :logger,
+  backends: [{ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
   level: :warning,
@@ -885,8 +885,8 @@ See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_s
 
 An example of logging info to local syslog, but debug to console:
 ```elixir
-config :pleroma,
-  logger_backends: [ {ExSyslogger, :ex_syslogger}]
+config :pleroma, :logger,
+  backends: [ {ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
   level: :info,
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 7355a501a..ce5b4f8d6 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -117,11 +117,11 @@ defmodule Pleroma.Application do
   def configure_logger do
     if Application.get_env(:logger, :backends) do
       Logger.warning(
-        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger_backends: [...]' instead."
+        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
       )
     end
 
-    Config.get([:logger_backends], [])
+    Config.get([:logger, :backends], [])
     |> Enum.each(fn backend ->
       backend = backend_to_logger(backend)
 

From 3790e6786cce376cbabf2588beed27d0daf9c55c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 12 Jan 2026 18:21:46 +0100
Subject: [PATCH 018/163] Only warn about bad clear_config usage if warned
 usage is met

---
 test/support/helpers.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 7fa6c31a4..259180e8f 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -73,7 +73,8 @@ defmodule Pleroma.Tests.Helpers do
   defmacro clear_config(config_path, temp_setting) do
     # NOTE: `clear_config([section, key], value)` != `clear_config([section], key: value)` (!)
     # Displaying a warning to prevent unintentional clearing of all but one keys in section
-    if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
+    if is_list(config_path) and length(config_path) == 1 and Keyword.keyword?(temp_setting) and
+         Keyword.keys(temp_setting) == [:key] do
       Logger.warning(
         "Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`"
       )

From eee54a9226b1b4642bb2a71daa0921ba0022ce48 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 12 Jan 2026 18:24:11 +0100
Subject: [PATCH 019/163] Elixir 1.19: Add tests for new Logger configuration

---
 test/pleroma/application_test.exs | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 test/pleroma/application_test.exs

diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
new file mode 100644
index 000000000..bff44f4ff
--- /dev/null
+++ b/test/pleroma/application_test.exs
@@ -0,0 +1,37 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2026 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.ApplicationTest do
+  use Pleroma.DataCase
+
+  import ExUnit.CaptureLog
+
+  # clear_config/2 can only manipulate env under :pleroma.
+  describe "config :logger, backends: []" do
+    setup do
+      Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
+
+      on_exit(fn ->
+        Application.delete_env(:logger, :backends) end)
+    end
+
+    test "warns on deprecated syntax" do
+      assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
+        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
+    end
+  end
+
+  describe "config :pleroma, :logger, backends: [{:ex_syslogger, :ex_syslogger}]" do
+    setup do
+      clear_config([:logger, :backends], [{:ex_syslogger, :ex_syslogger}])
+    end
+
+    test "is handled" do
+      log = capture_log(fn -> Pleroma.Application.configure_logger() end)
+
+      assert log =~ "Configuration {:ex_syslogger, :ex_syslogger} is incorrect. Use {ExSyslogger, :ex_syslogger} instead!"
+      assert log =~ "Successfully added logger backend: {ExSyslogger, :ex_syslogger}"
+    end
+  end
+end

From 3ebf4b105629b137f620de7b71167463ad3ca6be Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 12 Jan 2026 19:31:15 +0100
Subject: [PATCH 020/163] Elixir 1.19: Move deprecated logger syntax check to
 DeprecationWarnings

---
 lib/pleroma/application.ex                      |  6 ------
 lib/pleroma/config/deprecation_warnings.ex      | 17 ++++++++++++++++-
 test/pleroma/application_test.exs               | 15 ---------------
 .../config/deprecation_warnings_test.exs        | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index ce5b4f8d6..1e80c6249 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -115,12 +115,6 @@ defmodule Pleroma.Application do
   end
 
   def configure_logger do
-    if Application.get_env(:logger, :backends) do
-      Logger.warning(
-        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
-      )
-    end
-
     Config.get([:logger, :backends], [])
     |> Enum.each(fn backend ->
       backend = backend_to_logger(backend)
diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 58d164dc7..8dabd728f 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -218,7 +218,8 @@ defmodule Pleroma.Config.DeprecationWarnings do
       check_quarantined_instances_tuples(),
       check_transparency_exclusions_tuples(),
       check_simple_policy_tuples(),
-      check_exiftool_filter()
+      check_exiftool_filter(),
+      check_deprecated_logger_config()
     ]
     |> Enum.reduce(:ok, fn
       :ok, :ok -> :ok
@@ -415,4 +416,18 @@ defmodule Pleroma.Config.DeprecationWarnings do
       :ok
     end
   end
+
+  @spec check_deprecated_logger_config() :: :ok | :error
+  def check_deprecated_logger_config() do
+    if Application.get_env(:logger, :backends) do
+      Logger.warning(
+        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
+        "Use 'config :pleroma, :logger, backends: [...]' instead."
+      )
+
+      :error
+    else
+      :ok
+    end
+  end
 end
diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
index bff44f4ff..afe628732 100644
--- a/test/pleroma/application_test.exs
+++ b/test/pleroma/application_test.exs
@@ -7,21 +7,6 @@ defmodule Pleroma.ApplicationTest do
 
   import ExUnit.CaptureLog
 
-  # clear_config/2 can only manipulate env under :pleroma.
-  describe "config :logger, backends: []" do
-    setup do
-      Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
-
-      on_exit(fn ->
-        Application.delete_env(:logger, :backends) end)
-    end
-
-    test "warns on deprecated syntax" do
-      assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
-        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
-    end
-  end
-
   describe "config :pleroma, :logger, backends: [{:ex_syslogger, :ex_syslogger}]" do
     setup do
       clear_config([:logger, :backends], [{:ex_syslogger, :ex_syslogger}])
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index fca2324ff..1491f4ea3 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -388,4 +388,19 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
            end) =~
              "Your config is using the old namespace for the Shoutbox configuration."
   end
+
+  describe "check_deprecated_logger_config" do
+    setup do
+      Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
+
+      on_exit(fn ->
+        Application.delete_env(:logger, :backends) end)
+    end
+
+    test "warns on deprecated syntax" do
+      assert capture_log(fn -> Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config() end) =~
+        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
+    end
+  end
+
 end

From 39409a784df0a726aee3a6e48769344d83cd81f2 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 12 Jan 2026 19:35:12 +0100
Subject: [PATCH 021/163] Elixir 1.19: Warn on adding :console to Logger
 backends

Logger.Backend.Console still exists, but it is unused in our
configuration. Instead logging to console is done from Logger's
"default_handler".
---
 lib/pleroma/application.ex        | 28 +++++++++++++++++++---------
 test/pleroma/application_test.exs | 11 +++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 1e80c6249..0e8723251 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -117,27 +117,37 @@ defmodule Pleroma.Application do
   def configure_logger do
     Config.get([:logger, :backends], [])
     |> Enum.each(fn backend ->
-      backend = backend_to_logger(backend)
+      case backend_to_logger(backend) do
+        {:ok, logger} ->
+          add_logger(logger)
 
-      case LoggerBackends.add(backend) do
-        {:ok, _} ->
-          Logger.debug("Successfully added logger backend: #{inspect(backend)}")
-
-        {:error, reason} ->
-          Logger.error("Failed to add logger backend #{inspect(backend)}: #{inspect(reason)}")
+        {:error, :console_backend} ->
+          Logger.warning(":console is no longer considered a backend and is enabled by default")
       end
     end)
   end
 
+  defp add_logger(backend) do
+    case LoggerBackends.add(backend) do
+      {:ok, _} ->
+        Logger.debug("Successfully added logger backend: #{inspect(backend)}")
+
+      {:error, reason} ->
+        Logger.error("Failed to add logger backend #{inspect(backend)}: #{inspect(reason)}")
+    end
+  end
+
+  defp backend_to_logger(:console), do: {:error, :console_backend}
+
   defp backend_to_logger({:ex_syslogger = backend, name}) do
     Logger.warning(
       "Configuration {:#{backend}, :#{name}} is incorrect. Use {ExSyslogger, :#{name}} instead!"
     )
 
-    {ExSyslogger, name}
+    {:ok, {ExSyslogger, name}}
   end
 
-  defp backend_to_logger(backend), do: backend
+  defp backend_to_logger(backend), do: {:ok, backend}
 
   def load_custom_modules do
     dir = Config.get([:modules, :runtime_dir])
diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
index afe628732..48f87818f 100644
--- a/test/pleroma/application_test.exs
+++ b/test/pleroma/application_test.exs
@@ -19,4 +19,15 @@ defmodule Pleroma.ApplicationTest do
       assert log =~ "Successfully added logger backend: {ExSyslogger, :ex_syslogger}"
     end
   end
+
+  describe "config :pleroma, :logger, :backends: [:console]" do
+    setup do
+      clear_config([:logger, :backends], [:console])
+    end
+
+    test "emits a warning" do
+      assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
+        ":console is no longer considered a backend and is enabled by default"
+    end
+  end
 end

From 6744a86fe3a70834aac0c248f5b1c4d0680278fe Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 00:36:15 +0100
Subject: [PATCH 022/163] Elixir 1.19: Disable logging with colors in test
 environment

Can break some tests capture logs and then match on an expected text.
Since color codes end up being in the captured log.
---
 config/test.exs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/test.exs b/config/test.exs
index bac5e4df3..5b7f3b1ed 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -17,7 +17,11 @@ config :pleroma, Pleroma.Captcha,
 # Print only warnings and errors during test
 config :logger, :default_handler, level: :warning
 
-config :logger, :default_formatter, format: "\n[$level] $message\n"
+config :logger, :default_formatter,
+  format: "\n[$level] $message\n",
+  colors: [
+    enabled: false
+  ]
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 

From 17a563aeb41e4f2ec18788cf5a58a1a928044a6e Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 00:39:48 +0100
Subject: [PATCH 023/163] Elixir 1.19: Inject @compile autoload opt to MRF
 policies

Descriptions of MRF policies are gathered at compile-time and use
Pleroma.Docs.Generator.list_behaviour_implementations func, which
depends on modules implementing the queried behaviour to be loaded.
Otherwise descriptions for MRFs can be missing from the AdminAPI route.

Note: @behaviour cannot be injected in the __using__ macro. It causes a
loop in the compiler which leads to memory exhaustion. Hence why
@behaviour is still defined separately in the MRFs.
---
 .../web/activity_pub/mrf/activity_expiration_policy.ex    | 2 ++
 lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex | 6 +++---
 lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex | 4 +++-
 .../web/activity_pub/mrf/anti_mention_spam_policy.ex      | 4 +++-
 lib/pleroma/web/activity_pub/mrf/drop_policy.ex           | 4 +++-
 lib/pleroma/web/activity_pub/mrf/emoji_policy.ex          | 4 +++-
 lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex   | 6 ++++--
 lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex     | 3 +++
 .../web/activity_pub/mrf/force_bot_unlisted_policy.ex     | 7 +++++--
 lib/pleroma/web/activity_pub/mrf/force_mention.ex         | 3 ++-
 .../web/activity_pub/mrf/force_mentions_in_content.ex     | 4 +++-
 lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex        | 4 +++-
 lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex     | 7 ++++---
 lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex   | 2 ++
 lib/pleroma/web/activity_pub/mrf/keyword_policy.ex        | 6 ++++--
 .../web/activity_pub/mrf/media_proxy_warming_policy.ex    | 2 ++
 lib/pleroma/web/activity_pub/mrf/mention_policy.ex        | 3 ++-
 lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex       | 2 ++
 lib/pleroma/web/activity_pub/mrf/no_op_policy.ex          | 2 ++
 .../web/activity_pub/mrf/no_placeholder_text_policy.ex    | 2 ++
 lib/pleroma/web/activity_pub/mrf/normalize_markup.ex      | 4 +++-
 lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex       | 5 ++++-
 lib/pleroma/web/activity_pub/mrf/object_age_policy.ex     | 6 ++++--
 lib/pleroma/web/activity_pub/mrf/policy.ex                | 8 ++++++++
 lib/pleroma/web/activity_pub/mrf/quiet_reply.ex           | 4 +++-
 .../web/activity_pub/mrf/quote_to_link_tag_policy.ex      | 2 ++
 lib/pleroma/web/activity_pub/mrf/reject_non_public.ex     | 3 ++-
 lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex  | 2 ++
 lib/pleroma/web/activity_pub/mrf/simple_policy.ex         | 2 ++
 lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex    | 6 ++++--
 lib/pleroma/web/activity_pub/mrf/subchain_policy.ex       | 4 +++-
 lib/pleroma/web/activity_pub/mrf/tag_policy.ex            | 7 +++++--
 .../web/activity_pub/mrf/user_allow_list_policy.ex        | 6 ++++--
 lib/pleroma/web/activity_pub/mrf/vocabulary_policy.ex     | 3 ++-
 34 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex b/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
index 88f6ca028..41abe17c0 100644
--- a/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy do
   @moduledoc "Adds expiration to all local Create activities"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(activity) do
     activity =
diff --git a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex
index 8ea61aec2..990ff31c9 100644
--- a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy do
+  @moduledoc "Prevent followbots from following with a bit of heuristic"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
   alias Pleroma.User
 
-  @moduledoc "Prevent followbots from following with a bit of heuristic"
-
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   # XXX: this should become User.normalize_by_ap_id() or similar, really.
   defp normalize_by_ap_id(%{"id" => id}), do: User.get_cached_by_ap_id(id)
diff --git a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
index 2be6d8df4..5c3b66e37 100644
--- a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
@@ -3,9 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.User
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   require Logger
 
diff --git a/lib/pleroma/web/activity_pub/mrf/anti_mention_spam_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_mention_spam_policy.ex
index 1d76a307b..c6f5781b3 100644
--- a/lib/pleroma/web/activity_pub/mrf/anti_mention_spam_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/anti_mention_spam_policy.ex
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.AntiMentionSpamPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.User
   require Pleroma.Constants
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp user_has_posted?(%User{} = u), do: u.note_count > 0
 
diff --git a/lib/pleroma/web/activity_pub/mrf/drop_policy.ex b/lib/pleroma/web/activity_pub/mrf/drop_policy.ex
index cf07db7f3..4aa1968f7 100644
--- a/lib/pleroma/web/activity_pub/mrf/drop_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/drop_policy.ex
@@ -3,10 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.DropPolicy do
-  require Logger
   @moduledoc "Drop and log everything received"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  require Logger
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(activity) do
     Logger.debug("REJECTING #{inspect(activity)}")
diff --git a/lib/pleroma/web/activity_pub/mrf/emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/emoji_policy.ex
index 1de5280d9..cc5fd49bf 100644
--- a/lib/pleroma/web/activity_pub/mrf/emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/emoji_policy.ex
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.EmojiPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Pleroma.Constants
 
   alias Pleroma.Object.Updater
@@ -10,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.EmojiPolicy do
 
   @moduledoc "Reject or force-unlisted emojis with certain URLs or names"
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp config_remove_url do
     Pleroma.Config.get([:mrf_emoji, :remove_url], [])
diff --git a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
index f5983c8a7..6e43e746c 100644
--- a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
+++ b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
-  alias Pleroma.Object
-
   @moduledoc "Ensure a re: is prepended on replies to a post with a Subject"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  alias Pleroma.Object
+
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
 
   def history_awareness, do: :auto
diff --git a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
index 480a03ef6..4612b2cc5 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -4,12 +4,15 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
 
   require Logger
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(activity) do
     with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
diff --git a/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex b/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex
index 3b3251dc3..58d02f433 100644
--- a/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex
@@ -3,9 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy do
-  alias Pleroma.User
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
   @moduledoc "Remove bot posts from federated timeline"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
+  alias Pleroma.User
+
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   require Pleroma.Constants
 
diff --git a/lib/pleroma/web/activity_pub/mrf/force_mention.ex b/lib/pleroma/web/activity_pub/mrf/force_mention.ex
index 4ea23540d..62aff36bc 100644
--- a/lib/pleroma/web/activity_pub/mrf/force_mention.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_mention.ex
@@ -3,13 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.ForceMention do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
   require Pleroma.Constants
 
   alias Pleroma.Config
   alias Pleroma.Object
   alias Pleroma.User
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp get_author(url) do
     with %Object{data: %{"actor" => actor}} <- Object.normalize(url, fetch: false),
diff --git a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
index caae365e5..e7c3f2d88 100644
--- a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
@@ -3,13 +3,15 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Pleroma.Constants
 
   alias Pleroma.Formatter
   alias Pleroma.Object
   alias Pleroma.User
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   @impl true
   def history_awareness, do: :auto
diff --git a/lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex b/lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex
index 72f2274ed..a3fae3bae 100644
--- a/lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.HashtagPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Pleroma.Constants
 
   alias Pleroma.Config
@@ -14,7 +16,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.HashtagPolicy do
   Note: This MRF Policy is always enabled, if you want to disable it you have to set empty lists.
   """
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   @impl true
   def history_awareness, do: :manual
diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index 3a80d0a69..a84a7b0c8 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -3,13 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
+  @moduledoc "Block activities with too much mentions (configurable)"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.User
 
   require Pleroma.Constants
 
-  @moduledoc "Block activities with too much mentions (configurable)"
-
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp delist_activity(activity, threshold) when threshold > 0 do
     follower_collection = User.get_cached_by_ap_id(activity["actor"]).follower_address
diff --git a/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex b/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
index 51dcd3918..17879b4bd 100644
--- a/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy do
   @moduledoc "Force a quote line into the message content."
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   defp build_inline_quote(template, url) do
     quote_line = String.replace(template, "{url}", "<a href=\"#{url}\">#{url}</a>")
 
diff --git a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
index 6ba6fd509..44b79596e 100644
--- a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
@@ -3,13 +3,15 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
+  @moduledoc "Reject or Word-Replace activities with a keyword or regex"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Pleroma.Constants
 
   alias Pleroma.Web.ActivityPub.MRF.Utils
 
-  @moduledoc "Reject or Word-Replace activities with a keyword or regex"
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp string_matches?(string, pattern) when is_binary(pattern) do
     String.contains?(string, pattern)
diff --git a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
index 43c2c0449..07046a666 100644
--- a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
   @moduledoc "Preloads any attachments in the MediaProxy cache by prefetching them"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.HTTP
   alias Pleroma.Web.MediaProxy
 
diff --git a/lib/pleroma/web/activity_pub/mrf/mention_policy.ex b/lib/pleroma/web/activity_pub/mrf/mention_policy.ex
index f7bff121f..8e108a0ae 100644
--- a/lib/pleroma/web/activity_pub/mrf/mention_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/mention_policy.ex
@@ -4,9 +4,10 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.MentionPolicy do
   @moduledoc "Block activities which mention a user"
-
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(%{"type" => "Create"} = activity) do
     reject_actors = Pleroma.Config.get([:mrf_mention, :actors], [])
diff --git a/lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex b/lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex
index 08dd39878..8283fd504 100644
--- a/lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy do
   @moduledoc "Filter local activities which have no content"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Web.Endpoint
 
   @impl true
diff --git a/lib/pleroma/web/activity_pub/mrf/no_op_policy.ex b/lib/pleroma/web/activity_pub/mrf/no_op_policy.ex
index 64a5872bc..3adbb598a 100644
--- a/lib/pleroma/web/activity_pub/mrf/no_op_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/no_op_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoOpPolicy do
   @moduledoc "Does nothing (lets the messages go through unmodified)"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(activity) do
     {:ok, activity}
diff --git a/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex b/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
index c6f239a5e..2a10c7e97 100644
--- a/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy do
   @moduledoc "Ensure no content placeholder is present (such as the dot from mastodon)"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def history_awareness, do: :auto
 
diff --git a/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
index 91855ef84..de0f5b619 100644
--- a/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
+++ b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
@@ -4,9 +4,11 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkup do
   @moduledoc "Scrub configured hypertext markup"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.HTML
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   @impl true
   def history_awareness, do: :auto
diff --git a/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex b/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex
index 52aaf05aa..7e3ec3de5 100644
--- a/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex
@@ -38,6 +38,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.NsfwApiPolicy do
   - `unlist`: Unlist all detected NSFW content? Default: `false`
   - `reject`: Reject all detected NSFW content (takes precedence)? Default: `false`
   """
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.Constants
   alias Pleroma.HTTP
@@ -46,7 +48,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.NsfwApiPolicy do
   require Logger
   require Pleroma.Constants
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @policy :mrf_nsfw_api
 
   def build_request_url(url) do
diff --git a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
index 34905fc21..00f4cf84b 100644
--- a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
@@ -3,13 +3,15 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
+  @moduledoc "Filter activities depending on their age"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.User
 
   require Pleroma.Constants
 
-  @moduledoc "Filter activities depending on their age"
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp check_date(%{"object" => %{"published" => published}} = activity) do
     with %DateTime{} = now <- DateTime.utc_now(),
diff --git a/lib/pleroma/web/activity_pub/mrf/policy.ex b/lib/pleroma/web/activity_pub/mrf/policy.ex
index 08bcac08a..b9a693c9e 100644
--- a/lib/pleroma/web/activity_pub/mrf/policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/policy.ex
@@ -15,4 +15,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.Policy do
             }
   @callback history_awareness() :: :auto | :manual
   @optional_callbacks config_description: 0, history_awareness: 0, id_filter: 1
+
+  defmacro __using__(_) do
+    quote do
+      # Otherwise Pleroma.Docs.Generator.list_behaviour_implementations fails
+      # since the Elixir compiler doesn't automatically load the module since v1.19.
+      @compile {:autoload, true}
+    end
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/mrf/quiet_reply.ex b/lib/pleroma/web/activity_pub/mrf/quiet_reply.ex
index b3eb0b390..b47e9edb9 100644
--- a/lib/pleroma/web/activity_pub/mrf/quiet_reply.ex
+++ b/lib/pleroma/web/activity_pub/mrf/quiet_reply.ex
@@ -6,11 +6,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReply do
   @moduledoc """
   QuietReply alters the scope of activities from local users when replying by enforcing them to be "Unlisted" or "Quiet Public". This delivers the activity to all the expected recipients and instances, but it will not be published in the Federated / The Whole Known Network timelines. It will still be published to the Home timelines of the user's followers and visible to anyone who opens the thread.
   """
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Pleroma.Constants
 
   alias Pleroma.User
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   @impl true
   def history_awareness, do: :auto
diff --git a/lib/pleroma/web/activity_pub/mrf/quote_to_link_tag_policy.ex b/lib/pleroma/web/activity_pub/mrf/quote_to_link_tag_policy.ex
index 2a17b6761..e1ad17585 100644
--- a/lib/pleroma/web/activity_pub/mrf/quote_to_link_tag_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/quote_to_link_tag_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuoteToLinkTagPolicy do
   @moduledoc "Force a Link tag for posts quoting another post. (may break outgoing federation of quote posts with older Pleroma versions)"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes
 
   require Pleroma.Constants
diff --git a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
index 9d4a7a405..7d113dbf6 100644
--- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
+++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
@@ -4,11 +4,12 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
   @moduledoc "Rejects non-public (followers-only, direct) activities"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
   alias Pleroma.Config
   alias Pleroma.User
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   require Pleroma.Constants
 
diff --git a/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex b/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex
index 8422832dd..f9f8d2298 100644
--- a/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex
@@ -2,6 +2,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicy do
   @moduledoc "Drop remote reports if they don't contain enough information."
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
 
   @impl true
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index a97e8db7b..7045fe90f 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -6,6 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
   @moduledoc "Filter activities depending on their origin instance"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.FollowingRelationship
   alias Pleroma.User
diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 54f0e6bc1..f1e99aead 100644
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -3,12 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
+  @moduledoc "Detect new emojis by their shortcode and steals them"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   require Logger
 
   alias Pleroma.Config
 
-  @moduledoc "Detect new emojis by their shortcode and steals them"
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp accept_host?(host), do: host in Config.get([:mrf_steal_emoji, :hosts], [])
 
diff --git a/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex b/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex
index 97acca7e8..1fe7b00e9 100644
--- a/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex
@@ -3,12 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.SubchainPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
   alias Pleroma.Config
   alias Pleroma.Web.ActivityPub.MRF
 
   require Logger
 
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp lookup_subchain(actor) do
     with matches <- Config.get([:mrf_subchain, :match_actor]),
diff --git a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
index c236a5a99..df5594808 100644
--- a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
@@ -3,8 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
-  alias Pleroma.User
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
   @moduledoc """
      Apply policies based on user tags
 
@@ -18,6 +16,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
      - `mrf_tag:disable-remote-subscription`: Reject non-local follow requests
      - `mrf_tag:disable-any-subscription`: Reject any follow requests
   """
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
+  alias Pleroma.User
+
+  use Pleroma.Web.ActivityPub.MRF.Policy
 
   require Pleroma.Constants
 
diff --git a/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex b/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
index 10cc0e09d..a04ca90bd 100644
--- a/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy do
-  alias Pleroma.Config
-
   @moduledoc "Accept-list of users from specified instances"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  alias Pleroma.Config
+
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   defp filter_by_list(activity, []), do: {:ok, activity}
 
   defp filter_by_list(%{"actor" => actor} = activity, allow_list) do
diff --git a/lib/pleroma/web/activity_pub/mrf/vocabulary_policy.ex b/lib/pleroma/web/activity_pub/mrf/vocabulary_policy.ex
index 5671e4cf3..ecba3a2c6 100644
--- a/lib/pleroma/web/activity_pub/mrf/vocabulary_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/vocabulary_policy.ex
@@ -4,9 +4,10 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.VocabularyPolicy do
   @moduledoc "Filter activities which belong to certain activity vocabularies"
-
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  use Pleroma.Web.ActivityPub.MRF.Policy
+
   @impl true
   def filter(%{"type" => "Undo", "object" => object} = activity) do
     with {:ok, _} <- filter(object) do

From 2a23eacee899c69f55d8a3cb6ed8291b56c7187b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 14:58:32 +0100
Subject: [PATCH 024/163] Elixir 1.19: Only match once on structs

Second match is not needed and a simple Map update is recommended by
the compiler
---
 lib/pleroma/marker.ex                    | 2 +-
 lib/pleroma/web/api_spec/render_error.ex | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/marker.ex b/lib/pleroma/marker.ex
index 4f645240e..fab24d183 100644
--- a/lib/pleroma/marker.ex
+++ b/lib/pleroma/marker.ex
@@ -78,7 +78,7 @@ defmodule Pleroma.Marker do
 
   defp get_marker(user, timeline) do
     case Repo.find_resource(get_query(user, timeline)) do
-      {:ok, %__MODULE__{} = marker} -> %__MODULE__{marker | user: user}
+      {:ok, %__MODULE__{} = marker} -> %{marker | user: user}
       _ -> %__MODULE__{timeline: timeline, user_id: user.id}
     end
   end
diff --git a/lib/pleroma/web/api_spec/render_error.ex b/lib/pleroma/web/api_spec/render_error.ex
index acf510774..2ba76f250 100644
--- a/lib/pleroma/web/api_spec/render_error.ex
+++ b/lib/pleroma/web/api_spec/render_error.ex
@@ -18,10 +18,10 @@ defmodule Pleroma.Web.ApiSpec.RenderError do
     errors =
       Enum.map(errors, fn
         %OpenApiSpex.Cast.Error{name: nil, reason: :invalid_enum} = err ->
-          %OpenApiSpex.Cast.Error{err | name: err.value}
+          %{err | name: err.value}
 
         %OpenApiSpex.Cast.Error{name: nil} = err ->
-          %OpenApiSpex.Cast.Error{err | name: List.last(err.path)}
+          %{err | name: List.last(err.path)}
 
         err ->
           err

From c455e0225581e3ebe43e9ef51a7ee393d8e87bdd Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 15:21:41 +0100
Subject: [PATCH 025/163] Elixir 1.19: Add non-test Elixir files in test/ to
 mix.exs filter

This is a new filter introduced in 1.19.
---
 mix.exs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mix.exs b/mix.exs
index dc9fa31f5..60064e846 100644
--- a/mix.exs
+++ b/mix.exs
@@ -15,6 +15,13 @@ defmodule Pleroma.Mixfile do
       aliases: aliases(),
       deps: deps(),
       test_coverage: [tool: :covertool, summary: true],
+      test_ignore_filters: [
+        "test/credo/check/consistency/file_location.ex",
+        "test/fixtures/config/temp.exported_from_db.secret.exs",
+        "test/fixtures/config/temp.secret.exs",
+        "test/fixtures/modules/good_mrf.ex",
+        "test/fixtures/modules/runtime_module.ex"
+      ],
       # Docs
       name: "Pleroma",
       homepage_url: "https://pleroma.social/",

From a4c929c527353f99cd11aeb9c08a44f212632f12 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 20:44:26 +0100
Subject: [PATCH 026/163] Lint

---
 lib/pleroma/config/deprecation_warnings.ex         |  4 ++--
 lib/pleroma/web/activity_pub/mrf/keyword_policy.ex |  1 -
 test/pleroma/application_test.exs                  |  6 ++++--
 test/pleroma/config/deprecation_warnings_test.exs  | 10 ++++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 8dabd728f..8f56a3771 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -418,11 +418,11 @@ defmodule Pleroma.Config.DeprecationWarnings do
   end
 
   @spec check_deprecated_logger_config() :: :ok | :error
-  def check_deprecated_logger_config() do
+  def check_deprecated_logger_config do
     if Application.get_env(:logger, :backends) do
       Logger.warning(
         "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
-        "Use 'config :pleroma, :logger, backends: [...]' instead."
+          "Use 'config :pleroma, :logger, backends: [...]' instead."
       )
 
       :error
diff --git a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
index 44b79596e..33f32e781 100644
--- a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
@@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
 
   alias Pleroma.Web.ActivityPub.MRF.Utils
 
-
   use Pleroma.Web.ActivityPub.MRF.Policy
 
   defp string_matches?(string, pattern) when is_binary(pattern) do
diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
index 48f87818f..b4a29fc9b 100644
--- a/test/pleroma/application_test.exs
+++ b/test/pleroma/application_test.exs
@@ -15,7 +15,9 @@ defmodule Pleroma.ApplicationTest do
     test "is handled" do
       log = capture_log(fn -> Pleroma.Application.configure_logger() end)
 
-      assert log =~ "Configuration {:ex_syslogger, :ex_syslogger} is incorrect. Use {ExSyslogger, :ex_syslogger} instead!"
+      assert log =~
+               "Configuration {:ex_syslogger, :ex_syslogger} is incorrect. Use {ExSyslogger, :ex_syslogger} instead!"
+
       assert log =~ "Successfully added logger backend: {ExSyslogger, :ex_syslogger}"
     end
   end
@@ -27,7 +29,7 @@ defmodule Pleroma.ApplicationTest do
 
     test "emits a warning" do
       assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
-        ":console is no longer considered a backend and is enabled by default"
+               ":console is no longer considered a backend and is enabled by default"
     end
   end
 end
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 1491f4ea3..5383e2bce 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -394,13 +394,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
 
       on_exit(fn ->
-        Application.delete_env(:logger, :backends) end)
+        Application.delete_env(:logger, :backends)
+      end)
     end
 
     test "warns on deprecated syntax" do
-      assert capture_log(fn -> Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config() end) =~
-        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
+      assert capture_log(fn ->
+               Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
+             end) =~
+               "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
     end
   end
-
 end

From a4137243b62795b6299248ccf11f80ccda059d56 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 21:07:06 +0100
Subject: [PATCH 027/163] Elixir 1.19: Reword Logger backends deprecation
 warning

---
 lib/pleroma/config/deprecation_warnings.ex        | 15 +++++++++++----
 test/pleroma/config/deprecation_warnings_test.exs | 12 +++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 8f56a3771..8b8628862 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -420,10 +420,17 @@ defmodule Pleroma.Config.DeprecationWarnings do
   @spec check_deprecated_logger_config() :: :ok | :error
   def check_deprecated_logger_config do
     if Application.get_env(:logger, :backends) do
-      Logger.warning(
-        "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
-          "Use 'config :pleroma, :logger, backends: [...]' instead."
-      )
+      Logger.warning("""
+      !!!DEPRECATION WARNING!!!
+      Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
+      `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
+      Please update your configuration at your earliest convenience to use:
+        `config :pleroma, :logger, backends: [...]`
+      Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+      Note: :console is no longer considered a backend and is used by default, you can disable it using:
+        `config :logger, :default_handler: false`
+      """)
 
       :error
     else
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 5383e2bce..a9a71be36 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -402,7 +402,17 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       assert capture_log(fn ->
                Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
              end) =~
-               "'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
+               """
+               !!!DEPRECATION WARNING!!!
+               Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
+               `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
+               Please update your configuration at your earliest convenience to use:
+                 `config :pleroma, :logger, backends: [...]`
+               Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+               Note: :console is no longer considered a backend and is used by default, you can disable it using:
+                 `config :logger, :default_handler: false`
+               """
     end
   end
 end

From 6ffd25682d4a0e6cebe9b0c8789c76bb9e8a312d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 21:18:08 +0100
Subject: [PATCH 028/163] Elixir 1.19: Add deprecation warning for :logger,
 :console configs

---
 lib/pleroma/config/deprecation_warnings.ex    | 30 +++++++++++---
 .../config/deprecation_warnings_test.exs      | 41 +++++++++++++------
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 8b8628862..f38fb7f2f 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -419,22 +419,42 @@ defmodule Pleroma.Config.DeprecationWarnings do
 
   @spec check_deprecated_logger_config() :: :ok | :error
   def check_deprecated_logger_config do
-    if Application.get_env(:logger, :backends) do
+    backend = if Application.get_env(:logger, :backends) do
       Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
       `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
       Please update your configuration at your earliest convenience to use:
-        `config :pleroma, :logger, backends: [...]`
+        `config :logger, backends: [...]`
       Pleroma's default configuration will be updated in the next release which WILL override your settings.
 
-      Note: :console is no longer considered a backend and is used by default, you can disable it using:
+      Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
         `config :logger, :default_handler: false`
       """)
 
-      :error
+      true
     else
-      :ok
+      false
     end
+
+    console = if Application.get_env(:logger, :console) do
+      Logger.warning("""
+      !!!DEPRECATION WARNING!!!
+      Your configuration is using deprecated syntax for configuring logging to console.
+      `config :logger, :console` is deprecated syntax due to changes in Elixir.
+      Please update your configuration at your earliest convenience to use
+        `config :logger, default_handler` and `config :logger, :default_formatter`.
+      Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+      Note: `:default_handler` is used only for the `level` setting. All other configurations go under
+      `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
+      """)
+
+      true
+    else
+      false
+    end
+
+    if backend or console, do: :error, else: :ok
   end
 end
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index a9a71be36..f5b9d76d3 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -392,27 +392,44 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
   describe "check_deprecated_logger_config" do
     setup do
       Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
+      Application.put_env(:logger, :console, level: :warning)
 
       on_exit(fn ->
         Application.delete_env(:logger, :backends)
+        Application.delete_env(:logger, :console)
       end)
     end
 
     test "warns on deprecated syntax" do
-      assert capture_log(fn ->
+      log = capture_log(fn ->
                Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
-             end) =~
-               """
-               !!!DEPRECATION WARNING!!!
-               Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
-               `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
-               Please update your configuration at your earliest convenience to use:
-                 `config :pleroma, :logger, backends: [...]`
-               Pleroma's default configuration will be updated in the next release which WILL override your settings.
+             end)
 
-               Note: :console is no longer considered a backend and is used by default, you can disable it using:
-                 `config :logger, :default_handler: false`
-               """
+      assert log =~
+         """
+         !!!DEPRECATION WARNING!!!
+         Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
+         `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
+         Please update your configuration at your earliest convenience to use:
+           `config :logger, backends: [...]`
+         Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+         Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
+           `config :logger, :default_handler: false`
+         """
+
+      assert log =~
+         """
+         !!!DEPRECATION WARNING!!!
+         Your configuration is using deprecated syntax for configuring logging to console.
+         `config :logger, :console` is deprecated syntax due to changes in Elixir.
+         Please update your configuration at your earliest convenience to use
+           `config :logger, default_handler` and `config :logger, :default_formatter`.
+         Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+         Note: `:default_handler` is used only for the `level` setting. All other configurations go under
+         `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
+         """
     end
   end
 end

From a5bd4e0d9230fe9aaad4722681ed12aec0cb5301 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 21:31:07 +0100
Subject: [PATCH 029/163] Partially revert "Elixir 1.19: Refactor Logger
 configuration to what Elixir 1.15+ expects"

This partially reverts commit fc35204cc1d718ba7815cc5e1b08746202b4f7dc.
---
 config/config.exs                |  9 ++++-----
 config/dev.exs                   |  2 +-
 config/prod.exs                  |  3 ++-
 config/test.exs                  | 10 +++-------
 docs/configuration/cheatsheet.md |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 08311146e..5bf2c5c2e 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -132,12 +132,11 @@ config :pleroma, Pleroma.Web.Endpoint,
     "SameSite=Lax"
   ]
 
-# config :logger, :console has been changed in 1.15+ and split into
-# :default_handler and :default_formatter. It started emitting warnings in 1.19.
-# See https://hexdocs.pm/logger/1.19.0/Logger.html#module-backends-and-backwards-compatibility
-config :logger, :default_handler, level: :debug
+# Configures Elixir's Logger
+config :logger, backends: [:console]
 
-config :logger, :default_formatter,
+config :logger, :console,
+  level: :debug,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:actor, :path, :type, :user]
 
diff --git a/config/dev.exs b/config/dev.exs
index e86bdb7fd..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, :default_formatter, 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 1dfbbe937..2d252bf02 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -20,7 +20,8 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, :default_handler, level: :info
+config :logger, Logger.Backends.Console, level: :info
+config :logger, :console, level: :info
 config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
diff --git a/config/test.exs b/config/test.exs
index 5b7f3b1ed..9652b7d4b 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -15,13 +15,9 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, :default_handler, level: :warning
-
-config :logger, :default_formatter,
-  format: "\n[$level] $message\n",
-  colors: [
-    enabled: false
-  ]
+config :logger, :console,
+  level: :warning,
+  format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 01d81f6ca..b0a7087a7 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -886,7 +886,7 @@ See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_s
 An example of logging info to local syslog, but debug to console:
 ```elixir
 config :pleroma, :logger,
-  backends: [ {ExSyslogger, :ex_syslogger}]
+  backends: [{ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
   level: :info,

From aed0eb33331568b38c14b83d753c671b8336cb38 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 13 Jan 2026 23:28:57 +0100
Subject: [PATCH 030/163] Elixir 1.19: Warn on old config of :console Logger
 and conflicts

---
 lib/pleroma/config/deprecation_warnings.ex    | 122 +++++++++++++-----
 .../config/deprecation_warnings_test.exs      |  47 +++----
 2 files changed, 115 insertions(+), 54 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index f38fb7f2f..ee3965b64 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -419,42 +419,102 @@ defmodule Pleroma.Config.DeprecationWarnings do
 
   @spec check_deprecated_logger_config() :: :ok | :error
   def check_deprecated_logger_config do
-    backend = if Application.get_env(:logger, :backends) do
-      Logger.warning("""
-      !!!DEPRECATION WARNING!!!
-      Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
-      `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
-      Please update your configuration at your earliest convenience to use:
-        `config :logger, backends: [...]`
-      Pleroma's default configuration will be updated in the next release which WILL override your settings.
+    mix_env = Pleroma.Config.get(:env)
+    config_file_name = "config/#{mix_env}.secret.exs"
+    config_file = File.read(config_file_name)
 
-      Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
-        `config :logger, :default_handler: false`
-      """)
+    config_file =
+      case config_file do
+        {:ok, contents} ->
+          String.split(contents, "\n", trim: true)
+          |> Enum.reject(fn string -> String.starts_with?(string, "#") end)
+          |> Enum.join("\n")
 
-      true
-    else
-      false
-    end
+        _ ->
+          false
+      end
 
-    console = if Application.get_env(:logger, :console) do
-      Logger.warning("""
-      !!!DEPRECATION WARNING!!!
-      Your configuration is using deprecated syntax for configuring logging to console.
-      `config :logger, :console` is deprecated syntax due to changes in Elixir.
-      Please update your configuration at your earliest convenience to use
-        `config :logger, default_handler` and `config :logger, :default_formatter`.
-      Pleroma's default configuration will be updated in the next release which WILL override your settings.
+    declared_deprecated_backend =
+      if is_binary(config_file) do
+        String.contains?(config_file, "config :logger, backends") or
+          String.contains?(config_file, "config :logger,\n  backends")
+      else
+        nil
+      end
 
-      Note: `:default_handler` is used only for the `level` setting. All other configurations go under
-      `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
-      """)
+    declared_deprecated_console =
+      if is_binary(config_file) do
+        String.contains?(config_file, "config :logger, :console") or
+          String.contains?(config_file, "config :logger,\n  console")
+      else
+        nil
+      end
 
-      true
-    else
-      false
-    end
+    # We can't use Application.get_env/3, because by default default_formatter is populated
+    declared_new_console =
+      if is_binary(config_file) do
+        String.contains?(config_file, "config :logger, :default_handler") or
+          String.contains?(config_file, "config :logger,\n  :default_handler") or
+          String.contains?(config_file, "config :logger, :default_formatter") or
+          String.contains?(config_file, "config :logger,\n  :default_formatter")
+      else
+        nil
+      end
 
-    if backend or console, do: :error, else: :ok
+    use_new_backend_config = Pleroma.Config.get([:logger, :backends])
+
+    backend =
+      if declared_deprecated_backend do
+        Logger.warning("""
+        !!!DEPRECATION WARNING!!!
+        Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
+        `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
+        Please update your configuration at your earliest convenience to use:
+          `config :logger, backends: [...]`
+        Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+        Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
+          `config :logger, :default_handler: false`
+        """)
+
+        true
+      else
+        false
+      end
+
+    console =
+      if declared_deprecated_console do
+        Logger.warning("""
+        !!!DEPRECATION WARNING!!!
+        Your configuration is using deprecated syntax for configuring logging to console.
+        `config :logger, :console` is deprecated syntax due to changes in Elixir.
+        Please update your configuration at your earliest convenience to use
+          `config :logger, default_handler` and `config :logger, :default_formatter`.
+        Pleroma's default configuration will be updated in the next release which WILL override your settings.
+
+        Note: `:default_handler` is used only for the `level` setting. All other configurations go under
+        `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
+        """)
+
+        true
+      else
+        false
+      end
+
+    conflict =
+      if (!is_nil(use_new_backend_config) and declared_deprecated_backend) or
+           (declared_new_console and declared_deprecated_console) do
+        Logger.warning("""
+        !!!CONFIGURATION CONFLICT!!!
+        Pleroma has detected that both the deprecated way of configuring Logger and the new way are defined in your configuration.
+        Delete the deprecated configuration syntax.
+        """)
+
+        true
+      else
+        false
+      end
+
+    if backend or console or conflict, do: :error, else: :ok
   end
 end
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index f5b9d76d3..cf2c6b4d2 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -401,35 +401,36 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
     end
 
     test "warns on deprecated syntax" do
-      log = capture_log(fn ->
-               Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
-             end)
+      log =
+        capture_log(fn ->
+          Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
+        end)
 
       assert log =~
-         """
-         !!!DEPRECATION WARNING!!!
-         Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
-         `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
-         Please update your configuration at your earliest convenience to use:
-           `config :logger, backends: [...]`
-         Pleroma's default configuration will be updated in the next release which WILL override your settings.
+               """
+               !!!DEPRECATION WARNING!!!
+               Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
+               `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
+               Please update your configuration at your earliest convenience to use:
+                 `config :logger, backends: [...]`
+               Pleroma's default configuration will be updated in the next release which WILL override your settings.
 
-         Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
-           `config :logger, :default_handler: false`
-         """
+               Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
+                 `config :logger, :default_handler: false`
+               """
 
       assert log =~
-         """
-         !!!DEPRECATION WARNING!!!
-         Your configuration is using deprecated syntax for configuring logging to console.
-         `config :logger, :console` is deprecated syntax due to changes in Elixir.
-         Please update your configuration at your earliest convenience to use
-           `config :logger, default_handler` and `config :logger, :default_formatter`.
-         Pleroma's default configuration will be updated in the next release which WILL override your settings.
+               """
+               !!!DEPRECATION WARNING!!!
+               Your configuration is using deprecated syntax for configuring logging to console.
+               `config :logger, :console` is deprecated syntax due to changes in Elixir.
+               Please update your configuration at your earliest convenience to use
+                 `config :logger, default_handler` and `config :logger, :default_formatter`.
+               Pleroma's default configuration will be updated in the next release which WILL override your settings.
 
-         Note: `:default_handler` is used only for the `level` setting. All other configurations go under
-         `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
-         """
+               Note: `:default_handler` is used only for the `level` setting. All other configurations go under
+               `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
+               """
     end
   end
 end

From bd0c5aa748d226d109aeec7462ac9e6ba8d12f75 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 14 Jan 2026 11:09:57 +0100
Subject: [PATCH 031/163] Elixir 1.19: Move default configs to the new Logger
 configuration, again

Trying to do a two-release migration proved to be very hacky and ugly.
Instead this is preparation for moving defaults first and then merging
the old configuration left in admin's config file at runtime while still
emitting a warning. This hopefully will be a lot nicer and less
complicated.
---
 config/config.exs | 5 ++---
 config/dev.exs    | 2 +-
 config/prod.exs   | 3 +--
 config/test.exs   | 5 ++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 5bf2c5c2e..069c0c7c0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -133,10 +133,9 @@ config :pleroma, Pleroma.Web.Endpoint,
   ]
 
 # Configures Elixir's Logger
-config :logger, backends: [:console]
+config :logger, :default_handler, level: :debug
 
-config :logger, :console,
-  level: :debug,
+config :logger, :default_formatter,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:actor, :path, :type, :user]
 
diff --git a/config/dev.exs b/config/dev.exs
index 14cf4a6dc..e86bdb7fd 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, Logger.Backends.Console, format: "$metadata[$level] $message\n"
+config :logger, :default_formatter, 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 2d252bf02..1dfbbe937 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -20,8 +20,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 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, :default_handler, level: :info
 config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
diff --git a/config/test.exs b/config/test.exs
index 9652b7d4b..083759327 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -15,9 +15,8 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, :console,
-  level: :warning,
-  format: "\n[$level] $message\n"
+config :logger, :default_handler, level: :warning
+config :logger, :default_formatter, format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 

From 9450fba83d10fca74e013708bd12406520ef9788 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 14 Jan 2026 13:45:20 +0100
Subject: [PATCH 032/163] Elixir 1.19: Disable colors for logging in test env

Color ANSI codes end up in the capture_log output and break existing
tests.
---
 config/test.exs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/test.exs b/config/test.exs
index 083759327..ed5283a26 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -16,7 +16,10 @@ config :pleroma, Pleroma.Captcha,
 
 # Print only warnings and errors during test
 config :logger, :default_handler, level: :warning
-config :logger, :default_formatter, format: "\n[$level] $message\n"
+
+config :logger, :default_formatter,
+  format: "\n[$level] $message\n",
+  colors: [enabled: false]
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 

From 0f262bb2f3238bf8d999d22e3a4a45bcbc7fc301 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 14 Jan 2026 13:49:31 +0100
Subject: [PATCH 033/163] Elixir 1.19: Replace ugly old logger config checks
 with config merging

Side note: Going up in log levels doesn't work properly.
 - debug->info works
 - info->debug does not work
---
 lib/pleroma/application.ex                    |  3 +
 lib/pleroma/config/deprecation_warnings.ex    | 88 ++++++-------------
 .../config/deprecation_warnings_test.exs      | 20 ++++-
 3 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 0e8723251..78073b430 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -132,6 +132,9 @@ defmodule Pleroma.Application do
       {:ok, _} ->
         Logger.debug("Successfully added logger backend: #{inspect(backend)}")
 
+      {:error, :already_present} ->
+        :ok
+
       {:error, reason} ->
         Logger.error("Failed to add logger backend #{inspect(backend)}: #{inspect(reason)}")
     end
diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index ee3965b64..4b6281e01 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -20,6 +20,9 @@ defmodule Pleroma.Config.DeprecationWarnings do
      "\n* `config :pleroma, :instance, mrf_transparency_exclusions` is now `config :pleroma, :mrf, transparency_exclusions`"}
   ]
 
+  @logger_config_knobs [:level, :translator_inspect_opts]
+  @logger_formatter_config_knows [:colors, :format, :metadata, :truncate, :utc_log]
+
   def check_exiftool_filter do
     filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
 
@@ -417,54 +420,33 @@ defmodule Pleroma.Config.DeprecationWarnings do
     end
   end
 
+  defp merge_deprecated_logger_config(config) do
+    handler_config = Enum.filter(config, fn {k, _} -> k in @logger_config_knobs end)
+    formatter_config = Enum.filter(config, fn {k, _} -> k in @logger_formatter_config_knows end)
+    formatter = Logger.default_formatter(formatter_config)
+
+    Logger.debug("""
+    Reconfiguring console Logger with deprecated configuration syntax.
+      Handler configuration:
+        #{inspect(handler_config)}
+
+      Formatter:
+        #{inspect(formatter)}
+    """)
+
+    Logger.configure(handler_config)
+    :logger.update_handler_config(:default, :formatter, formatter)
+  end
+
   @spec check_deprecated_logger_config() :: :ok | :error
   def check_deprecated_logger_config do
-    mix_env = Pleroma.Config.get(:env)
-    config_file_name = "config/#{mix_env}.secret.exs"
-    config_file = File.read(config_file_name)
-
-    config_file =
-      case config_file do
-        {:ok, contents} ->
-          String.split(contents, "\n", trim: true)
-          |> Enum.reject(fn string -> String.starts_with?(string, "#") end)
-          |> Enum.join("\n")
-
-        _ ->
-          false
-      end
-
-    declared_deprecated_backend =
-      if is_binary(config_file) do
-        String.contains?(config_file, "config :logger, backends") or
-          String.contains?(config_file, "config :logger,\n  backends")
-      else
-        nil
-      end
-
-    declared_deprecated_console =
-      if is_binary(config_file) do
-        String.contains?(config_file, "config :logger, :console") or
-          String.contains?(config_file, "config :logger,\n  console")
-      else
-        nil
-      end
-
-    # We can't use Application.get_env/3, because by default default_formatter is populated
-    declared_new_console =
-      if is_binary(config_file) do
-        String.contains?(config_file, "config :logger, :default_handler") or
-          String.contains?(config_file, "config :logger,\n  :default_handler") or
-          String.contains?(config_file, "config :logger, :default_formatter") or
-          String.contains?(config_file, "config :logger,\n  :default_formatter")
-      else
-        nil
-      end
-
-    use_new_backend_config = Pleroma.Config.get([:logger, :backends])
+    backends_config = Application.get_env(:logger, :backends)
+    console_config = Application.get_env(:logger, :console)
 
+    # Note: No need to merge the old backends config since it still works.
+    # And new configuration will just add new Logger backends.
     backend =
-      if declared_deprecated_backend do
+      if backends_config do
         Logger.warning("""
         !!!DEPRECATION WARNING!!!
         Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
@@ -483,7 +465,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
       end
 
     console =
-      if declared_deprecated_console do
+      if console_config do
         Logger.warning("""
         !!!DEPRECATION WARNING!!!
         Your configuration is using deprecated syntax for configuring logging to console.
@@ -496,25 +478,13 @@ defmodule Pleroma.Config.DeprecationWarnings do
         `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
         """)
 
-        true
-      else
-        false
-      end
-
-    conflict =
-      if (!is_nil(use_new_backend_config) and declared_deprecated_backend) or
-           (declared_new_console and declared_deprecated_console) do
-        Logger.warning("""
-        !!!CONFIGURATION CONFLICT!!!
-        Pleroma has detected that both the deprecated way of configuring Logger and the new way are defined in your configuration.
-        Delete the deprecated configuration syntax.
-        """)
+        merge_deprecated_logger_config(console_config)
 
         true
       else
         false
       end
 
-    if backend or console or conflict, do: :error, else: :ok
+    if backend or console, do: :error, else: :ok
   end
 end
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index cf2c6b4d2..787f9d2fd 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -392,11 +392,12 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
   describe "check_deprecated_logger_config" do
     setup do
       Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
-      Application.put_env(:logger, :console, level: :warning)
+      Application.put_env(:logger, :console, level: :debug)
 
       on_exit(fn ->
         Application.delete_env(:logger, :backends)
         Application.delete_env(:logger, :console)
+        :logger.update_handler_config(:default, :formatter, Logger.default_formatter())
       end)
     end
 
@@ -432,5 +433,22 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
                `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
                """
     end
+
+    test "reconfigures logger" do
+      log =
+        capture_log(fn ->
+          Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
+        end)
+
+      # Formatter has inconsitent color formatting order
+      assert log =~
+               """
+               Reconfiguring console Logger with deprecated configuration syntax.
+                 Handler configuration:
+                   [level: :debug]
+
+                 Formatter:
+               """
+    end
   end
 end

From 02fc770e3638de20592fdaab115a041cda05f952 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 14 Jan 2026 15:02:51 +0100
Subject: [PATCH 034/163] Elixir 1.19: Improve DeprecationWarningsTest Logger
 reconfiguration test

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

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 787f9d2fd..a6ccf063c 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -11,6 +11,8 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
   alias Pleroma.Config
   alias Pleroma.Config.DeprecationWarnings
 
+  require Logger
+
   describe "filter exiftool" do
     test "gives warning when still used" do
       clear_config(
@@ -392,11 +394,12 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
   describe "check_deprecated_logger_config" do
     setup do
       Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
-      Application.put_env(:logger, :console, level: :debug)
+      Application.put_env(:logger, :console, level: :info)
 
       on_exit(fn ->
         Application.delete_env(:logger, :backends)
         Application.delete_env(:logger, :console)
+        Logger.configure(level: :debug)
         :logger.update_handler_config(:default, :formatter, Logger.default_formatter())
       end)
     end
@@ -435,20 +438,18 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
     end
 
     test "reconfigures logger" do
-      log =
+      empty_log =
         capture_log(fn ->
-          Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
+          Logger.debug("This should not be logged")
         end)
 
-      # Formatter has inconsitent color formatting order
-      assert log =~
-               """
-               Reconfiguring console Logger with deprecated configuration syntax.
-                 Handler configuration:
-                   [level: :debug]
+      logged =
+        capture_log(fn ->
+          Logger.info("This should be logged")
+        end)
 
-                 Formatter:
-               """
+      assert empty_log =~ ""
+      assert logged =~ "This should be logged"
     end
   end
 end

From 829a60ce9365ddc69655cc8e88f625dfa17c5e96 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 15 Jan 2026 16:03:44 +0100
Subject: [PATCH 035/163] Elixir 1.19 MRFTest: Replace matchable_regexes with
 regexes_match! func

---
 test/pleroma/web/activity_pub/mrf_test.exs | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/pleroma/web/activity_pub/mrf_test.exs b/test/pleroma/web/activity_pub/mrf_test.exs
index 6656a01b8..401d4ebb3 100644
--- a/test/pleroma/web/activity_pub/mrf_test.exs
+++ b/test/pleroma/web/activity_pub/mrf_test.exs
@@ -10,22 +10,25 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
   alias Pleroma.Web.ActivityPub.MRF
 
+  defp regexes_match!([],[]), do: true
+
+  defp regexes_match!([authority | authority_rest], [checked | checked_rest]) do
+    authority.source == checked.source and regexes_match!(authority_rest, checked_rest)
+  end
+
+  defp regexes_match!(_, _), do: false
+
   test "subdomains_regex/1" do
     regexes = MRF.subdomains_regex(["unsafe.tld", "*.unsafe.tld"])
-    matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-    assert matchable_regexes == [
-             ~r/^unsafe.tld$/i.source,
-             ~r/^(.*\.)*unsafe.tld$/i.source
-           ]
+    assert regexes_match!(regexes, [~r/^unsafe.tld$/i, ~r/^(.*\.)*unsafe.tld$/i])
   end
 
   describe "subdomain_match/2" do
     test "common domains" do
       regexes = MRF.subdomains_regex(["unsafe.tld", "unsafe2.tld"])
-      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert matchable_regexes == [~r/^unsafe.tld$/i.source, ~r/^unsafe2.tld$/i.source]
+      assert regexes_match!(regexes, [~r/^unsafe.tld$/i, ~r/^unsafe2.tld$/i])
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "unsafe2.tld")
@@ -35,9 +38,8 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "wildcard domains with one subdomain" do
       regexes = MRF.subdomains_regex(["*.unsafe.tld"])
-      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert matchable_regexes == [~r/^(.*\.)*unsafe.tld$/i.source]
+      assert regexes_match!(regexes, [~r/^(.*\.)*unsafe.tld$/i])
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "sub.unsafe.tld")
@@ -47,9 +49,8 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "wildcard domains with two subdomains" do
       regexes = MRF.subdomains_regex(["*.unsafe.tld"])
-      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert matchable_regexes == [~r/^(.*\.)*unsafe.tld$/i.source]
+      assert regexes_match!(regexes, [~r/^(.*\.)*unsafe.tld$/i])
 
       assert MRF.subdomain_match?(regexes, "unsafe.tld")
       assert MRF.subdomain_match?(regexes, "sub.sub.unsafe.tld")
@@ -59,9 +60,8 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
     test "matches are case-insensitive" do
       regexes = MRF.subdomains_regex(["UnSafe.TLD", "UnSAFE2.Tld"])
-      matchable_regexes = Enum.map(regexes, fn r -> r.source end)
 
-      assert matchable_regexes == [~r/^UnSafe.TLD$/i.source, ~r/^UnSAFE2.Tld$/i.source]
+      assert regexes_match!(regexes, [~r/^UnSafe.TLD$/i, ~r/^UnSAFE2.Tld$/i])
 
       assert MRF.subdomain_match?(regexes, "UNSAFE.TLD")
       assert MRF.subdomain_match?(regexes, "UNSAFE2.TLD")

From ad7ab7741b1d426554765401c92857500f432c6c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 15 Jan 2026 16:36:59 +0100
Subject: [PATCH 036/163] Elixir 1.19: Update dependencies in docs

Elixir 1.15 support only OTP>=24
---
 docs/installation/generic_dependencies.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include
index 588a6c019..382f07a6c 100644
--- a/docs/installation/generic_dependencies.include
+++ b/docs/installation/generic_dependencies.include
@@ -1,8 +1,8 @@
 ## Required dependencies
 
 * PostgreSQL >=11.0
-* Elixir >=1.15.0 <1.19
-* Erlang OTP >=23.0.0 (supported: <28)
+* Elixir >=1.15.0, <1.20
+* Erlang OTP >=24.0.0 (supported: <29)
 * git
 * file / libmagic
 * gcc or clang

From b75f8f7c9addbd73f88ac468473e23aef86b55fa Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 15 Jan 2026 16:56:01 +0100
Subject: [PATCH 037/163] Elixir 1.19: Added changelogs

---
 changelog.d/elixir-1-19.fix        | 1 +
 changelog.d/logger-backends.change | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/elixir-1-19.fix
 create mode 100644 changelog.d/logger-backends.change

diff --git a/changelog.d/elixir-1-19.fix b/changelog.d/elixir-1-19.fix
new file mode 100644
index 000000000..53079b0f7
--- /dev/null
+++ b/changelog.d/elixir-1-19.fix
@@ -0,0 +1 @@
+Fixed Elixir 1.19 warnings
diff --git a/changelog.d/logger-backends.change b/changelog.d/logger-backends.change
new file mode 100644
index 000000000..5f044c2c7
--- /dev/null
+++ b/changelog.d/logger-backends.change
@@ -0,0 +1 @@
+Changed how Logger is configured due to changes in Elixir and added deprecation warnings for the old configuration format

From 0ac1b65ba95b9bc3382494a84432bb8ecf088771 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 21 Jan 2026 18:39:15 +0100
Subject: [PATCH 038/163] Elixir 1.19: Fix improper deprecation warning wording

---
 lib/pleroma/config/deprecation_warnings.ex        | 4 +---
 test/pleroma/config/deprecation_warnings_test.exs | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 4b6281e01..4f68c141c 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -452,8 +452,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
         Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
         `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
         Please update your configuration at your earliest convenience to use:
-          `config :logger, backends: [...]`
-        Pleroma's default configuration will be updated in the next release which WILL override your settings.
+          `config :pleroma, :logger, backends: [...]`
 
         Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
           `config :logger, :default_handler: false`
@@ -472,7 +471,6 @@ defmodule Pleroma.Config.DeprecationWarnings do
         `config :logger, :console` is deprecated syntax due to changes in Elixir.
         Please update your configuration at your earliest convenience to use
           `config :logger, default_handler` and `config :logger, :default_formatter`.
-        Pleroma's default configuration will be updated in the next release which WILL override your settings.
 
         Note: `:default_handler` is used only for the `level` setting. All other configurations go under
         `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index a6ccf063c..221609da0 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -416,8 +416,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
                Your configuration is using deprecated syntax for configuring backends of Elixir's logger.
                `config :logger, backends: [...]` is deprecated syntax due to changes in Elixir.
                Please update your configuration at your earliest convenience to use:
-                 `config :logger, backends: [...]`
-               Pleroma's default configuration will be updated in the next release which WILL override your settings.
+                 `config :pleroma, :logger, backends: [...]`
 
                Note: `:console` is no longer considered a backend and is used by default, you can disable it using:
                  `config :logger, :default_handler: false`
@@ -430,7 +429,6 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
                `config :logger, :console` is deprecated syntax due to changes in Elixir.
                Please update your configuration at your earliest convenience to use
                  `config :logger, default_handler` and `config :logger, :default_formatter`.
-               Pleroma's default configuration will be updated in the next release which WILL override your settings.
 
                Note: `:default_handler` is used only for the `level` setting. All other configurations go under
                `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility

From 1743a837dd31e7756a7e3293a170234b2d94fc57 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 21 Jan 2026 20:02:26 +0100
Subject: [PATCH 039/163] Elixir 1.19: Set merged logger config correctly,
 remove log level test

---
 lib/pleroma/config/deprecation_warnings.ex    | 29 +++++++++---------
 .../config/deprecation_warnings_test.exs      | 30 +++++--------------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 4f68c141c..e77785483 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -20,8 +20,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
      "\n* `config :pleroma, :instance, mrf_transparency_exclusions` is now `config :pleroma, :mrf, transparency_exclusions`"}
   ]
 
-  @logger_config_knobs [:level, :translator_inspect_opts]
-  @logger_formatter_config_knows [:colors, :format, :metadata, :truncate, :utc_log]
+  @logger_formatter_config_knobs [:colors, :format, :metadata, :truncate, :utc_log]
 
   def check_exiftool_filter do
     filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
@@ -421,21 +420,23 @@ defmodule Pleroma.Config.DeprecationWarnings do
   end
 
   defp merge_deprecated_logger_config(config) do
-    handler_config = Enum.filter(config, fn {k, _} -> k in @logger_config_knobs end)
-    formatter_config = Enum.filter(config, fn {k, _} -> k in @logger_formatter_config_knows end)
+    formatter_config = Enum.filter(config, fn {k, _} -> k in @logger_formatter_config_knobs end)
     formatter = Logger.default_formatter(formatter_config)
+    log_level = Keyword.get(config, :level, nil)
 
-    Logger.debug("""
-    Reconfiguring console Logger with deprecated configuration syntax.
-      Handler configuration:
-        #{inspect(handler_config)}
+    if Config.get(:env) != :test do
+      Logger.debug("""
+      Reconfiguring console Logger with deprecated configuration syntax.
+        Handler configuration:
+          log_level: #{inspect(log_level)}
 
-      Formatter:
-        #{inspect(formatter)}
-    """)
+        Formatter:
+          #{inspect(formatter)}
+      """)
 
-    Logger.configure(handler_config)
-    :logger.update_handler_config(:default, :formatter, formatter)
+      if log_level, do: :logger.update_handler_config(:default, :level, log_level)
+      :logger.update_handler_config(:default, :formatter, formatter)
+    end
   end
 
   @spec check_deprecated_logger_config() :: :ok | :error
@@ -443,7 +444,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     backends_config = Application.get_env(:logger, :backends)
     console_config = Application.get_env(:logger, :console)
 
-    # Note: No need to merge the old backends config since it still works.
+    # NOTE: No need to merge the old backends config since it still works.
     # And new configuration will just add new Logger backends.
     backend =
       if backends_config do
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 221609da0..475a88c4d 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.DeprecationWarningsTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: false
   use Pleroma.Tests.Helpers
 
   import ExUnit.CaptureLog
@@ -393,14 +393,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
   describe "check_deprecated_logger_config" do
     setup do
-      Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
-      Application.put_env(:logger, :console, level: :info)
+      initial_console = Application.get_env(:logger, :console, nil)
+      initial_backends = Application.get_env(:logger, :backends, nil)
+
+      Application.put_env(:logger, :console, level: :all)
+      Application.put_env(:logger, :backends, [:console])
 
       on_exit(fn ->
-        Application.delete_env(:logger, :backends)
-        Application.delete_env(:logger, :console)
-        Logger.configure(level: :debug)
-        :logger.update_handler_config(:default, :formatter, Logger.default_formatter())
+        if initial_console, do: Application.put_env(:logger, :console, initial_console), else: Application.delete_env(:logger, :console)
+        if initial_backends, do: Application.put_env(:logger, :backends, initial_backends), else: Application.delete_env(:logger, :backends)
       end)
     end
 
@@ -434,20 +435,5 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
                `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
                """
     end
-
-    test "reconfigures logger" do
-      empty_log =
-        capture_log(fn ->
-          Logger.debug("This should not be logged")
-        end)
-
-      logged =
-        capture_log(fn ->
-          Logger.info("This should be logged")
-        end)
-
-      assert empty_log =~ ""
-      assert logged =~ "This should be logged"
-    end
   end
 end

From f44774d387c88ce6289ff691a4aa5662c0966964 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 21 Jan 2026 21:13:23 +0100
Subject: [PATCH 040/163] lint

---
 test/pleroma/config/deprecation_warnings_test.exs | 13 +++++++++++--
 test/pleroma/web/activity_pub/mrf_test.exs        |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 475a88c4d..72dd63100 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -400,8 +400,17 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       Application.put_env(:logger, :backends, [:console])
 
       on_exit(fn ->
-        if initial_console, do: Application.put_env(:logger, :console, initial_console), else: Application.delete_env(:logger, :console)
-        if initial_backends, do: Application.put_env(:logger, :backends, initial_backends), else: Application.delete_env(:logger, :backends)
+        if initial_console do
+          Application.put_env(:logger, :console, initial_console)
+        else
+          Application.delete_env(:logger, :console)
+        end
+
+        if initial_backends do
+          Application.put_env(:logger, :backends, initial_backends)
+        else
+          Application.delete_env(:logger, :backends)
+        end
       end)
     end
 
diff --git a/test/pleroma/web/activity_pub/mrf_test.exs b/test/pleroma/web/activity_pub/mrf_test.exs
index 401d4ebb3..2d0f3b317 100644
--- a/test/pleroma/web/activity_pub/mrf_test.exs
+++ b/test/pleroma/web/activity_pub/mrf_test.exs
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
 
   alias Pleroma.Web.ActivityPub.MRF
 
-  defp regexes_match!([],[]), do: true
+  defp regexes_match!([], []), do: true
 
   defp regexes_match!([authority | authority_rest], [checked | checked_rest]) do
     authority.source == checked.source and regexes_match!(authority_rest, checked_rest)

From a12f9777f857002318a6d6da17473bb6a52276b7 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 12 Feb 2026 23:46:08 +0100
Subject: [PATCH 041/163] Elixir 1.19: Bump Woodpecker test pipeline to 1.19

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 4ceb1cab5..f6b06dc61 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,7 +4,7 @@ when:
 
 steps:
   test:
-    image: elixir:1.15-alpine
+    image: elixir:1.19-alpine
     environment:
       MIX_ENV: test
       DB_HOST: postgres

From 01b139c6331977f5d622866127be9b4291cd4732 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 22 Feb 2026 21:50:28 +0100
Subject: [PATCH 042/163] Elixir 1.19: Add note to deprecation warnings test

The Logger does not get reconfigured when running in the test env,
the added and on_exit removed settings below should have no effect
besides triggering the deprecation warnings. To make breakage even less
possible, async is turned off for these tests.

TransferTask test does almost the same with the Application env.
---
 test/pleroma/config/deprecation_warnings_test.exs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 72dd63100..b65b0e630 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -396,6 +396,9 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       initial_console = Application.get_env(:logger, :console, nil)
       initial_backends = Application.get_env(:logger, :backends, nil)
 
+      # NOTE: The Logger does not get reconfigured when running in the test env,
+      # the added and on_exit removed settings below should have no effect besides
+      # triggering the deprecation warnings
       Application.put_env(:logger, :console, level: :all)
       Application.put_env(:logger, :backends, [:console])
 

From 08ba0d46d77cbb19f218b464a1cbeb700227e6a8 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 22 Feb 2026 22:27:48 +0100
Subject: [PATCH 043/163] ActivityDraft: Add missing __MODULE__ matches and
 drop unneeded ones

---
 lib/pleroma/web/common_api/activity_draft.ex | 48 ++++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index 6c84ef656..16489663a 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -99,34 +99,34 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       |> Map.put("cc", draft.cc)
       |> Map.put("actor", draft.user.ap_id)
 
-    %__MODULE__{draft | object: object}
+    %{draft | object: object}
   end
 
   defp put_params(%__MODULE__{} = draft, params) do
     params = Map.put_new(params, :in_reply_to_status_id, params[:in_reply_to_id])
-    %__MODULE__{draft | params: params}
+    %{draft | params: params}
   end
 
   defp status(%__MODULE__{params: %{status: status}} = draft) do
-    %__MODULE__{draft | status: String.trim(status)}
+    %{draft | status: String.trim(status)}
   end
 
   defp summary(%__MODULE__{params: params} = draft) do
-    %__MODULE__{draft | summary: Map.get(params, :spoiler_text, "")}
+    %{draft | summary: Map.get(params, :spoiler_text, "")}
   end
 
   defp full_payload(%__MODULE__{status: status, summary: summary} = draft) do
     full_payload = String.trim(status <> summary)
 
     case Utils.validate_character_limit(full_payload, draft.attachments) do
-      :ok -> %__MODULE__{draft | full_payload: full_payload}
+      :ok -> %{draft | full_payload: full_payload}
       {:error, message} -> add_error(draft, message)
     end
   end
 
   defp attachments(%__MODULE__{params: params} = draft) do
     attachments = Utils.attachments_from_ids(params, draft.user)
-    draft = %__MODULE__{draft | attachments: attachments}
+    draft = %{draft | attachments: attachments}
 
     case Utils.validate_attachments_count(attachments) do
       :ok -> draft
@@ -149,7 +149,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     with %Activity{} = activity <- Activity.get_by_id(id),
          true <- Visibility.visible_for_user?(activity, draft.user),
          {_, type} when type in ["Create", "Announce"] <- {:type, activity.data["type"]} do
-      %__MODULE__{draft | in_reply_to: activity}
+      %{draft | in_reply_to: activity}
     else
       nil ->
         add_error(draft, dgettext("errors", "Cannot reply to a deleted status"))
@@ -170,7 +170,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
   defp in_reply_to(
          %__MODULE__{params: %{in_reply_to_status_id: %Activity{} = in_reply_to}} = draft
        ) do
-    %__MODULE__{draft | in_reply_to: in_reply_to}
+    %{draft | in_reply_to: in_reply_to}
   end
 
   defp in_reply_to(draft), do: draft
@@ -179,14 +179,14 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
        when not_empty_string(id) do
     case Activity.get_by_id_with_object(id) do
       %Activity{} = activity ->
-        %__MODULE__{draft | quote_post: activity}
+        %{draft | quote_post: activity}
 
       _ ->
         draft
     end
   end
 
-  defp quote_post(%{params: %{quote_id: id}} = draft) when not_empty_string(id) do
+  defp quote_post(%__MODULE__{params: %{quote_id: id}} = draft) when not_empty_string(id) do
     quote_post(%{draft | params: Map.put(draft.params, :quoted_status_id, id)})
   end
 
@@ -194,7 +194,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
 
   defp in_reply_to_conversation(%__MODULE__{} = draft) do
     in_reply_to_conversation = Participation.get(draft.params[:in_reply_to_conversation_id])
-    %__MODULE__{draft | in_reply_to_conversation: in_reply_to_conversation}
+    %{draft | in_reply_to_conversation: in_reply_to_conversation}
   end
 
   defp visibility(%__MODULE__{params: params} = draft) do
@@ -203,7 +203,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
         add_error(draft, dgettext("errors", "The message visibility must be direct"))
 
       {visibility, _} ->
-        %__MODULE__{draft | visibility: visibility}
+        %{draft | visibility: visibility}
     end
   end
 
@@ -219,7 +219,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     false
   end
 
-  defp quoting_visibility(%{quote_post: %Activity{}} = draft) do
+  defp quoting_visibility(%__MODULE__{quote_post: %Activity{}} = draft) do
     with %Object{} = object <- Object.normalize(draft.quote_post, fetch: false),
          true <- can_quote?(draft, object, Visibility.get_visibility(object)) do
       draft
@@ -232,7 +232,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
 
   defp expires_at(%__MODULE__{} = draft) do
     case CommonAPI.check_expiry_date(draft.params[:expires_in]) do
-      {:ok, expires_at} -> %__MODULE__{draft | expires_at: expires_at}
+      {:ok, expires_at} -> %{draft | expires_at: expires_at}
       {:error, message} -> add_error(draft, message)
     end
   end
@@ -240,7 +240,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
   defp poll(%__MODULE__{} = draft) do
     case Utils.make_poll_data(draft.params) do
       {:ok, {poll, poll_emoji}} ->
-        %__MODULE__{draft | extra: poll, emoji: Map.merge(draft.emoji, poll_emoji)}
+        %{draft | extra: poll, emoji: Map.merge(draft.emoji, poll_emoji)}
 
       {:error, message} ->
         add_error(draft, message)
@@ -258,22 +258,22 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       |> Kernel.++(mentioned_ap_ids)
       |> Utils.get_addressed_users(draft.params[:to])
 
-    %__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
+    %{draft | content_html: content_html, mentions: mentions, tags: tags}
   end
 
   defp to_and_cc(%__MODULE__{} = draft) do
     {to, cc} = Utils.get_to_and_cc(draft)
-    %__MODULE__{draft | to: to, cc: cc}
+    %{draft | to: to, cc: cc}
   end
 
   defp context(%__MODULE__{} = draft) do
     context = Utils.make_context(draft.in_reply_to, draft.in_reply_to_conversation)
-    %__MODULE__{draft | context: context}
+    %{draft | context: context}
   end
 
   defp sensitive(%__MODULE__{} = draft) do
     sensitive = draft.params[:sensitive]
-    %__MODULE__{draft | sensitive: sensitive}
+    %{draft | sensitive: sensitive}
   end
 
   defp language(%__MODULE__{} = draft) do
@@ -285,7 +285,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
         _ -> LanguageDetector.detect(draft.content_html <> " " <> draft.summary)
       end
 
-    %__MODULE__{draft | language: language}
+    %{draft | language: language}
   end
 
   defp object(%__MODULE__{} = draft) do
@@ -329,12 +329,12 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       |> Map.put("generator", draft.params[:generator])
       |> Map.put("language", draft.language)
 
-    %__MODULE__{draft | object: object}
+    %{draft | object: object}
   end
 
   defp preview?(%__MODULE__{} = draft) do
     preview? = Pleroma.Web.Utils.Params.truthy_param?(draft.params[:preview])
-    %__MODULE__{draft | preview?: preview?}
+    %{draft | preview?: preview?}
   end
 
   defp changes(%__MODULE__{} = draft) do
@@ -357,14 +357,14 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       }
       |> Utils.maybe_add_list_data(draft.user, draft.visibility)
 
-    %__MODULE__{draft | changes: changes}
+    %{draft | changes: changes}
   end
 
   defp with_valid(%{valid?: true} = draft, func), do: func.(draft)
   defp with_valid(draft, _func), do: draft
 
   defp add_error(%__MODULE__{} = draft, message) do
-    %__MODULE__{draft | valid?: false, errors: [message | draft.errors]}
+    %{draft | valid?: false, errors: [message | draft.errors]}
   end
 
   defp validate(%{valid?: true} = draft), do: {:ok, draft}

From af175fbdfc589be7f80adcb9613cfa3d67a217a8 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sun, 3 May 2026 21:19:24 +0400
Subject: [PATCH 044/163] Woodpecker CI: Build armv7 Docker images

---
 .woodpecker/docker-combine.yaml |  2 +-
 .woodpecker/docker.yaml         | 47 +++++++++++++++++++++++++++++++++
 Dockerfile                      |  6 +++--
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/docker-combine.yaml b/.woodpecker/docker-combine.yaml
index 6c91d26e9..9b9f89fdb 100644
--- a/.woodpecker/docker-combine.yaml
+++ b/.woodpecker/docker-combine.yaml
@@ -27,7 +27,7 @@ steps:
     settings: &docker_settings
       registry: "git.pleroma.social"
       image: "pleroma/pleroma"
-      architectures: [amd64, arm64]
+      architectures: [amd64, arm64, armv7]
       tags:
         - latest
         - develop
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index abc6bfa3b..5f174fb99 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -11,6 +11,7 @@ when:
 matrix:
   platform:
     - linux/amd64
+    - linux/arm
     - linux/arm64
 
 # This is needed for the when clauses below.
@@ -27,6 +28,13 @@ variables:
     password:
       from_secret: pleroma-ci-password
   kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
+  # HexPM Elixir images are not published for arm/v7.
+  armv7_build_args: &armv7_build_args
+    - ELIXIR_IMG=arm32v7/elixir
+    - ELIXIR_TAG=1.17.3-alpine
+    - ALPINE_IMG=arm32v7/alpine
+    - ALPINE_VER=3.22
+  armv7_extra_opts: &armv7_extra_opts --custom-platform=linux/arm/v7
 
 steps:
   docker-develop-amd64:
@@ -51,6 +59,19 @@ steps:
         - develop-arm64
         - ${CI_COMMIT_SHA:0:8}-arm64
 
+  docker-develop-armv7:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
+    settings:
+      <<: *docker_variables
+      build_args: *armv7_build_args
+      extra_opts: *armv7_extra_opts
+      tags:
+        - latest-armv7
+        - develop-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
   docker-stable-amd64:
     image: *kaniko_image
     when:
@@ -84,6 +105,19 @@ steps:
         - stable-arm64
         - ${CI_COMMIT_SHA:0:8}-arm64
 
+  docker-stable-armv7:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
+    settings:
+      <<: *docker_variables
+      build_args: *armv7_build_args
+      extra_opts: *armv7_extra_opts
+      tags: &armv7_tags
+        - latest-armv7
+        - stable-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
   docker-stable-tag-arm64:
     image: *kaniko_image
     when:
@@ -94,3 +128,16 @@ steps:
       tags:
         - <<: *arm64_tags
         - ${CI_COMMIT_TAG}-arm64
+
+  docker-stable-tag-armv7:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "tag"'
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
+    settings:
+      <<: *docker_variables
+      build_args: *armv7_build_args
+      extra_opts: *armv7_extra_opts
+      tags:
+        - <<: *armv7_tags
+        - ${CI_COMMIT_TAG}-armv7
diff --git a/Dockerfile b/Dockerfile
index 11a17b7ad..5fd1cc0a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,10 @@ ARG ELIXIR_IMG=hexpm/elixir
 ARG ELIXIR_VER=1.17.3
 ARG ERLANG_VER=26.2.5.6
 ARG ALPINE_VER=3.17.9
+ARG ELIXIR_TAG=${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER}
+ARG ALPINE_IMG=alpine
 
-FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} AS build
+FROM ${ELIXIR_IMG}:${ELIXIR_TAG} AS build
 
 COPY . .
 
@@ -20,7 +22,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev vips-dev &&\
 	mkdir release &&\
 	mix release --path release
 
-FROM alpine:${ALPINE_VER}
+FROM ${ALPINE_IMG}:${ALPINE_VER}
 
 ARG BUILD_DATE
 ARG VCS_REF

From 684e9ef24702bf2c509d42445fc665ceb91070d4 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 4 May 2026 09:41:06 +0400
Subject: [PATCH 045/163] Woodpecker CI: Isolate armv7 Docker builds

---
 .woodpecker/docker-armv7.yaml   | 84 +++++++++++++++++++++++++++++++++
 .woodpecker/docker-combine.yaml |  2 +-
 .woodpecker/docker.yaml         | 47 ------------------
 3 files changed, 85 insertions(+), 48 deletions(-)
 create mode 100644 .woodpecker/docker-armv7.yaml

diff --git a/.woodpecker/docker-armv7.yaml b/.woodpecker/docker-armv7.yaml
new file mode 100644
index 000000000..19f3049b3
--- /dev/null
+++ b/.woodpecker/docker-armv7.yaml
@@ -0,0 +1,84 @@
+when:
+  # Temporary PR validation while arm/v7 Docker builds are being brought up.
+  - event: pull_request
+    path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ]
+  - event: push
+    branch: ${CI_REPO_DEFAULT_BRANCH}
+    path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ]
+  - event: tag
+  - event: manual
+    branch: ${CI_REPO_DEFAULT_BRANCH}
+  - event: manual
+    branch: stable
+
+# Target the CAX21 arm64 host with native arm32 userspace support, not generic arm64 runners.
+labels:
+  armv7: native
+
+variables:
+  docker_variables: &docker_variables
+    repo: pleroma/pleroma
+    registry: git.pleroma.social
+  armv7_build_settings: &armv7_build_settings
+    <<: *docker_variables
+    build_args:
+      - ELIXIR_IMG=arm32v7/elixir
+      - ELIXIR_TAG=1.17.3-otp-26-alpine
+      - ALPINE_IMG=arm32v7/alpine
+      - ALPINE_VER=3.20
+    extra_opts: --custom-platform=linux/arm/v7
+  armv7_push_settings: &armv7_push_settings
+    <<: *armv7_build_settings
+    username:
+      from_secret: pleroma-ci-user
+    password:
+      from_secret: pleroma-ci-password
+
+steps:
+  docker-armv7-pr:
+    image: woodpeckerci/plugin-kaniko:2.3.1
+    when:
+      - event: pull_request
+    settings:
+      <<: *armv7_build_settings
+      dry_run: true
+      tags:
+        - armv7-pr-check
+
+  docker-develop-armv7:
+    image: woodpeckerci/plugin-kaniko:2.3.1
+    when:
+      - event: push
+        branch: ${CI_REPO_DEFAULT_BRANCH}
+      - event: manual
+        branch: ${CI_REPO_DEFAULT_BRANCH}
+    settings:
+      <<: *armv7_push_settings
+      tags:
+        - latest-armv7
+        - develop-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
+  docker-stable-armv7:
+    image: woodpeckerci/plugin-kaniko:2.3.1
+    when:
+      - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
+    settings:
+      <<: *armv7_push_settings
+      tags:
+        - latest-armv7
+        - stable-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
+  docker-stable-tag-armv7:
+    image: woodpeckerci/plugin-kaniko:2.3.1
+    when:
+      - event: tag
+      - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
+    settings:
+      <<: *armv7_push_settings
+      tags:
+        - latest-armv7
+        - stable-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+        - ${CI_COMMIT_TAG}-armv7
diff --git a/.woodpecker/docker-combine.yaml b/.woodpecker/docker-combine.yaml
index 9b9f89fdb..6c91d26e9 100644
--- a/.woodpecker/docker-combine.yaml
+++ b/.woodpecker/docker-combine.yaml
@@ -27,7 +27,7 @@ steps:
     settings: &docker_settings
       registry: "git.pleroma.social"
       image: "pleroma/pleroma"
-      architectures: [amd64, arm64, armv7]
+      architectures: [amd64, arm64]
       tags:
         - latest
         - develop
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 5f174fb99..abc6bfa3b 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -11,7 +11,6 @@ when:
 matrix:
   platform:
     - linux/amd64
-    - linux/arm
     - linux/arm64
 
 # This is needed for the when clauses below.
@@ -28,13 +27,6 @@ variables:
     password:
       from_secret: pleroma-ci-password
   kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
-  # HexPM Elixir images are not published for arm/v7.
-  armv7_build_args: &armv7_build_args
-    - ELIXIR_IMG=arm32v7/elixir
-    - ELIXIR_TAG=1.17.3-alpine
-    - ALPINE_IMG=arm32v7/alpine
-    - ALPINE_VER=3.22
-  armv7_extra_opts: &armv7_extra_opts --custom-platform=linux/arm/v7
 
 steps:
   docker-develop-amd64:
@@ -59,19 +51,6 @@ steps:
         - develop-arm64
         - ${CI_COMMIT_SHA:0:8}-arm64
 
-  docker-develop-armv7:
-    image: *kaniko_image
-    when:
-      - evaluate: 'platform == "linux/arm" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
-    settings:
-      <<: *docker_variables
-      build_args: *armv7_build_args
-      extra_opts: *armv7_extra_opts
-      tags:
-        - latest-armv7
-        - develop-armv7
-        - ${CI_COMMIT_SHA:0:8}-armv7
-
   docker-stable-amd64:
     image: *kaniko_image
     when:
@@ -105,19 +84,6 @@ steps:
         - stable-arm64
         - ${CI_COMMIT_SHA:0:8}-arm64
 
-  docker-stable-armv7:
-    image: *kaniko_image
-    when:
-      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
-    settings:
-      <<: *docker_variables
-      build_args: *armv7_build_args
-      extra_opts: *armv7_extra_opts
-      tags: &armv7_tags
-        - latest-armv7
-        - stable-armv7
-        - ${CI_COMMIT_SHA:0:8}-armv7
-
   docker-stable-tag-arm64:
     image: *kaniko_image
     when:
@@ -128,16 +94,3 @@ steps:
       tags:
         - <<: *arm64_tags
         - ${CI_COMMIT_TAG}-arm64
-
-  docker-stable-tag-armv7:
-    image: *kaniko_image
-    when:
-      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "tag"'
-      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
-    settings:
-      <<: *docker_variables
-      build_args: *armv7_build_args
-      extra_opts: *armv7_extra_opts
-      tags:
-        - <<: *armv7_tags
-        - ${CI_COMMIT_TAG}-armv7

From 394db0dce0c6ca3e55f2039cca35b1bb8e651875 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 4 May 2026 10:09:44 +0400
Subject: [PATCH 046/163] Woodpecker CI: Target armv7 Docker runner

---
 .woodpecker/docker-armv7.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker/docker-armv7.yaml b/.woodpecker/docker-armv7.yaml
index 19f3049b3..c921a56f9 100644
--- a/.woodpecker/docker-armv7.yaml
+++ b/.woodpecker/docker-armv7.yaml
@@ -13,6 +13,7 @@ when:
 
 # Target the CAX21 arm64 host with native arm32 userspace support, not generic arm64 runners.
 labels:
+  platform: linux/arm
   armv7: native
 
 variables:

From 3c63877e618468834a4ff31374396723dc8ba313 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 5 May 2026 21:04:13 +0200
Subject: [PATCH 047/163] Add custom Docker image for FE E2E tests

Woodpecker cannot do custom commands for services.
---
 .woodpecker/docker.yaml           | 12 ++++++
 Dockerfile-e2e                    | 61 +++++++++++++++++++++++++++
 changelog.d/docker-e2e-image.skip |  0
 docker-entrypoint-e2e.sh          | 70 +++++++++++++++++++++++++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 Dockerfile-e2e
 create mode 100644 changelog.d/docker-e2e-image.skip
 create mode 100755 docker-entrypoint-e2e.sh

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index abc6bfa3b..9a5be78e2 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -62,6 +62,18 @@ steps:
         - stable-amd64
         - ${CI_COMMIT_SHA:0:8}-amd64
 
+  # FE workflow runs only on linux/amd64
+  docker-stable-e2e-amd64:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "tag"'
+      - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable"'
+    settings:
+      <<: *docker_variables
+      dockerfile: Dockerfile-e2e
+      tags:
+        - stable-e2e
+
   docker-stable-tag-amd64:
     image: *kaniko_image
     when:
diff --git a/Dockerfile-e2e b/Dockerfile-e2e
new file mode 100644
index 000000000..df8bb39aa
--- /dev/null
+++ b/Dockerfile-e2e
@@ -0,0 +1,61 @@
+# https://hub.docker.com/r/hexpm/elixir/tags
+ARG ELIXIR_IMG=docker.io/hexpm/elixir
+ARG ALPINE_IMG=docker.io/alpine
+ARG ELIXIR_VER=1.18.4
+ARG ERLANG_VER=27.3.4.11
+ARG ALPINE_VER=3.23.4
+
+FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} AS build
+
+COPY . .
+
+ENV MIX_ENV=prod
+ENV VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS
+
+RUN apk add git gcc g++ musl-dev make cmake file-dev vips-dev &&\
+	echo "import Config" > config/prod.secret.exs &&\
+	mix local.hex --force &&\
+	mix local.rebar --force &&\
+	mix deps.clean --all &&\
+	mix deps.get --only prod &&\
+	mkdir release &&\
+	mix release --path release
+
+FROM ${ALPINE_IMG}:${ALPINE_VER}
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="ops@pleroma.social" \
+    org.opencontainers.image.title="pleroma" \
+    org.opencontainers.image.description="Pleroma FE E2E test image" \
+    org.opencontainers.image.authors="ops@pleroma.social" \
+    org.opencontainers.image.vendor="pleroma.social" \
+    org.opencontainers.image.documentation="https://git.pleroma.social/pleroma/pleroma" \
+    org.opencontainers.image.licenses="AGPL-3.0" \
+    org.opencontainers.image.url="https://pleroma.social" \
+    org.opencontainers.image.revision=$VCS_REF \
+    org.opencontainers.image.created=$BUILD_DATE
+
+ARG HOME=/opt/pleroma
+ARG DATA=/var/lib/pleroma
+
+RUN apk update &&\
+	apk add exiftool ffmpeg vips libmagic ncurses postgresql-client &&\
+	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
+	mkdir -p ${DATA}/uploads &&\
+	mkdir -p ${DATA}/static &&\
+	chown -R pleroma ${DATA} &&\
+	mkdir -p /etc/pleroma &&\
+	chown -R pleroma /etc/pleroma
+
+USER pleroma
+
+COPY --from=build --chown=pleroma:0 /release ${HOME}
+
+COPY --chown=pleroma --chmod=640 ./config/docker.exs /etc/pleroma/config.exs
+COPY ./docker-entrypoint-e2e.sh ${HOME}
+
+EXPOSE 4000
+
+ENTRYPOINT ["/opt/pleroma/docker-entrypoint-e2e.sh"]
diff --git a/changelog.d/docker-e2e-image.skip b/changelog.d/docker-e2e-image.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker-entrypoint-e2e.sh b/docker-entrypoint-e2e.sh
new file mode 100755
index 000000000..c83c44a80
--- /dev/null
+++ b/docker-entrypoint-e2e.sh
@@ -0,0 +1,70 @@
+#!/bin/ash
+set -eu
+
+SEED_SENTINEL_PATH=/var/lib/pleroma/.e2e_seeded
+CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs
+
+echo '-- Waiting for database...'
+while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do
+	sleep 1s
+done
+
+echo '-- Writing E2E config overrides...'
+cat > $CONFIG_OVERRIDE_PATH <<EOF
+import Config
+
+config :pleroma, Pleroma.Captcha,
+	enabled: false
+
+config :pleroma, :instance,
+	registrations_open: true,
+	account_activation_required: false,
+	approval_required: false
+EOF
+
+echo '-- Running migrations...'
+/opt/pleroma/bin/pleroma_ctl migrate
+
+echo '-- Starting!'
+/opt/pleroma/bin/pleroma start &
+PLEROMA_PID=$!
+
+cleanup() {
+	if kill -0 $PLEROMA_PID 2>/dev/null; then
+		kill -TERM $PLEROMA_PID
+		wait $PLEROMA_PID || true
+	fi
+}
+
+trap cleanup INT TERM
+
+echo '-- Waiting for API...'
+api_ok=false
+for _i in $(seq 1 120); do
+	if wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null 2>&1; then
+		api_ok=true
+		break
+	fi
+	sleep 1s
+done
+
+if [ $api_ok != true ]; then
+	echo 'Timed out waiting for Pleroma API to become available'
+	exit 1
+fi
+
+if [ ! -f $SEED_SENTINEL_PATH ]; then
+	if [ -n ${E2E_ADMIN_USERNAME:-} ] && [ -n ${E2E_ADMIN_PASSWORD:-} ] && [ -n ${E2E_ADMIN_EMAIL:-} ]; then
+		echo '-- Seeding admin user' $E2E_ADMIN_USERNAME '...'
+		if ! /opt/pleroma/bin/pleroma_ctl user new $E2E_ADMIN_USERNAME $E2E_ADMIN_EMAIL --admin --password $E2E_ADMIN_PASSWORD -y; then
+			echo '-- User already exists or creation failed, ensuring admin + confirmed...'
+			/opt/pleroma/bin/pleroma_ctl user set $E2E_ADMIN_USERNAME --admin --confirmed
+		fi
+	else
+		echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
+	fi
+
+	touch $SEED_SENTINEL_PATH
+fi
+
+wait $PLEROMA_PID

From 784a319f2eb9b98e6e034c38b462dd1e11390359 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 14 May 2026 00:22:24 +0200
Subject: [PATCH 048/163] Woodpecker CI: Bump unit testing pipeline to Elixir
 1.19

---
 ...t-testing-elixir-1.18.yaml => unit-testing-elixir-1.19.yaml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .woodpecker/{unit-testing-elixir-1.18.yaml => unit-testing-elixir-1.19.yaml} (97%)

diff --git a/.woodpecker/unit-testing-elixir-1.18.yaml b/.woodpecker/unit-testing-elixir-1.19.yaml
similarity index 97%
rename from .woodpecker/unit-testing-elixir-1.18.yaml
rename to .woodpecker/unit-testing-elixir-1.19.yaml
index 9ad9eebc9..462e2ee5d 100644
--- a/.woodpecker/unit-testing-elixir-1.18.yaml
+++ b/.woodpecker/unit-testing-elixir-1.19.yaml
@@ -19,7 +19,7 @@ variables:
 
 steps:
   unit-testing-elixir-1.18:
-    image: elixir:1.18-otp-27-alpine
+    image: elixir:1.19-otp-28-alpine
     entrypoint: *script_file_entrypoint
     environment:
       MIX_ENV: test

From 7575b7abc2b1559dbb2a780ce55e572969d8184f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 14 May 2026 12:20:27 +0200
Subject: [PATCH 049/163] Woodpecker CI: Do not trigger on Weblate MRs

---
 .woodpecker/changelog.yaml                | 1 +
 .woodpecker/lint.yaml                     | 1 +
 .woodpecker/unit-testing-elixir-1.15.yaml | 1 +
 .woodpecker/unit-testing-elixir-1.18.yaml | 1 +
 changelog.d/weblate-ci.skip               | 0
 5 files changed, 4 insertions(+)
 create mode 100644 changelog.d/weblate-ci.skip

diff --git a/.woodpecker/changelog.yaml b/.woodpecker/changelog.yaml
index 64062f17e..a3732c240 100644
--- a/.woodpecker/changelog.yaml
+++ b/.woodpecker/changelog.yaml
@@ -1,5 +1,6 @@
 when:
   - event: pull_request
+    evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
 
 labels:
   platform: linux/amd64
diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml
index 0ab7441a8..8a5718c5d 100644
--- a/.woodpecker/lint.yaml
+++ b/.woodpecker/lint.yaml
@@ -1,6 +1,7 @@
 when:
   - event: pull_request
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
+    evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
   - event: push
     branch: ${CI_REPO_DEFAULT_BRANCH}
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
diff --git a/.woodpecker/unit-testing-elixir-1.15.yaml b/.woodpecker/unit-testing-elixir-1.15.yaml
index a4a8fc266..a5bcc0ef3 100644
--- a/.woodpecker/unit-testing-elixir-1.15.yaml
+++ b/.woodpecker/unit-testing-elixir-1.15.yaml
@@ -1,6 +1,7 @@
 when:
   - event: pull_request
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
+    evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
   - event: push
     branch: ${CI_REPO_DEFAULT_BRANCH}
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
diff --git a/.woodpecker/unit-testing-elixir-1.18.yaml b/.woodpecker/unit-testing-elixir-1.18.yaml
index 9ad9eebc9..6e576fad9 100644
--- a/.woodpecker/unit-testing-elixir-1.18.yaml
+++ b/.woodpecker/unit-testing-elixir-1.18.yaml
@@ -1,6 +1,7 @@
 when:
   - event: pull_request
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
+    evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate"'
   - event: push
     branch: ${CI_REPO_DEFAULT_BRANCH}
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**" ]
diff --git a/changelog.d/weblate-ci.skip b/changelog.d/weblate-ci.skip
new file mode 100644
index 000000000..e69de29bb

From 1a13ec539baca66d23db899d92b42c181aaf3149 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 18 May 2026 21:05:46 +0300
Subject: [PATCH 050/163] reorganize mfm attributes in order they're listed in
 misskey repo, add missing ones

---
 priv/scrubbers/default.ex | 49 ++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index 342ef9944..d5c7340d6 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -83,48 +83,55 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "quote-inline",
     "invisible",
     "ellipsis",
-    "mfm-center",
-    "mfm-flip",
-    "mfm-font",
-    "mfm-blur",
-    "mfm-rotate",
-    "mfm-x2",
-    "mfm-x3",
-    "mfm-x4",
-    "mfm-position",
-    "mfm-scale",
-    "mfm-fg",
-    "mfm-bg",
+    "mfm-tada",
     "mfm-jelly",
     "mfm-twitch",
     "mfm-shake",
     "mfm-spin",
     "mfm-jump",
     "mfm-bounce",
+    "mfm-flip",
+    "mfm-x2",
+    "mfm-x3",
+    "mfm-x4",
+    "mfm-scale",
+    "mfm-position",
+    "mfm-fg",
+    "mfm-bg",
+    "mfm-border",
+    "mfm-font",
+    "mfm-blur",
     "mfm-rainbow",
-    "mfm-tada",
-    "mfm-sparkle"
+    "mfm-sparkle",
+    "mfm-rotate",
+    "mfm-ruby",
+    "mfm-unixtime",
   ])
 
   Meta.allow_tag_with_this_attribute_values(:p, "class", ["quote-inline"])
 
   Meta.allow_tag_with_these_attributes(:span, [
     "lang",
-    "data-mfm-h",
-    "data-mfm-v",
+    "data-mfm-speed",
+    "data-mfm-delay",
+    "data-mfm-left",
+    "data-mfm-alternate",
     "data-mfm-x",
     "data-mfm-y",
-    "data-mfm-alternate",
-    "data-mfm-speed",
-    "data-mfm-deg",
-    "data-mfm-left",
+    "data-mfm-h",
+    "data-mfm-v",
+    "data-mfm-color",
+    "data-mfm-width",
+    "data-mfm-style",
+    "data-mfm-radius",
+    "data-mfm-noclip",
     "data-mfm-serif",
     "data-mfm-monospace",
     "data-mfm-cursive",
     "data-mfm-fantasy",
     "data-mfm-emoji",
     "data-mfm-math",
-    "data-mfm-color"
+    "data-mfm-deg",
   ])
 
   Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])

From c428cf43e8683f5428341845629013504d0057bf Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 18 May 2026 21:07:12 +0300
Subject: [PATCH 051/163] "changelog"

---
 changelog.d/mfm-extend.skip | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 changelog.d/mfm-extend.skip

diff --git a/changelog.d/mfm-extend.skip b/changelog.d/mfm-extend.skip
new file mode 100644
index 000000000..e69de29bb

From 46a28086900600d187348b796c486d11575f22da Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 18 May 2026 21:08:24 +0300
Subject: [PATCH 052/163] extraneous commas

---
 priv/scrubbers/default.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index d5c7340d6..8963d99e8 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -105,7 +105,7 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "mfm-sparkle",
     "mfm-rotate",
     "mfm-ruby",
-    "mfm-unixtime",
+    "mfm-unixtime"
   ])
 
   Meta.allow_tag_with_this_attribute_values(:p, "class", ["quote-inline"])
@@ -131,7 +131,7 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "data-mfm-fantasy",
     "data-mfm-emoji",
     "data-mfm-math",
-    "data-mfm-deg",
+    "data-mfm-deg"
   ])
 
   Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])

From 9dd02ecd5074cc0c164cbae86253d8eea921c787 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 22 May 2026 16:30:14 +0400
Subject: [PATCH 053/163] Fix WebSocket protocol token handshakes

---
 changelog.d/mastodon-websocket-protocol.fix   |   1 +
 lib/pleroma/web/endpoint.ex                   |   7 +-
 .../web/mastodon_api/websocket_handler.ex     |  15 +--
 .../web/mastodon_api/websocket_plug.ex        | 105 ++++++++++++++++++
 .../integration/mastodon_websocket_test.exs   | 100 ++++++++++++++---
 5 files changed, 200 insertions(+), 28 deletions(-)
 create mode 100644 changelog.d/mastodon-websocket-protocol.fix
 create mode 100644 lib/pleroma/web/mastodon_api/websocket_plug.ex

diff --git a/changelog.d/mastodon-websocket-protocol.fix b/changelog.d/mastodon-websocket-protocol.fix
new file mode 100644
index 000000000..66dab16ed
--- /dev/null
+++ b/changelog.d/mastodon-websocket-protocol.fix
@@ -0,0 +1 @@
+Echo Mastodon-style `Sec-WebSocket-Protocol` tokens in streaming WebSocket handshakes.
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 36e78e1e2..07b33f866 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -9,8 +9,8 @@ defmodule Pleroma.Web.Endpoint do
 
   alias Pleroma.Config
 
-  socket("/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler,
-    longpoll: false,
+  plug(Pleroma.Web.MastodonAPI.WebsocketPlug,
+    path: "/api/v1/streaming",
     websocket: [
       path: "/",
       compress: false,
@@ -169,8 +169,7 @@ defmodule Pleroma.Web.Endpoint do
       else: "pleroma_key"
 
   extra =
-    Config.get([__MODULE__, :extra_cookie_attrs])
-    |> Enum.join(";")
+    Enum.join(Config.get([__MODULE__, :extra_cookie_attrs]), ";")
 
   # The session will be stored in the cookie and signed,
   # this means its contents can be read but not tampered with.
diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex
index 2b698bd5d..3dc862a5a 100644
--- a/lib/pleroma/web/mastodon_api/websocket_handler.ex
+++ b/lib/pleroma/web/mastodon_api/websocket_handler.ex
@@ -67,9 +67,10 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
 
   @impl Phoenix.Socket.Transport
   def handle_in({text, [opcode: :text]}, state) do
-    with {:ok, %{} = event} <- Jason.decode(text) do
-      handle_client_event(event, state)
-    else
+    case Jason.decode(text) do
+      {:ok, %{} = event} ->
+        handle_client_event(event, state)
+
       _ ->
         Logger.error("#{__MODULE__} received non-JSON event: #{inspect(text)}")
         {:ok, state}
@@ -85,11 +86,11 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
   def handle_info({:render_with_user, view, template, item, topic}, state) do
     user = %User{} = User.get_cached_by_ap_id(state.user.ap_id)
 
-    unless Streamer.filtered_by_user?(user, item) do
+    if Streamer.filtered_by_user?(user, item) do
+      {:ok, state}
+    else
       message = view.render(template, item, user, topic)
       {:push, {:text, message}, %{state | user: user}}
-    else
-      {:ok, state}
     end
   end
 
@@ -253,7 +254,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
 
   defp find_sec_websocket_protocol(sec_headers) do
     Enum.find_value(sec_headers, fn
-      {"sec-websocket-protocol", token} -> token
+      {"sec-websocket-protocol", protocols} -> protocols |> Plug.Conn.Utils.list() |> List.first()
       _ -> nil
     end)
   end
diff --git a/lib/pleroma/web/mastodon_api/websocket_plug.ex b/lib/pleroma/web/mastodon_api/websocket_plug.ex
new file mode 100644
index 000000000..58ee913b4
--- /dev/null
+++ b/lib/pleroma/web/mastodon_api/websocket_plug.ex
@@ -0,0 +1,105 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.MastodonAPI.WebsocketPlug do
+  @moduledoc """
+  A Phoenix 1.8 compatible WebSocket transport for Mastodon streaming.
+
+  It mirrors Phoenix.Transports.WebSocket, but echoes a successfully authenticated
+  Mastodon-style Sec-WebSocket-Protocol token so browser clients accept the handshake.
+  """
+
+  @behaviour Plug
+
+  import Plug.Conn
+
+  alias Phoenix.Socket.Transport
+  alias Pleroma.Web.Endpoint
+  alias Pleroma.Web.MastodonAPI.WebsocketHandler
+
+  @connect_info_opts [:check_csrf]
+
+  @impl Plug
+  def init(opts) do
+    path = String.split(Keyword.fetch!(opts, :path), "/", trim: true)
+    websocket = Keyword.fetch!(opts, :websocket)
+    config = Transport.load_config(websocket, Phoenix.Transports.WebSocket)
+
+    {path, config}
+  end
+
+  @impl Plug
+  def call(%{method: "GET", path_info: path} = conn, {path, opts}) do
+    conn
+    |> fetch_query_params()
+    |> Transport.code_reload(Endpoint, opts)
+    |> Transport.transport_log(opts[:transport_log])
+    |> Transport.check_origin(WebsocketHandler, Endpoint, opts)
+    |> connect(opts)
+  end
+
+  def call(%{path_info: path} = conn, {path, _opts}) do
+    conn
+    |> send_resp(400, "")
+    |> halt()
+  end
+
+  def call(conn, _opts), do: conn
+
+  defp connect(%{halted: true} = conn, _opts), do: conn
+
+  defp connect(%{params: params} = conn, opts) do
+    keys = Keyword.get(opts, :connect_info, [])
+
+    connect_info =
+      Transport.connect_info(conn, Endpoint, keys, Keyword.take(opts, @connect_info_opts))
+
+    config = %{
+      endpoint: Endpoint,
+      transport: :websocket,
+      options: opts,
+      params: params,
+      connect_info: connect_info
+    }
+
+    case WebsocketHandler.connect(config) do
+      {:ok, arg} ->
+        try do
+          conn
+          |> echo_sec_websocket_protocol()
+          |> WebSockAdapter.upgrade(WebsocketHandler, arg, opts)
+          |> halt()
+        rescue
+          e in WebSockAdapter.UpgradeError ->
+            conn
+            |> send_resp(400, e.message)
+            |> halt()
+        end
+
+      :error ->
+        conn
+        |> send_resp(403, "")
+        |> halt()
+
+      {:error, reason} ->
+        {m, f, args} = opts[:error_handler]
+
+        halt(apply(m, f, [conn, reason | args]))
+    end
+  end
+
+  defp echo_sec_websocket_protocol(conn) do
+    case get_req_header(conn, "sec-websocket-protocol") do
+      [protocols | _] ->
+        case Plug.Conn.Utils.list(protocols) do
+          [protocol | _] -> put_resp_header(conn, "sec-websocket-protocol", protocol)
+          nil -> conn
+          [] -> conn
+        end
+
+      [] ->
+        conn
+    end
+  end
+end
diff --git a/test/pleroma/integration/mastodon_websocket_test.exs b/test/pleroma/integration/mastodon_websocket_test.exs
index 078bb643c..de88e5002 100644
--- a/test/pleroma/integration/mastodon_websocket_test.exs
+++ b/test/pleroma/integration/mastodon_websocket_test.exs
@@ -11,6 +11,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
 
   alias Pleroma.Integration.WebsocketClient
   alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.MastodonAPI.StatusView
   alias Pleroma.Web.OAuth
 
   @moduletag needs_streamer: true, capture_log: true
@@ -31,6 +32,48 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
     WebsocketClient.start_link(self(), path, headers)
   end
 
+  defp raw_websocket_handshake(qs, headers) do
+    uri = URI.parse(@path <> qs)
+    port = uri.port || 80
+    path = uri.path <> if(uri.query, do: "?" <> uri.query, else: "")
+
+    default_headers = [
+      {"host", "#{uri.host}:#{port}"},
+      {"upgrade", "websocket"},
+      {"connection", "Upgrade"},
+      {"sec-websocket-key", Base.encode64(:crypto.strong_rand_bytes(16))},
+      {"sec-websocket-version", "13"}
+    ]
+
+    request = [
+      "GET #{path} HTTP/1.1\r\n",
+      Enum.map(default_headers ++ headers, fn {name, value} -> "#{name}: #{value}\r\n" end),
+      "\r\n"
+    ]
+
+    with {:ok, socket} <-
+           :gen_tcp.connect(String.to_charlist(uri.host), port, [:binary, active: false], 1_000),
+         :ok <- :gen_tcp.send(socket, request),
+         {:ok, response} <- :gen_tcp.recv(socket, 0, 1_000) do
+      :gen_tcp.close(socket)
+      {:ok, parse_http_response(response)}
+    end
+  end
+
+  defp parse_http_response(response) do
+    [headers | _] = String.split(response, "\r\n\r\n", parts: 2)
+    [status_line | header_lines] = String.split(headers, "\r\n")
+    [_, status | _] = String.split(status_line, " ")
+
+    headers =
+      Enum.map(header_lines, fn line ->
+        [name, value] = String.split(line, ":", parts: 2)
+        {String.downcase(name), String.trim(value)}
+      end)
+
+    %{status: String.to_integer(status), headers: headers}
+  end
+
   defp decode_json(json) do
     with {:ok, %{"event" => event, "payload" => payload_text}} <- Jason.decode(json),
          {:ok, payload} <- Jason.decode(payload_text) do
@@ -85,9 +128,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
     assert json["payload"]
     assert {:ok, json} = Jason.decode(json["payload"])
 
-    view_json =
-      Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity, for: nil)
-      |> atom_key_to_string()
+    view_json = atom_key_to_string(StatusView.render("show.json", activity: activity, for: nil))
 
     assert json == view_json
   end
@@ -114,10 +155,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
       assert json["payload"]
       assert {:ok, json} = Jason.decode(json["payload"])
 
-      view_json =
-        Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity, for: nil)
-        |> Jason.encode!()
-        |> Jason.decode!()
+      view_json = atom_key_to_string(StatusView.render("show.json", activity: activity, for: nil))
 
       assert json == view_json
     end
@@ -279,6 +317,34 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
       end)
     end
 
+    test "echoes the Sec-WebSocket-Protocol token in the handshake", %{token: token} do
+      assert {:ok, %{status: 101, headers: headers}} =
+               raw_websocket_handshake("?stream=user", [
+                 {"sec-websocket-protocol", token.token}
+               ])
+
+      assert {"sec-websocket-protocol", token.token} in headers
+    end
+
+    test "echoes the selected Sec-WebSocket-Protocol token", %{token: token} do
+      assert {:ok, %{status: 101, headers: headers}} =
+               raw_websocket_handshake("?stream=user", [
+                 {"sec-websocket-protocol", "#{token.token}, phoenix"}
+               ])
+
+      assert {"sec-websocket-protocol", token.token} in headers
+    end
+
+    test "does not echo an invalid Sec-WebSocket-Protocol token", %{token: token} do
+      assert {:ok, %{status: 401, headers: headers}} =
+               raw_websocket_handshake("?stream=user", [
+                 {"sec-websocket-protocol", "invalid"}
+               ])
+
+      refute {"sec-websocket-protocol", token.token} in headers
+      refute List.keymember?(headers, "sec-websocket-protocol", 0)
+    end
+
     test "prefers sec-websocket-protocol token over query access_token", %{
       token: token,
       user: user
@@ -450,12 +516,12 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
       assert {:ok, json} = Jason.decode(json["payload"])
 
       view_json =
-        Pleroma.Web.MastodonAPI.StatusView.render("show.json",
-          activity: activity,
-          for: reading_user
+        atom_key_to_string(
+          StatusView.render("show.json",
+            activity: activity,
+            for: reading_user
+          )
         )
-        |> Jason.encode!()
-        |> Jason.decode!()
 
       assert json == view_json
     end
@@ -478,12 +544,12 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
       activity = Pleroma.Activity.normalize(activity)
 
       view_json =
-        Pleroma.Web.MastodonAPI.StatusView.render("show.json",
-          activity: activity,
-          for: reading_user
+        atom_key_to_string(
+          StatusView.render("show.json",
+            activity: activity,
+            for: reading_user
+          )
         )
-        |> Jason.encode!()
-        |> Jason.decode!()
 
       assert {:ok, %{"event" => "status.update", "payload" => ^view_json}} = decode_json(raw_json)
     end

From 1e65c7a69e3cbd84009563a8d1974f772188a4b7 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 22 May 2026 20:36:52 +0400
Subject: [PATCH 054/163] Add grouped notifications API

---
 changelog.d/grouped-notifications-api.add     |   1 +
 lib/pleroma/notification.ex                   |  84 +++++++++
 .../operations/notification_operation.ex      | 159 ++++++++++++++++
 .../controllers/notification_controller.ex    | 146 ++++++++++++++-
 lib/pleroma/web/mastodon_api/mastodon_api.ex  | 177 ++++++++++++++++--
 .../mastodon_api/views/notification_view.ex   | 120 +++++++++++-
 lib/pleroma/web/router.ex                     |  10 +
 .../notification_controller_test.exs          | 169 +++++++++++++++++
 .../views/notification_view_test.exs          |   8 +-
 9 files changed, 850 insertions(+), 24 deletions(-)
 create mode 100644 changelog.d/grouped-notifications-api.add

diff --git a/changelog.d/grouped-notifications-api.add b/changelog.d/grouped-notifications-api.add
new file mode 100644
index 000000000..82ce8b178
--- /dev/null
+++ b/changelog.d/grouped-notifications-api.add
@@ -0,0 +1 @@
+Add Mastodon-compatible grouped notifications API endpoints under `/api/v2/notifications`
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index b8693c3a8..ec10854e3 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -62,6 +62,90 @@ defmodule Pleroma.Notification do
     |> Repo.aggregate(:count, :id)
   end
 
+  @groupable_notification_types ~w{favourite follow reblog}
+  @group_bucket_seconds 12 * 60 * 60
+
+  def groupable_notification_types, do: @groupable_notification_types
+
+  def group_notifications(notifications, grouped_types \\ nil) do
+    grouped_types = normalize_grouped_types(grouped_types)
+
+    {group_keys, grouped_notifications} =
+      Enum.reduce(notifications, {[], %{}}, fn notification,
+                                               {group_keys, grouped_notifications} ->
+        group_key = group_key(notification, grouped_types)
+
+        if Map.has_key?(grouped_notifications, group_key) do
+          {group_keys, Map.update!(grouped_notifications, group_key, &[notification | &1])}
+        else
+          {[group_key | group_keys], Map.put(grouped_notifications, group_key, [notification])}
+        end
+      end)
+
+    group_keys
+    |> Enum.reverse()
+    |> Enum.map(fn group_key ->
+      grouped_notifications
+      |> Map.fetch!(group_key)
+      |> Enum.reverse()
+    end)
+  end
+
+  def group_key(notification, grouped_types \\ nil)
+
+  def group_key(%Notification{} = notification, nil) do
+    group_key(notification, @groupable_notification_types)
+  end
+
+  def group_key(%Notification{type: type} = notification, grouped_types) do
+    grouped_types = normalize_grouped_types(grouped_types)
+
+    if type in @groupable_notification_types and type in grouped_types do
+      case group_target_id(notification) do
+        nil -> ungrouped_group_key(notification)
+        target_id -> "#{type}-#{target_id}-#{group_time_bucket(notification)}"
+      end
+    else
+      ungrouped_group_key(notification)
+    end
+  end
+
+  def normalize_grouped_types(nil), do: @groupable_notification_types
+  def normalize_grouped_types(types) when is_list(types), do: types
+  def normalize_grouped_types(type), do: [type]
+
+  defp ungrouped_group_key(%Notification{id: id}), do: "ungrouped-#{id}"
+
+  defp group_time_bucket(%Notification{inserted_at: inserted_at}) do
+    inserted_at
+    |> NaiveDateTime.to_erl()
+    |> :calendar.datetime_to_gregorian_seconds()
+    |> div(@group_bucket_seconds)
+  end
+
+  defp group_target_id(%Notification{type: type, activity: activity})
+       when type in ["favourite", "reblog"] do
+    with object_id when is_binary(object_id) <- object_id_for(activity),
+         %Activity{id: id} <- Activity.get_create_by_object_ap_id(object_id) do
+      to_string(id)
+    else
+      _ -> nil
+    end
+  end
+
+  defp group_target_id(%Notification{type: "follow", activity: %{data: %{"object" => ap_id}}}) do
+    case User.get_cached_by_ap_id(ap_id) do
+      %User{id: id} -> to_string(id)
+      _ -> nil
+    end
+  end
+
+  defp group_target_id(_), do: nil
+
+  defp object_id_for(%{data: %{"object" => %{"id" => id}}}) when is_binary(id), do: id
+  defp object_id_for(%{data: %{"object" => id}}) when is_binary(id), do: id
+  defp object_id_for(_), do: nil
+
   @notification_types ~w{
     favourite
     follow
diff --git a/lib/pleroma/web/api_spec/operations/notification_operation.ex b/lib/pleroma/web/api_spec/operations/notification_operation.ex
index 94d1f6b82..ba996c13b 100644
--- a/lib/pleroma/web/api_spec/operations/notification_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/notification_operation.ex
@@ -91,6 +91,79 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
     }
   end
 
+  def grouped_index_operation do
+    %Operation{
+      tags: ["Notifications"],
+      summary: "Retrieve grouped notifications",
+      description: "Notifications concerning the user, grouped by supported notification types.",
+      operationId: "NotificationController.grouped_index",
+      security: [%{"oAuth" => ["read:notifications"]}],
+      parameters: grouped_notification_params() ++ pagination_params(),
+      responses: %{
+        200 => Operation.response("Grouped notifications", "application/json", grouped_result()),
+        404 => Operation.response("Error", "application/json", ApiError)
+      }
+    }
+  end
+
+  def show_group_operation do
+    %Operation{
+      tags: ["Notifications"],
+      summary: "Retrieve a notification group",
+      operationId: "NotificationController.show_group",
+      security: [%{"oAuth" => ["read:notifications"]}],
+      parameters: [group_key_param()],
+      responses: %{
+        200 => Operation.response("Grouped notifications", "application/json", grouped_result()),
+        404 => Operation.response("Error", "application/json", ApiError)
+      }
+    }
+  end
+
+  def group_accounts_operation do
+    %Operation{
+      tags: ["Notifications"],
+      summary: "Retrieve notification group accounts",
+      operationId: "NotificationController.group_accounts",
+      security: [%{"oAuth" => ["write:notifications"]}],
+      parameters: [group_key_param()],
+      responses: %{
+        200 =>
+          Operation.response("Accounts", "application/json", %Schema{
+            type: :array,
+            items: Account
+          })
+      }
+    }
+  end
+
+  def unread_count_operation do
+    %Operation{
+      tags: ["Notifications"],
+      summary: "Retrieve unread grouped notification count",
+      operationId: "NotificationController.unread_count",
+      security: [%{"oAuth" => ["read:notifications"]}],
+      parameters:
+        grouped_notification_params() ++
+          [
+            Operation.parameter(
+              :limit,
+              :query,
+              %Schema{type: :integer},
+              "Maximum number of notifications to count"
+            )
+          ],
+      responses: %{
+        200 =>
+          Operation.response("Unread notification group count", "application/json", %Schema{
+            type: :object,
+            properties: %{count: %Schema{type: :integer}}
+          }),
+        404 => Operation.response("Error", "application/json", ApiError)
+      }
+    }
+  end
+
   def clear_operation do
     %Operation{
       tags: ["Notifications"],
@@ -114,6 +187,18 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
     }
   end
 
+  def dismiss_group_operation do
+    %Operation{
+      tags: ["Notifications"],
+      summary: "Dismiss a notification group",
+      description: "Clear all notifications in a notification group from the server.",
+      operationId: "NotificationController.dismiss_group",
+      parameters: [group_key_param()],
+      security: [%{"oAuth" => ["write:notifications"]}],
+      responses: %{200 => empty_object_response()}
+    }
+  end
+
   def dismiss_via_body_operation do
     %Operation{
       tags: ["Notifications"],
@@ -194,6 +279,73 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
     }
   end
 
+  defp grouped_result do
+    %Schema{
+      title: "GroupedNotificationsResults",
+      type: :object,
+      properties: %{
+        accounts: %Schema{type: :array, items: Account},
+        statuses: %Schema{type: :array, items: Status},
+        notification_groups: %Schema{type: :array, items: notification_group()}
+      },
+      required: [:accounts, :statuses, :notification_groups]
+    }
+  end
+
+  defp notification_group do
+    %Schema{
+      title: "NotificationGroup",
+      type: :object,
+      properties: %{
+        group_key: %Schema{type: :string},
+        notifications_count: %Schema{type: :integer},
+        type: notification_type(),
+        most_recent_notification_id: %Schema{type: :string},
+        page_min_id: %Schema{type: :string, nullable: true},
+        page_max_id: %Schema{type: :string, nullable: true},
+        latest_page_notification_at: %Schema{type: :string, format: :"date-time", nullable: true},
+        sample_account_ids: %Schema{type: :array, items: %Schema{type: :string}},
+        status_id: %Schema{type: :string, nullable: true}
+      },
+      required: [
+        :group_key,
+        :notifications_count,
+        :type,
+        :most_recent_notification_id,
+        :sample_account_ids
+      ]
+    }
+  end
+
+  defp grouped_notification_params do
+    [
+      Operation.parameter(
+        :exclude_types,
+        :query,
+        %Schema{type: :array, items: notification_type()},
+        "Array of types to exclude"
+      ),
+      Operation.parameter(
+        :account_id,
+        :query,
+        %Schema{type: :string},
+        "Return only notifications received from this account"
+      ),
+      Operation.parameter(
+        :types,
+        :query,
+        %Schema{type: :array, items: notification_type()},
+        "Include the notifications for activities with the given types"
+      ),
+      Operation.parameter(
+        :grouped_types,
+        :query,
+        %Schema{type: :array, items: notification_type()},
+        "Notification types that may be grouped"
+      )
+    ]
+  end
+
   defp notification_type do
     %Schema{
       type: :string,
@@ -239,4 +391,11 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
       required: true
     )
   end
+
+  defp group_key_param do
+    Operation.parameter(:group_key, :path, :string, "Notification group key",
+      example: "favourite-123",
+      required: true
+    )
+  end
 end
diff --git a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
index afd83b785..5cd8576c1 100644
--- a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
@@ -8,10 +8,12 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
   import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
 
   alias Pleroma.Notification
+  alias Pleroma.User
+  alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.MastodonAPI.MastodonAPI
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
-  @oauth_read_actions [:show, :index]
+  @oauth_read_actions [:show, :index, :grouped_index, :show_group, :unread_count]
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate, replace_params: false)
 
@@ -39,7 +41,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
 
   # GET /api/v1/notifications
   def index(%{private: %{open_api_spex: %{params: %{account_id: account_id} = params}}} = conn, _) do
-    case Pleroma.User.get_cached_by_id(account_id) do
+    case User.get_cached_by_id(account_id) do
       %{ap_id: account_ap_id} ->
         params =
           params
@@ -59,10 +61,110 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
     do_get_notifications(conn, params)
   end
 
+  # GET /api/v2/notifications
+  def grouped_index(
+        %{private: %{open_api_spex: %{params: %{account_id: account_id} = params}}} = conn,
+        _
+      ) do
+    case User.get_cached_by_id(account_id) do
+      %{ap_id: account_ap_id} ->
+        params =
+          params
+          |> Map.delete(:account_id)
+          |> Map.put(:account_ap_id, account_ap_id)
+
+        do_get_grouped_notifications(conn, params)
+
+      _ ->
+        conn
+        |> put_status(:not_found)
+        |> json(%{"error" => "Account is not found"})
+    end
+  end
+
+  def grouped_index(%{private: %{open_api_spex: %{params: params}}} = conn, _) do
+    do_get_grouped_notifications(conn, params)
+  end
+
+  # GET /api/v2/notifications/:group_key
+  def show_group(
+        %{assigns: %{user: user}, private: %{open_api_spex: %{params: %{group_key: group_key}}}} =
+          conn,
+        _
+      ) do
+    notifications = MastodonAPI.get_notification_group(user, group_key, %{})
+
+    if Enum.empty?(notifications) do
+      conn
+      |> put_status(:not_found)
+      |> json(%{"error" => "Notification group is not found"})
+    else
+      grouped_types = if String.starts_with?(group_key, "ungrouped-"), do: [], else: nil
+
+      render(conn, "grouped_index.json",
+        notification_groups: [notifications],
+        for: user,
+        grouped_types: grouped_types
+      )
+    end
+  end
+
+  # GET /api/v2/notifications/:group_key/accounts
+  def group_accounts(
+        %{assigns: %{user: user}, private: %{open_api_spex: %{params: %{group_key: group_key}}}} =
+          conn,
+        _
+      ) do
+    users =
+      user
+      |> MastodonAPI.get_notification_group(group_key, %{})
+      |> notification_actors()
+
+    json(conn, AccountView.render("index.json", %{users: users, for: user}))
+  end
+
+  # GET /api/v2/notifications/unread_count
+  def unread_count(
+        %{private: %{open_api_spex: %{params: %{account_id: account_id} = params}}} = conn,
+        _
+      ) do
+    case User.get_cached_by_id(account_id) do
+      %{ap_id: account_ap_id} ->
+        params =
+          params
+          |> Map.delete(:account_id)
+          |> Map.put(:account_ap_id, account_ap_id)
+
+        do_get_unread_group_count(conn, params)
+
+      _ ->
+        conn
+        |> put_status(:not_found)
+        |> json(%{"error" => "Account is not found"})
+    end
+  end
+
+  def unread_count(%{private: %{open_api_spex: %{params: params}}} = conn, _) do
+    do_get_unread_group_count(conn, params)
+  end
+
+  # POST /api/v2/notifications/:group_key/dismiss
+  def dismiss_group(
+        %{assigns: %{user: user}, private: %{open_api_spex: %{params: %{group_key: group_key}}}} =
+          conn,
+        _
+      ) do
+    ids =
+      user
+      |> MastodonAPI.get_notification_group(group_key, %{})
+      |> Enum.map(& &1.id)
+
+    Notification.destroy_multiple(user, ids)
+    json(conn, %{})
+  end
+
   defp do_get_notifications(%{assigns: %{user: user}} = conn, params) do
-    params =
-      Map.new(params, fn {k, v} -> {to_string(k), v} end)
-      |> Map.put_new("types", Map.get(params, :include_types, @default_notification_types))
+    params = normalize_notification_params(params)
 
     notifications = MastodonAPI.get_notifications(user, params)
 
@@ -74,6 +176,40 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
     )
   end
 
+  defp do_get_grouped_notifications(%{assigns: %{user: user}} = conn, params) do
+    params = normalize_notification_params(params)
+
+    {notification_groups, page_notifications, notification_group_counts} =
+      MastodonAPI.get_grouped_notification_page(user, params)
+
+    conn
+    |> add_link_headers(page_notifications)
+    |> render("grouped_index.json",
+      notification_groups: notification_groups,
+      notification_group_counts: notification_group_counts,
+      for: user,
+      grouped_types: params["grouped_types"]
+    )
+  end
+
+  defp do_get_unread_group_count(%{assigns: %{user: user}} = conn, params) do
+    params = normalize_notification_params(params)
+    json(conn, %{count: MastodonAPI.unread_notification_group_count(user, params)})
+  end
+
+  defp normalize_notification_params(params) do
+    params
+    |> Map.new(fn {k, v} -> {to_string(k), v} end)
+    |> Map.put_new("types", Map.get(params, :include_types, @default_notification_types))
+  end
+
+  defp notification_actors(notifications) do
+    notifications
+    |> Enum.map(&User.get_cached_by_ap_id(&1.activity.data["actor"]))
+    |> Enum.filter(& &1)
+    |> Enum.uniq_by(& &1.id)
+  end
+
   # GET /api/v1/notifications/:id
   def show(%{assigns: %{user: user}, private: %{open_api_spex: %{params: %{id: id}}}} = conn, _) do
     with {:ok, notification} <- Notification.get(user, id) do
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index c9e045d23..57cbfd6bf 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -8,6 +8,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
 
   alias Pleroma.Notification
   alias Pleroma.Pagination
+  alias Pleroma.Repo
   alias Pleroma.ScheduledActivity
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
@@ -61,29 +62,175 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   end
 
   def get_notifications(user, params \\ %{}) do
-    options =
-      cast_params(params) |> Map.update(:include_types, [], fn include_types -> include_types end)
+    user
+    |> notifications_query(params)
+    |> Pagination.fetch_paginated(params)
+  end
 
-    options =
-      if ("pleroma:report" not in options.include_types and
-            User.privileged?(user, :reports_manage_reports)) or
-           User.privileged?(user, :reports_manage_reports) do
-        options
-      else
-        options
-        |> Map.update(:exclude_types, ["pleroma:report"], fn current_exclude_types ->
-          current_exclude_types ++ ["pleroma:report"]
-        end)
-      end
+  def get_grouped_notification_page(user, params \\ %{}) do
+    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
+    {query, order} = group_pagination_query(notifications_query(user, params), params)
+
+    notifications =
+      query
+      |> order_by([n], [{^order, n.id}])
+      |> Repo.all()
+
+    notification_group_counts =
+      Enum.frequencies_by(notifications, &Notification.group_key(&1, grouped_types))
+
+    page_notifications =
+      notifications
+      |> take_grouped_page_notifications(grouped_types, grouped_limit(params))
+
+    page_notifications =
+      if order == :asc, do: Enum.reverse(page_notifications), else: page_notifications
+
+    {
+      Notification.group_notifications(page_notifications, grouped_types),
+      page_notifications,
+      notification_group_counts
+    }
+  end
+
+  def get_grouped_notification_groups(user, params \\ %{}) do
+    {groups, _notifications, _notification_group_counts} =
+      get_grouped_notification_page(user, params)
+
+    groups
+  end
+
+  def get_notification_group(user, group_key, params \\ %{})
+
+  def get_notification_group(user, "ungrouped-" <> notification_id, _params) do
+    case Notification.get(user, notification_id) do
+      {:ok, notification} -> [notification]
+      _ -> []
+    end
+  end
+
+  def get_notification_group(user, group_key, params) do
+    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
+
+    user
+    |> notifications_query(params)
+    |> order_by([n], desc: n.id)
+    |> Repo.all()
+    |> Enum.filter(&(Notification.group_key(&1, grouped_types) == group_key))
+  end
+
+  defp group_pagination_query(query, params) do
+    cond do
+      min_id = Map.get(params, "min_id", Map.get(params, :min_id)) ->
+        query = where(query, [n], n.id > ^min_id)
+
+        query =
+          case Map.get(params, "max_id", Map.get(params, :max_id)) do
+            nil -> query
+            max_id -> where(query, [n], n.id < ^max_id)
+          end
+
+        {query, :asc}
+
+      since_id = Map.get(params, "since_id", Map.get(params, :since_id)) ->
+        {where(query, [n], n.id > ^since_id), :desc}
+
+      max_id = Map.get(params, "max_id", Map.get(params, :max_id)) ->
+        {where(query, [n], n.id < ^max_id), :desc}
+
+      true ->
+        {query, :desc}
+    end
+  end
+
+  defp grouped_limit(params) do
+    params
+    |> Map.get("limit", Map.get(params, :limit, 40))
+    |> parse_limit(40)
+    |> min(80)
+  end
+
+  defp take_grouped_page_notifications(notifications, grouped_types, group_limit) do
+    {notifications, _group_keys} =
+      Enum.reduce_while(notifications, {[], MapSet.new()}, fn notification,
+                                                              {notifications, group_keys} ->
+        group_key = Notification.group_key(notification, grouped_types)
+
+        cond do
+          MapSet.member?(group_keys, group_key) ->
+            {:cont, {[notification | notifications], group_keys}}
+
+          MapSet.size(group_keys) < group_limit ->
+            {:cont, {[notification | notifications], MapSet.put(group_keys, group_key)}}
+
+          true ->
+            {:halt, {notifications, group_keys}}
+        end
+      end)
+
+    Enum.reverse(notifications)
+  end
+
+  def unread_notification_group_count(user, params \\ %{}) do
+    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
+    limit = unread_count_limit(params)
+
+    user
+    |> notifications_query(params)
+    |> where([n], n.seen == false)
+    |> order_by([n], desc: n.id)
+    |> limit(^limit)
+    |> Repo.all()
+    |> Notification.group_notifications(grouped_types)
+    |> length()
+  end
+
+  defp notifications_query(user, params) do
+    options = notification_options(user, params)
 
     user
     |> Notification.for_user_query(options)
     |> restrict(:types, options)
     |> restrict(:exclude_types, options)
     |> restrict(:account_ap_id, options)
-    |> Pagination.fetch_paginated(params)
   end
 
+  defp notification_options(user, params) do
+    options =
+      params
+      |> cast_params()
+      |> Map.update(:include_types, [], fn include_types -> include_types end)
+
+    if ("pleroma:report" not in options.include_types and
+          User.privileged?(user, :reports_manage_reports)) or
+         User.privileged?(user, :reports_manage_reports) do
+      options
+    else
+      options
+      |> Map.update(:exclude_types, ["pleroma:report"], fn current_exclude_types ->
+        current_exclude_types ++ ["pleroma:report"]
+      end)
+    end
+  end
+
+  defp unread_count_limit(params) do
+    params
+    |> Map.get("limit", Map.get(params, :limit, 100))
+    |> parse_limit(100)
+    |> min(1000)
+  end
+
+  defp parse_limit(limit, _default) when is_integer(limit) and limit > 0, do: limit
+
+  defp parse_limit(limit, default) when is_binary(limit) do
+    case Integer.parse(limit) do
+      {limit, _} when limit > 0 -> limit
+      _ -> default
+    end
+  end
+
+  defp parse_limit(_, default), do: default
+
   def get_scheduled_activities(user, params \\ %{}) do
     user
     |> ScheduledActivity.for_user_query()
@@ -95,6 +242,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
       exclude_types: {:array, :string},
       types: {:array, :string},
       exclude_visibilities: {:array, :string},
+      grouped_types: {:array, :string},
+      limit: :integer,
       reblogs: :boolean,
       with_muted: :boolean,
       account_ap_id: :string,
diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex
index 27532c42a..466073853 100644
--- a/lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex
@@ -72,6 +72,49 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
     safe_render_many(notifications, NotificationView, "show.json", opts)
   end
 
+  def render("grouped_index.json", %{notifications: notifications} = opts) do
+    grouped_types = Notification.normalize_grouped_types(opts[:grouped_types])
+
+    opts
+    |> Map.delete(:notifications)
+    |> Map.put(
+      :notification_groups,
+      Notification.group_notifications(notifications, grouped_types)
+    )
+    |> then(&render("grouped_index.json", &1))
+  end
+
+  def render(
+        "grouped_index.json",
+        %{notification_groups: notification_groups, for: reading_user} = opts
+      ) do
+    grouped_types = Notification.normalize_grouped_types(opts[:grouped_types])
+    notification_group_counts = Map.get(opts, :notification_group_counts, %{})
+
+    statuses =
+      notification_groups
+      |> Enum.map(&List.first/1)
+      |> Enum.map(&render("show.json", %{notification: &1, for: reading_user}))
+      |> Enum.map(& &1[:status])
+      |> Enum.filter(& &1)
+      |> Enum.uniq_by(& &1[:id])
+
+    actors =
+      notification_groups
+      |> List.flatten()
+      |> notification_actors()
+
+    %{
+      accounts: AccountView.render("index.json", %{users: actors, for: reading_user}),
+      statuses: statuses,
+      notification_groups:
+        Enum.map(
+          notification_groups,
+          &render_group(&1, reading_user, grouped_types, notification_group_counts)
+        )
+    }
+  end
+
   def render(
         "show.json",
         %{
@@ -95,7 +138,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
 
     response = %{
       id: to_string(notification.id),
-      group_key: "ungrouped-" <> to_string(notification.id),
+      group_key: Notification.group_key(notification),
       type: notification.type,
       created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at),
       account: account,
@@ -137,6 +180,81 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
     Map.put(response, :report, report_render)
   end
 
+  defp render_group(
+         [%Notification{} = notification | _] = notifications,
+         _reading_user,
+         grouped_types,
+         notification_group_counts
+       ) do
+    latest_notification = List.first(notifications)
+    oldest_notification = List.last(notifications)
+    status_activity = status_activity_for_group(notifications, grouped_types)
+    group_key = Notification.group_key(notification, grouped_types)
+
+    response = %{
+      group_key: group_key,
+      notifications_count: Map.get(notification_group_counts, group_key, length(notifications)),
+      type: notification.type,
+      most_recent_notification_id: to_string(latest_notification.id),
+      page_min_id: to_string(oldest_notification.id),
+      page_max_id: to_string(latest_notification.id),
+      latest_page_notification_at: CommonAPI.Utils.to_masto_date(latest_notification.inserted_at),
+      sample_account_ids:
+        notifications
+        |> notification_actors()
+        |> Enum.map(&to_string(&1.id))
+    }
+
+    if status_activity do
+      Map.put(response, :status_id, to_string(status_activity.id))
+    else
+      response
+    end
+  end
+
+  defp status_activity_for_group([%Notification{} = notification | _], grouped_types) do
+    status_activity_for(notification, grouped_types)
+  end
+
+  defp status_activity_for(%Notification{type: type, activity: activity}, _grouped_types)
+       when type in ["mention", "status", "poll"] do
+    activity
+  end
+
+  defp status_activity_for(%Notification{type: type} = notification, grouped_types)
+       when type in ["favourite", "reblog"] do
+    group_key = Notification.group_key(notification, grouped_types)
+
+    case String.split(group_key, "-", parts: 3) do
+      [^type, activity_id, _bucket] ->
+        case Activity.create_by_id_with_object(activity_id) do
+          %Activity{} = activity -> activity
+          _ -> parent_status_activity(notification.activity)
+        end
+
+      _ ->
+        parent_status_activity(notification.activity)
+    end
+  end
+
+  defp status_activity_for(%Notification{type: type, activity: activity}, _grouped_types)
+       when type in ["update", "pleroma:emoji_reaction"] do
+    parent_status_activity(activity)
+  end
+
+  defp status_activity_for(_, _grouped_types), do: nil
+
+  defp parent_status_activity(activity) do
+    Activity.get_create_by_object_ap_id(object_id_for(activity))
+  end
+
+  defp notification_actors(notifications) do
+    notifications
+    |> Enum.map(&User.get_cached_by_ap_id(&1.activity.data["actor"]))
+    |> Enum.filter(& &1)
+    |> Enum.uniq_by(& &1.id)
+  end
+
   defp put_emoji(response, activity) do
     response
     |> Map.put(:emoji, activity.data["content"])
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 813c5c482..5657bcad7 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -844,6 +844,16 @@ defmodule Pleroma.Web.Router do
     get("/directory", DirectoryController, :index)
   end
 
+  scope "/api/v2", Pleroma.Web.MastodonAPI do
+    pipe_through(:authenticated_api)
+
+    get("/notifications", NotificationController, :grouped_index)
+    get("/notifications/unread_count", NotificationController, :unread_count)
+    get("/notifications/:group_key/accounts", NotificationController, :group_accounts)
+    get("/notifications/:group_key", NotificationController, :show_group)
+    post("/notifications/:group_key/dismiss", NotificationController, :dismiss_group)
+  end
+
   scope "/api/v2", Pleroma.Web.MastodonAPI do
     pipe_through(:api)
 
diff --git a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
index dd4b7389e..1d3a9e966 100644
--- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
@@ -577,6 +577,175 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
     assert [%{"id" => ^notification4_id}, %{"id" => ^notification3_id}] = result
   end
 
+  describe "GET /api/v2/notifications" do
+    test "groups favourite notifications for the same status" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+      {:ok, _} = CommonAPI.favorite(status.id, other_user1)
+      {:ok, _} = CommonAPI.favorite(status.id, other_user2)
+
+      notification_ids =
+        Notification
+        |> Repo.all()
+        |> Enum.map(&to_string(&1.id))
+
+      result =
+        conn
+        |> get("/api/v2/notifications")
+        |> json_response_and_validate_schema(200)
+
+      assert [%{"id" => account_id1}, %{"id" => account_id2}] = result["accounts"]
+      assert account_id1 in [other_user1.id, other_user2.id]
+      assert account_id2 in [other_user1.id, other_user2.id]
+      assert [%{"id" => status_id}] = result["statuses"]
+      assert status_id == status.id
+
+      assert [group] = result["notification_groups"]
+      assert group["type"] == "favourite"
+      assert group["notifications_count"] == 2
+      assert group["status_id"] == status.id
+      assert group["most_recent_notification_id"] in notification_ids
+      assert group["page_min_id"] in notification_ids
+      assert group["page_max_id"] in notification_ids
+      assert group["latest_page_notification_at"]
+      assert Enum.sort(group["sample_account_ids"]) == Enum.sort([other_user1.id, other_user2.id])
+      group_key = group["group_key"]
+
+      assert [%{"group_key" => ^group_key}, %{"group_key" => ^group_key}] =
+               conn
+               |> get("/api/v1/notifications")
+               |> json_response_and_validate_schema(200)
+
+      assert %{"notification_groups" => [shown_group]} =
+               conn
+               |> get("/api/v2/notifications/#{group_key}")
+               |> json_response_and_validate_schema(200)
+
+      assert shown_group["group_key"] == group_key
+      assert shown_group["notifications_count"] == 2
+    end
+
+    test "round-trips ungrouped group keys when grouped_types excludes a type" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+      {:ok, _} = CommonAPI.favorite(status.id, other_user)
+
+      %{"notification_groups" => [%{"group_key" => "ungrouped-" <> _ = group_key}]} =
+        conn
+        |> get("/api/v2/notifications?grouped_types[]=reblog")
+        |> json_response_and_validate_schema(200)
+
+      assert %{
+               "notification_groups" => [%{"group_key" => ^group_key, "notifications_count" => 1}]
+             } =
+               conn
+               |> get("/api/v2/notifications/#{group_key}")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "paginates notification groups instead of raw notifications" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+      other_user3 = insert(:user)
+
+      {:ok, older_status} = CommonAPI.post(user, %{status: "older"})
+      {:ok, _} = CommonAPI.favorite(older_status.id, other_user3)
+
+      {:ok, newer_status} = CommonAPI.post(user, %{status: "newer"})
+      {:ok, _} = CommonAPI.favorite(newer_status.id, other_user1)
+      {:ok, _} = CommonAPI.favorite(newer_status.id, other_user2)
+      older_status_id = older_status.id
+      newer_status_id = newer_status.id
+
+      %{"notification_groups" => groups} =
+        conn
+        |> get("/api/v2/notifications?limit=2")
+        |> json_response_and_validate_schema(200)
+
+      assert [
+               %{"status_id" => ^newer_status_id, "notifications_count" => 2},
+               %{"status_id" => ^older_status_id, "notifications_count" => 1}
+             ] = groups
+    end
+
+    test "returns total notification count for a partially represented group" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+      other_user3 = insert(:user)
+
+      {:ok, grouped_status} = CommonAPI.post(user, %{status: "grouped"})
+      {:ok, _} = CommonAPI.favorite(grouped_status.id, other_user1)
+
+      {:ok, other_status} = CommonAPI.post(user, %{status: "other"})
+      {:ok, _} = CommonAPI.favorite(other_status.id, other_user3)
+      {:ok, _} = CommonAPI.favorite(grouped_status.id, other_user2)
+      grouped_status_id = grouped_status.id
+
+      assert %{
+               "notification_groups" => [
+                 %{"status_id" => ^grouped_status_id, "notifications_count" => 2}
+               ]
+             } =
+               conn
+               |> get("/api/v2/notifications?limit=1")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "counts unread notification groups" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+      mentioner = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+      {:ok, _} = CommonAPI.favorite(status.id, other_user1)
+      {:ok, _} = CommonAPI.favorite(status.id, other_user2)
+      {:ok, _} = CommonAPI.post(mentioner, %{status: "hi @#{user.nickname}"})
+
+      assert %{"count" => 2} =
+               conn
+               |> get("/api/v2/notifications/unread_count")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "lists accounts from and dismisses a notification group" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications", "write:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+      {:ok, _} = CommonAPI.favorite(status.id, other_user1)
+      {:ok, _} = CommonAPI.favorite(status.id, other_user2)
+
+      %{"notification_groups" => [%{"group_key" => group_key}]} =
+        conn
+        |> get("/api/v2/notifications")
+        |> json_response_and_validate_schema(200)
+
+      account_ids =
+        conn
+        |> get("/api/v2/notifications/#{group_key}/accounts")
+        |> json_response_and_validate_schema(200)
+        |> Enum.map(& &1["id"])
+
+      assert Enum.sort(account_ids) == Enum.sort([other_user1.id, other_user2.id])
+
+      assert %{} =
+               conn
+               |> post("/api/v2/notifications/#{group_key}/dismiss")
+               |> json_response_and_validate_schema(200)
+
+      assert [] = Notification.for_user(user)
+    end
+  end
+
   test "doesn't see notifications after muting user with notifications" do
     %{user: user, conn: conn} = oauth_access(["read:notifications"])
     user2 = insert(:user)
diff --git a/test/pleroma/web/mastodon_api/views/notification_view_test.exs b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
index c8287bb79..aa11ad682 100644
--- a/test/pleroma/web/mastodon_api/views/notification_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
@@ -101,7 +101,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
 
     expected = %{
       id: to_string(notification.id),
-      group_key: "ungrouped-#{to_string(notification.id)}",
+      group_key: Notification.group_key(notification),
       pleroma: %{is_seen: false, is_muted: false},
       type: "favourite",
       account: AccountView.render("show.json", %{user: another_user, for: user}),
@@ -122,7 +122,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
 
     expected = %{
       id: to_string(notification.id),
-      group_key: "ungrouped-#{to_string(notification.id)}",
+      group_key: Notification.group_key(notification),
       pleroma: %{is_seen: false, is_muted: false},
       type: "reblog",
       account: AccountView.render("show.json", %{user: another_user, for: user}),
@@ -141,7 +141,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
 
     expected = %{
       id: to_string(notification.id),
-      group_key: "ungrouped-#{to_string(notification.id)}",
+      group_key: Notification.group_key(notification),
       pleroma: %{is_seen: false, is_muted: false},
       type: "follow",
       account: AccountView.render("show.json", %{user: follower, for: followed}),
@@ -333,7 +333,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
 
     expected = %{
       id: to_string(notification.id),
-      group_key: "ungrouped-#{to_string(notification.id)}",
+      group_key: Notification.group_key(notification),
       pleroma: %{is_seen: true, is_muted: true},
       type: "favourite",
       account: AccountView.render("show.json", %{user: another_user, for: user}),

From b054c2aa42748fd3489ee463f4bfd43b075ec638 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 22 May 2026 22:11:37 +0400
Subject: [PATCH 055/163] Fix paged featured collection fetches

---
 changelog.d/featured-collection-page.fix      |   1 +
 lib/pleroma/web/activity_pub/activity_pub.ex  |  36 ++++-
 .../web/activity_pub/activity_pub_test.exs    | 133 ++++++++++++++++++
 3 files changed, 168 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/featured-collection-page.fix

diff --git a/changelog.d/featured-collection-page.fix b/changelog.d/featured-collection-page.fix
new file mode 100644
index 000000000..b611a4137
--- /dev/null
+++ b/changelog.d/featured-collection-page.fix
@@ -0,0 +1 @@
+Support fetching featured collection items from the first collection page
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 0b513ee16..1e8bfe3dd 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1881,11 +1881,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  @featured_collection_types ["OrderedCollection", "Collection"]
+  @featured_collection_page_types ["OrderedCollectionPage", "CollectionPage"]
+  @featured_collection_item_types @featured_collection_types ++ @featured_collection_page_types
+
   def pin_data_from_featured_collection(%{
         "type" => type,
         "orderedItems" => objects
       })
-      when type in ["OrderedCollection", "Collection"] do
+      when type in @featured_collection_item_types do
     Map.new(objects, fn
       %{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()}
       object_ap_id when is_binary(object_ap_id) -> {object_ap_id, NaiveDateTime.utc_now()}
@@ -1903,7 +1907,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   def fetch_and_prepare_featured_from_ap_id(ap_id) do
     with {:ok, data} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id) do
-      {:ok, pin_data_from_featured_collection(data)}
+      {:ok, prepare_featured_collection(data)}
     else
       e ->
         Logger.error("Could not decode featured collection at fetch #{ap_id}, #{inspect(e)}")
@@ -1911,6 +1915,34 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  defp prepare_featured_collection(%{"orderedItems" => objects} = data) when is_list(objects) do
+    pin_data_from_featured_collection(data)
+  end
+
+  defp prepare_featured_collection(%{
+         "type" => type,
+         "first" => %{"type" => page_type} = first
+       })
+       when type in @featured_collection_types and page_type in @featured_collection_page_types do
+    pin_data_from_featured_collection(first)
+  end
+
+  defp prepare_featured_collection(%{"type" => type, "first" => first})
+       when type in @featured_collection_types and is_binary(first) do
+    case Fetcher.fetch_and_contain_remote_object_from_id(first) do
+      {:ok, data} ->
+        pin_data_from_featured_collection(data)
+
+      e ->
+        Logger.error("Could not decode featured collection page at fetch #{first}, #{inspect(e)}")
+        %{}
+    end
+  end
+
+  defp prepare_featured_collection(data) do
+    pin_data_from_featured_collection(data)
+  end
+
   def enqueue_pin_fetches(%{pinned_objects: pins}) do
     # enqueue a task to fetch all pinned objects
     Enum.each(pins, fn {ap_id, _} ->
diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs
index 9aafc41a5..dd7a82a55 100644
--- a/test/pleroma/web/activity_pub/activity_pub_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@ -415,6 +415,105 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       assert %{data: %{"id" => ^object_url}} = Object.get_by_ap_id(object_url)
     end
 
+    test "fetches user featured collection from the first collection page" do
+      ap_id = "https://example.com/users/lain"
+      featured_url = "https://example.com/users/lain/collections/featured"
+      first_page_url = "#{featured_url}?page=true"
+
+      user_data =
+        "test/fixtures/users_mock/user.json"
+        |> File.read!()
+        |> String.replace("{{nickname}}", "lain")
+        |> Jason.decode!()
+        |> Map.put("featured", featured_url)
+        |> Jason.encode!()
+
+      object_id = Ecto.UUID.generate()
+      object_url = "https://example.com/objects/#{object_id}"
+
+      featured_data =
+        Jason.encode!(%{
+          "id" => featured_url,
+          "type" => "OrderedCollection",
+          "first" => first_page_url
+        })
+
+      first_page_data =
+        Jason.encode!(%{
+          "id" => first_page_url,
+          "type" => "OrderedCollectionPage",
+          "partOf" => featured_url,
+          "orderedItems" => [object_url]
+        })
+
+      object_data =
+        "test/fixtures/statuses/note.json"
+        |> File.read!()
+        |> String.replace("{{object_id}}", object_id)
+        |> String.replace("{{nickname}}", "lain")
+
+      Tesla.Mock.mock(fn
+        %{
+          method: :get,
+          url: ^ap_id
+        } ->
+          %Tesla.Env{
+            status: 200,
+            body: user_data,
+            headers: [{"content-type", "application/activity+json"}]
+          }
+
+        %{
+          method: :get,
+          url: ^featured_url
+        } ->
+          %Tesla.Env{
+            status: 200,
+            body: featured_data,
+            headers: [{"content-type", "application/activity+json"}]
+          }
+
+        %{
+          method: :get,
+          url: ^first_page_url
+        } ->
+          %Tesla.Env{
+            status: 200,
+            body: first_page_data,
+            headers: [{"content-type", "application/activity+json"}]
+          }
+
+        %{
+          method: :get,
+          url: ^object_url
+        } ->
+          %Tesla.Env{
+            status: 200,
+            body: object_data,
+            headers: [{"content-type", "application/activity+json"}]
+          }
+      end)
+
+      refute capture_log(fn ->
+               {:ok, user} = ActivityPub.make_user_from_ap_id(ap_id)
+
+               assert_enqueued(
+                 worker: Pleroma.Workers.RemoteFetcherWorker,
+                 args: %{
+                   "op" => "fetch_remote",
+                   "id" => object_url,
+                   "depth" => 1
+                 }
+               )
+
+               Pleroma.Tests.ObanHelpers.perform_all()
+
+               assert user.featured_address == featured_url
+               assert Map.has_key?(user.pinned_objects, object_url)
+               assert %{data: %{"id" => ^object_url}} = Object.get_by_ap_id(object_url)
+             end) =~ "Could not parse featured collection"
+    end
+
     test "fetches user birthday information from misskey" do
       user_id = "https://misskey.io/@mkljczk"
 
@@ -2818,4 +2917,38 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
                "first" => "https://social.example/users/alice/collections/featured?page=true"
              })
   end
+
+  test "fetch_and_prepare_featured_from_ap_id handles embedded first collection pages" do
+    featured_url = "https://social.example/users/alice/collections/featured"
+    first_page_url = "#{featured_url}?page=true"
+    object_url = "https://social.example/objects/1"
+
+    featured_data =
+      Jason.encode!(%{
+        "id" => featured_url,
+        "type" => "OrderedCollection",
+        "first" => %{
+          "id" => first_page_url,
+          "type" => "OrderedCollectionPage",
+          "partOf" => featured_url,
+          "orderedItems" => [object_url]
+        }
+      })
+
+    Tesla.Mock.mock(fn
+      %{method: :get, url: ^featured_url} ->
+        %Tesla.Env{
+          status: 200,
+          body: featured_data,
+          headers: [{"content-type", "application/activity+json"}]
+        }
+    end)
+
+    refute capture_log(fn ->
+             assert {:ok, pinned_objects} =
+                      ActivityPub.fetch_and_prepare_featured_from_ap_id(featured_url)
+
+             assert Map.has_key?(pinned_objects, object_url)
+           end) =~ "Could not parse featured collection"
+  end
 end

From cda6738309117a8ea95f8367175dbed3587e697b Mon Sep 17 00:00:00 2001
From: hj <hj@noreply.git.pleroma.social>
Date: Fri, 22 May 2026 20:47:52 +0000
Subject: [PATCH 056/163] Update priv/scrubbers/default.ex

---
 priv/scrubbers/default.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index 8963d99e8..cc5eba027 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -105,7 +105,9 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "mfm-sparkle",
     "mfm-rotate",
     "mfm-ruby",
-    "mfm-unixtime"
+    "mfm-unixtime",
+    # Exists in Akkoma but not Misskey?
+    "mfm-center"
   ])
 
   Meta.allow_tag_with_this_attribute_values(:p, "class", ["quote-inline"])

From add3844c6d8f6e540d139f55e44047d946d9559a Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 23 May 2026 11:38:33 +0400
Subject: [PATCH 057/163] Persist notification group keys

---
 changelog.d/grouped-notifications-api.add     |   2 +-
 lib/pleroma/notification.ex                   |  39 ++-
 .../operations/notification_operation.ex      |   5 +-
 lib/pleroma/web/controller_helper.ex          |  12 +-
 .../controllers/notification_controller.ex    |  37 +--
 lib/pleroma/web/mastodon_api/mastodon_api.ex  | 307 ++++++++++++++----
 .../mastodon_api/views/notification_view.ex   |  44 ++-
 ...3070000_add_group_key_to_notifications.exs |  15 +
 .../notification_controller_test.exs          | 157 ++++++++-
 .../views/notification_view_test.exs          |   3 +
 10 files changed, 505 insertions(+), 116 deletions(-)
 create mode 100644 priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs

diff --git a/changelog.d/grouped-notifications-api.add b/changelog.d/grouped-notifications-api.add
index 82ce8b178..8c2cc5397 100644
--- a/changelog.d/grouped-notifications-api.add
+++ b/changelog.d/grouped-notifications-api.add
@@ -1 +1 @@
-Add Mastodon-compatible grouped notifications API endpoints under `/api/v2/notifications`
+Add Mastodon-compatible grouped notifications API endpoints under `/api/v2/notifications` for newly-created notifications
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index ec10854e3..afd750823 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -35,6 +35,7 @@ defmodule Pleroma.Notification do
     # remember to add a migration to add it to the `notifications_type` enum
     # as well.
     field(:type, :string)
+    field(:group_key, :string)
     belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
     belongs_to(:activity, Activity, type: FlakeId.Ecto.CompatType)
 
@@ -49,7 +50,7 @@ defmodule Pleroma.Notification do
         |> type_from_activity()
 
       notification
-      |> changeset(%{type: type})
+      |> changeset(%{type: type, group_key: grouped_notification_key(type, activity)})
       |> Repo.update()
     end
   end
@@ -97,14 +98,11 @@ defmodule Pleroma.Notification do
     group_key(notification, @groupable_notification_types)
   end
 
-  def group_key(%Notification{type: type} = notification, grouped_types) do
+  def group_key(%Notification{type: type, group_key: group_key} = notification, grouped_types) do
     grouped_types = normalize_grouped_types(grouped_types)
 
-    if type in @groupable_notification_types and type in grouped_types do
-      case group_target_id(notification) do
-        nil -> ungrouped_group_key(notification)
-        target_id -> "#{type}-#{target_id}-#{group_time_bucket(notification)}"
-      end
+    if type in @groupable_notification_types and type in grouped_types and is_binary(group_key) do
+      group_key
     else
       ungrouped_group_key(notification)
     end
@@ -116,15 +114,27 @@ defmodule Pleroma.Notification do
 
   defp ungrouped_group_key(%Notification{id: id}), do: "ungrouped-#{id}"
 
-  defp group_time_bucket(%Notification{inserted_at: inserted_at}) do
+  defp grouped_notification_key(type, activity) when type in @groupable_notification_types do
+    with target_id when is_binary(target_id) <- group_target_id(type, activity) do
+      # Mastodon uses Redis to reuse a recent bucket for rolling 12h windows. Pleroma keeps keys
+      # deterministic and self-contained; clients must treat group_key as opaque either way.
+      "#{type}-#{target_id}-#{group_time_bucket(activity)}"
+    end
+  end
+
+  defp grouped_notification_key(_type, _activity), do: nil
+
+  defp group_time_bucket(%Activity{inserted_at: inserted_at}) when not is_nil(inserted_at) do
     inserted_at
     |> NaiveDateTime.to_erl()
     |> :calendar.datetime_to_gregorian_seconds()
     |> div(@group_bucket_seconds)
   end
 
-  defp group_target_id(%Notification{type: type, activity: activity})
-       when type in ["favourite", "reblog"] do
+  defp group_time_bucket(_),
+    do: group_time_bucket(%Activity{inserted_at: NaiveDateTime.utc_now()})
+
+  defp group_target_id(type, activity) when type in ["favourite", "reblog"] do
     with object_id when is_binary(object_id) <- object_id_for(activity),
          %Activity{id: id} <- Activity.get_create_by_object_ap_id(object_id) do
       to_string(id)
@@ -133,14 +143,14 @@ defmodule Pleroma.Notification do
     end
   end
 
-  defp group_target_id(%Notification{type: "follow", activity: %{data: %{"object" => ap_id}}}) do
+  defp group_target_id("follow", %{data: %{"object" => ap_id}}) do
     case User.get_cached_by_ap_id(ap_id) do
       %User{id: id} -> to_string(id)
       _ -> nil
     end
   end
 
-  defp group_target_id(_), do: nil
+  defp group_target_id(_, _), do: nil
 
   defp object_id_for(%{data: %{"object" => %{"id" => id}}}) when is_binary(id), do: id
   defp object_id_for(%{data: %{"object" => id}}) when is_binary(id), do: id
@@ -163,7 +173,7 @@ defmodule Pleroma.Notification do
 
   def changeset(%Notification{} = notification, attrs) do
     notification
-    |> cast(attrs, [:seen, :type])
+    |> cast(attrs, [:seen, :type, :group_key])
     |> validate_inclusion(:type, @notification_types)
   end
 
@@ -542,7 +552,8 @@ defmodule Pleroma.Notification do
           user_id: user.id,
           activity: activity,
           seen: mark_as_read?(activity, user),
-          type: type
+          type: type,
+          group_key: grouped_notification_key(type, activity)
         })
         |> Marker.multi_set_last_read_id(user, "notifications")
         |> Repo.transaction()
diff --git a/lib/pleroma/web/api_spec/operations/notification_operation.ex b/lib/pleroma/web/api_spec/operations/notification_operation.ex
index ba996c13b..6c8f7d5e9 100644
--- a/lib/pleroma/web/api_spec/operations/notification_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/notification_operation.ex
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ApiSpec.NotificationOperation do
-  alias OpenApiSpex.Operation
   alias OpenApiSpex.Operation
   alias OpenApiSpex.Schema
   alias Pleroma.Web.ApiSpec.Schemas.Account
@@ -125,7 +124,7 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
       tags: ["Notifications"],
       summary: "Retrieve notification group accounts",
       operationId: "NotificationController.group_accounts",
-      security: [%{"oAuth" => ["write:notifications"]}],
+      security: [%{"oAuth" => ["read:notifications"]}],
       parameters: [group_key_param()],
       responses: %{
         200 =>
@@ -269,7 +268,7 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do
       },
       example: %{
         "id" => "34975861",
-        "group-key" => "ungrouped-34975861",
+        "group_key" => "ungrouped-34975861",
         "type" => "mention",
         "created_at" => "2019-11-23T07:49:02.064Z",
         "account" => Account.schema().example,
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index b15b0ea81..eecd1774f 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -55,16 +55,24 @@ defmodule Pleroma.Web.ControllerHelper do
 
   # TODO: Only fetch the params from open_api_spex when everything is converted
   @id_keys Pagination.page_keys() -- ["limit", "order"]
+  @id_key_atoms Enum.map(@id_keys, &String.to_atom/1)
   defp build_pagination_fields(conn, min_id, max_id, extra_params, order) do
+    path_param_keys =
+      conn.path_params
+      |> Map.keys()
+      |> Enum.flat_map(&[&1, String.to_existing_atom(&1)])
+
     params =
       if Map.has_key?(conn.private, :open_api_spex) do
         get_in(conn, [Access.key(:private), Access.key(:open_api_spex), Access.key(:params)])
       else
         conn.params
       end
-      |> Map.drop(Map.keys(conn.path_params) |> Enum.map(&String.to_existing_atom/1))
+      |> Map.drop(path_param_keys)
       |> Map.merge(extra_params)
-      |> Map.drop(@id_keys)
+      # OpenApiSpex casts params to atoms while uncast conn params are string-keyed. Drop both so
+      # generated links replace pagination cursors instead of preserving stale request cursors.
+      |> Map.drop(@id_keys ++ @id_key_atoms)
 
     {{next_id, nid}, {prev_id, pid}} =
       if order == :desc,
diff --git a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
index 5cd8576c1..2cc31db0c 100644
--- a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
@@ -13,7 +13,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
   alias Pleroma.Web.MastodonAPI.MastodonAPI
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
-  @oauth_read_actions [:show, :index, :grouped_index, :show_group, :unread_count]
+  # Mastodon's docs currently list write:notifications for group accounts, but the endpoint is
+  # read-only and Mastodon's implementation accepts read:notifications. Prefer least privilege.
+  @oauth_read_actions [:show, :index, :grouped_index, :show_group, :group_accounts, :unread_count]
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate, replace_params: false)
 
@@ -92,7 +94,8 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
           conn,
         _
       ) do
-    notifications = MastodonAPI.get_notification_group(user, group_key, %{})
+    {notifications, notification_group_counts, notification_group_bounds} =
+      MastodonAPI.get_notification_group_result(user, group_key, %{})
 
     if Enum.empty?(notifications) do
       conn
@@ -103,8 +106,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
 
       render(conn, "grouped_index.json",
         notification_groups: [notifications],
+        notification_group_counts: notification_group_counts,
+        notification_group_bounds: notification_group_bounds,
         for: user,
-        grouped_types: grouped_types
+        grouped_types: grouped_types,
+        include_page_metadata: false
       )
     end
   end
@@ -115,10 +121,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
           conn,
         _
       ) do
-    users =
-      user
-      |> MastodonAPI.get_notification_group(group_key, %{})
-      |> notification_actors()
+    # Mastodon paginates this endpoint in code, but the public docs say it returns accounts of all
+    # notifications in the group and do not document cursor params here. Follow the documented API.
+    users = MastodonAPI.get_notification_group_accounts(user, group_key)
 
     json(conn, AccountView.render("index.json", %{users: users, for: user}))
   end
@@ -154,12 +159,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
           conn,
         _
       ) do
-    ids =
-      user
-      |> MastodonAPI.get_notification_group(group_key, %{})
-      |> Enum.map(& &1.id)
-
-    Notification.destroy_multiple(user, ids)
+    MastodonAPI.dismiss_notification_group(user, group_key)
     json(conn, %{})
   end
 
@@ -179,7 +179,8 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
   defp do_get_grouped_notifications(%{assigns: %{user: user}} = conn, params) do
     params = normalize_notification_params(params)
 
-    {notification_groups, page_notifications, notification_group_counts} =
+    {notification_groups, page_notifications, notification_group_counts,
+     notification_group_bounds} =
       MastodonAPI.get_grouped_notification_page(user, params)
 
     conn
@@ -187,6 +188,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
     |> render("grouped_index.json",
       notification_groups: notification_groups,
       notification_group_counts: notification_group_counts,
+      notification_group_bounds: notification_group_bounds,
       for: user,
       grouped_types: params["grouped_types"]
     )
@@ -203,13 +205,6 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
     |> Map.put_new("types", Map.get(params, :include_types, @default_notification_types))
   end
 
-  defp notification_actors(notifications) do
-    notifications
-    |> Enum.map(&User.get_cached_by_ap_id(&1.activity.data["actor"]))
-    |> Enum.filter(& &1)
-    |> Enum.uniq_by(& &1.id)
-  end
-
   # GET /api/v1/notifications/:id
   def show(%{assigns: %{user: user}, private: %{open_api_spex: %{params: %{id: id}}}} = conn, _) do
     with {:ok, notification} <- Notification.get(user, id) do
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index 57cbfd6bf..cb11a3f4a 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   import Ecto.Query
   import Ecto.Changeset
 
+  alias Pleroma.Marker
   alias Pleroma.Notification
   alias Pleroma.Pagination
   alias Pleroma.Repo
@@ -13,6 +14,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
 
+  @notification_group_sample_limit 8
+
   @spec follow(User.t(), User.t(), map) :: {:ok, User.t()} | {:error, String.t()}
   def follow(follower, followed, params \\ %{}) do
     result =
@@ -68,38 +71,55 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   end
 
   def get_grouped_notification_page(user, params \\ %{}) do
-    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
-    {query, order} = group_pagination_query(notifications_query(user, params), params)
+    grouped_types =
+      params
+      |> Map.get("grouped_types", Map.get(params, :grouped_types))
+      |> Notification.normalize_grouped_types()
 
-    notifications =
+    query = notifications_query(user, params)
+    {order, cursor_filters} = group_pagination(params)
+
+    group_rows =
       query
-      |> order_by([n], [{^order, n.id}])
-      |> Repo.all()
+      |> notification_group_rows(grouped_types, grouped_limit(params), order, cursor_filters)
 
-    notification_group_counts =
-      Enum.frequencies_by(notifications, &Notification.group_key(&1, grouped_types))
+    group_rows = if order == :asc, do: Enum.reverse(group_rows), else: group_rows
 
-    page_notifications =
-      notifications
-      |> take_grouped_page_notifications(grouped_types, grouped_limit(params))
+    page_notifications = representative_notifications(query, group_rows)
 
-    page_notifications =
-      if order == :asc, do: Enum.reverse(page_notifications), else: page_notifications
+    notification_groups =
+      Enum.map(group_rows, &notification_group_sample(user, params, &1.group_key))
 
     {
-      Notification.group_notifications(page_notifications, grouped_types),
+      notification_groups,
       page_notifications,
-      notification_group_counts
+      notification_group_counts(group_rows),
+      notification_group_bounds(group_rows)
     }
   end
 
   def get_grouped_notification_groups(user, params \\ %{}) do
-    {groups, _notifications, _notification_group_counts} =
+    {groups, _notifications, _notification_group_counts, _notification_group_bounds} =
       get_grouped_notification_page(user, params)
 
     groups
   end
 
+  def get_notification_group_result(user, group_key, params \\ %{}) do
+    notifications = notification_group_sample(user, params, group_key)
+    metadata = notification_group_metadata(user, group_key, params)
+
+    if Enum.empty?(notifications) or is_nil(metadata) do
+      {[], %{}, %{}}
+    else
+      {
+        notifications,
+        %{group_key => metadata.notifications_count},
+        %{group_key => Map.drop(metadata, [:notifications_count])}
+      }
+    end
+  end
+
   def get_notification_group(user, group_key, params \\ %{})
 
   def get_notification_group(user, "ungrouped-" <> notification_id, _params) do
@@ -110,36 +130,58 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   end
 
   def get_notification_group(user, group_key, params) do
-    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
-
-    user
-    |> notifications_query(params)
-    |> order_by([n], desc: n.id)
-    |> Repo.all()
-    |> Enum.filter(&(Notification.group_key(&1, grouped_types) == group_key))
+    notification_group_sample(user, params, group_key)
   end
 
-  defp group_pagination_query(query, params) do
+  def get_notification_group_accounts(user, "ungrouped-" <> notification_id) do
+    with {:ok, notification} <- Notification.get(user, notification_id),
+         %User{} = actor <- User.get_cached_by_ap_id(notification.activity.data["actor"]) do
+      [actor]
+    else
+      _ -> []
+    end
+  end
+
+  def get_notification_group_accounts(user, group_key) do
+    user
+    |> notification_group_query(group_key, %{})
+    |> exclude(:preload)
+    |> distinct(true)
+    |> select([user_actor: user_actor], user_actor)
+    |> Repo.all()
+  end
+
+  def dismiss_notification_group(user, "ungrouped-" <> notification_id) do
+    Notification.destroy_multiple(user, [notification_id])
+  end
+
+  def dismiss_notification_group(%User{id: user_id}, group_key) do
+    Notification
+    |> where([n], n.user_id == ^user_id and n.group_key == ^group_key)
+    |> Repo.delete_all()
+  end
+
+  defp group_pagination(params) do
     cond do
       min_id = Map.get(params, "min_id", Map.get(params, :min_id)) ->
-        query = where(query, [n], n.id > ^min_id)
+        cursor_filters = [{:gt, min_id}]
 
-        query =
+        cursor_filters =
           case Map.get(params, "max_id", Map.get(params, :max_id)) do
-            nil -> query
-            max_id -> where(query, [n], n.id < ^max_id)
+            nil -> cursor_filters
+            max_id -> [{:lt, max_id} | cursor_filters]
           end
 
-        {query, :asc}
+        {:asc, cursor_filters}
 
       since_id = Map.get(params, "since_id", Map.get(params, :since_id)) ->
-        {where(query, [n], n.id > ^since_id), :desc}
+        {:desc, [{:gt, since_id}]}
 
       max_id = Map.get(params, "max_id", Map.get(params, :max_id)) ->
-        {where(query, [n], n.id < ^max_id), :desc}
+        {:desc, [{:lt, max_id}]}
 
       true ->
-        {query, :desc}
+        {:desc, []}
     end
   end
 
@@ -150,41 +192,190 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
     |> min(80)
   end
 
-  defp take_grouped_page_notifications(notifications, grouped_types, group_limit) do
-    {notifications, _group_keys} =
-      Enum.reduce_while(notifications, {[], MapSet.new()}, fn notification,
-                                                              {notifications, group_keys} ->
-        group_key = Notification.group_key(notification, grouped_types)
-
-        cond do
-          MapSet.member?(group_keys, group_key) ->
-            {:cont, {[notification | notifications], group_keys}}
-
-          MapSet.size(group_keys) < group_limit ->
-            {:cont, {[notification | notifications], MapSet.put(group_keys, group_key)}}
-
-          true ->
-            {:halt, {notifications, group_keys}}
-        end
-      end)
-
-    Enum.reverse(notifications)
-  end
-
   def unread_notification_group_count(user, params \\ %{}) do
-    grouped_types = Map.get(params, "grouped_types", Map.get(params, :grouped_types))
+    grouped_types =
+      params
+      |> Map.get("grouped_types", Map.get(params, :grouped_types))
+      |> Notification.normalize_grouped_types()
+
     limit = unread_count_limit(params)
 
     user
     |> notifications_query(params)
-    |> where([n], n.seen == false)
-    |> order_by([n], desc: n.id)
-    |> limit(^limit)
-    |> Repo.all()
-    |> Notification.group_notifications(grouped_types)
+    # The grouped API docs define unread by the notifications marker, not by Pleroma's per-row
+    # seen flag used by the v1 unread count. Keep this marker-based for Mastodon clients.
+    |> restrict_after_marker(notification_marker_last_read_id(user))
+    |> notification_group_rows(grouped_types, limit, :desc, [])
     |> length()
   end
 
+  defp notification_group_rows(query, grouped_types, group_limit, :desc, cursor_filters) do
+    query
+    |> notification_group_keyed_query(grouped_types)
+    |> group_by([n], n.group_key)
+    |> apply_group_cursor_filters(cursor_filters)
+    |> select([n], %{
+      group_key: n.group_key,
+      representative_id: max(n.id),
+      notifications_count: count(n.id),
+      page_min_id: min(n.id),
+      page_max_id: max(n.id),
+      latest_page_notification_at: max(n.inserted_at)
+    })
+    |> order_by([n], desc: max(n.id))
+    |> limit(^group_limit)
+    |> Repo.all()
+  end
+
+  defp notification_group_rows(query, grouped_types, group_limit, :asc, cursor_filters) do
+    query
+    |> notification_group_keyed_query(grouped_types)
+    |> group_by([n], n.group_key)
+    |> apply_group_cursor_filters(cursor_filters)
+    |> select([n], %{
+      group_key: n.group_key,
+      representative_id: max(n.id),
+      notifications_count: count(n.id),
+      page_min_id: min(n.id),
+      page_max_id: max(n.id),
+      latest_page_notification_at: max(n.inserted_at)
+    })
+    |> order_by([n], asc: max(n.id))
+    |> limit(^group_limit)
+    |> Repo.all()
+  end
+
+  defp apply_group_cursor_filters(query, []), do: query
+
+  defp apply_group_cursor_filters(query, [{:gt, id} | rest]) do
+    query
+    |> having([n], max(n.id) > ^id)
+    |> apply_group_cursor_filters(rest)
+  end
+
+  defp apply_group_cursor_filters(query, [{:lt, id} | rest]) do
+    query
+    |> having([n], max(n.id) < ^id)
+    |> apply_group_cursor_filters(rest)
+  end
+
+  defp notification_group_keyed_query(query, grouped_types) do
+    query
+    |> exclude(:preload)
+    |> select([n], %{
+      id: n.id,
+      inserted_at: n.inserted_at,
+      group_key:
+        fragment(
+          "CASE WHEN ? IS NOT NULL AND ?::text = ANY(?) THEN ? ELSE 'ungrouped-' || ?::text END",
+          n.group_key,
+          n.type,
+          type(^grouped_types, {:array, :string}),
+          n.group_key,
+          n.id
+        )
+    })
+    |> subquery()
+  end
+
+  defp representative_notifications(_query, []), do: []
+
+  defp representative_notifications(query, group_rows) do
+    representative_ids = Enum.map(group_rows, & &1.representative_id)
+
+    notifications_by_id =
+      query
+      |> where([n], n.id in ^representative_ids)
+      |> Repo.all()
+      |> Map.new(&{to_string(&1.id), &1})
+
+    group_rows
+    |> Enum.map(&Map.get(notifications_by_id, to_string(&1.representative_id)))
+    |> Enum.filter(& &1)
+  end
+
+  defp notification_group_counts(group_rows) do
+    Map.new(group_rows, &{&1.group_key, &1.notifications_count})
+  end
+
+  defp notification_group_bounds(group_rows) do
+    Map.new(group_rows, fn row ->
+      {row.group_key,
+       %{
+         page_min_id: row.page_min_id,
+         page_max_id: row.page_max_id,
+         latest_page_notification_at: row.latest_page_notification_at
+       }}
+    end)
+  end
+
+  defp notification_group_sample(user, _params, "ungrouped-" <> notification_id) do
+    case Notification.get(user, notification_id) do
+      {:ok, notification} -> [notification]
+      _ -> []
+    end
+  end
+
+  defp notification_group_sample(user, params, group_key) do
+    user
+    |> notification_group_query(group_key, params)
+    |> order_by([n], desc: n.id)
+    |> limit(^@notification_group_sample_limit)
+    |> Repo.all()
+  end
+
+  defp notification_group_metadata(user, "ungrouped-" <> notification_id, _params) do
+    case Notification.get(user, notification_id) do
+      {:ok, notification} ->
+        %{
+          notifications_count: 1,
+          page_min_id: notification.id,
+          page_max_id: notification.id,
+          latest_page_notification_at: notification.inserted_at
+        }
+
+      _ ->
+        nil
+    end
+  end
+
+  defp notification_group_metadata(user, group_key, params) do
+    user
+    |> notification_group_query(group_key, params)
+    |> exclude(:preload)
+    |> select([n], %{
+      notifications_count: count(n.id),
+      page_min_id: min(n.id),
+      page_max_id: max(n.id),
+      latest_page_notification_at: max(n.inserted_at)
+    })
+    |> Repo.one()
+    |> case do
+      %{notifications_count: 0} -> nil
+      metadata -> metadata
+    end
+  end
+
+  defp notification_group_query(user, group_key, params) do
+    user
+    |> notifications_query(params)
+    |> where([n], n.group_key == ^group_key)
+  end
+
+  defp notification_marker_last_read_id(user) do
+    Marker
+    |> where([m], m.user_id == ^user.id and m.timeline == "notifications")
+    |> select([m], m.last_read_id)
+    |> Repo.one()
+  end
+
+  defp restrict_after_marker(query, last_read_id)
+       when is_binary(last_read_id) and last_read_id != "" do
+    where(query, [n], n.id > ^last_read_id)
+  end
+
+  defp restrict_after_marker(query, _last_read_id), do: query
+
   defp notifications_query(user, params) do
     options = notification_options(user, params)
 
diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex
index 466073853..33d4b2924 100644
--- a/lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex
@@ -90,6 +90,8 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
       ) do
     grouped_types = Notification.normalize_grouped_types(opts[:grouped_types])
     notification_group_counts = Map.get(opts, :notification_group_counts, %{})
+    notification_group_bounds = Map.get(opts, :notification_group_bounds, %{})
+    include_page_metadata = Map.get(opts, :include_page_metadata, true)
 
     statuses =
       notification_groups
@@ -110,7 +112,14 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
       notification_groups:
         Enum.map(
           notification_groups,
-          &render_group(&1, reading_user, grouped_types, notification_group_counts)
+          &render_group(
+            &1,
+            reading_user,
+            grouped_types,
+            notification_group_counts,
+            notification_group_bounds,
+            include_page_metadata
+          )
         )
     }
   end
@@ -184,27 +193,50 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
          [%Notification{} = notification | _] = notifications,
          _reading_user,
          grouped_types,
-         notification_group_counts
+         notification_group_counts,
+         notification_group_bounds,
+         include_page_metadata
        ) do
     latest_notification = List.first(notifications)
     oldest_notification = List.last(notifications)
     status_activity = status_activity_for_group(notifications, grouped_types)
     group_key = Notification.group_key(notification, grouped_types)
+    bounds = Map.get(notification_group_bounds, group_key, %{})
 
     response = %{
       group_key: group_key,
       notifications_count: Map.get(notification_group_counts, group_key, length(notifications)),
       type: notification.type,
-      most_recent_notification_id: to_string(latest_notification.id),
-      page_min_id: to_string(oldest_notification.id),
-      page_max_id: to_string(latest_notification.id),
-      latest_page_notification_at: CommonAPI.Utils.to_masto_date(latest_notification.inserted_at),
+      most_recent_notification_id:
+        bounds
+        |> Map.get(:page_max_id, latest_notification.id)
+        |> to_string(),
       sample_account_ids:
         notifications
         |> notification_actors()
         |> Enum.map(&to_string(&1.id))
     }
 
+    response =
+      if include_page_metadata do
+        Map.merge(response, %{
+          page_min_id:
+            bounds
+            |> Map.get(:page_min_id, oldest_notification.id)
+            |> to_string(),
+          page_max_id:
+            bounds
+            |> Map.get(:page_max_id, latest_notification.id)
+            |> to_string(),
+          latest_page_notification_at:
+            bounds
+            |> Map.get(:latest_page_notification_at, latest_notification.inserted_at)
+            |> CommonAPI.Utils.to_masto_date()
+        })
+      else
+        response
+      end
+
     if status_activity do
       Map.put(response, :status_id, to_string(status_activity.id))
     else
diff --git a/priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs b/priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs
new file mode 100644
index 000000000..7c7d529e0
--- /dev/null
+++ b/priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs
@@ -0,0 +1,15 @@
+defmodule Pleroma.Repo.Migrations.AddGroupKeyToNotifications do
+  use Ecto.Migration
+
+  def change do
+    alter table(:notifications) do
+      add(:group_key, :string)
+    end
+
+    create_if_not_exists(
+      index(:notifications, [:user_id, :group_key, "id desc nulls last"],
+        where: "group_key IS NOT NULL"
+      )
+    )
+  end
+end
diff --git a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
index 1d3a9e966..e9c521d6b 100644
--- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
@@ -587,10 +587,10 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
       {:ok, _} = CommonAPI.favorite(status.id, other_user1)
       {:ok, _} = CommonAPI.favorite(status.id, other_user2)
 
-      notification_ids =
-        Notification
-        |> Repo.all()
-        |> Enum.map(&to_string(&1.id))
+      notifications = Repo.all(Notification)
+      notification_ids = Enum.map(notifications, &to_string(&1.id))
+      assert [persisted_group_key] = notifications |> Enum.map(& &1.group_key) |> Enum.uniq()
+      assert is_binary(persisted_group_key)
 
       result =
         conn
@@ -613,6 +613,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
       assert group["latest_page_notification_at"]
       assert Enum.sort(group["sample_account_ids"]) == Enum.sort([other_user1.id, other_user2.id])
       group_key = group["group_key"]
+      assert group_key == persisted_group_key
 
       assert [%{"group_key" => ^group_key}, %{"group_key" => ^group_key}] =
                conn
@@ -626,6 +627,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
 
       assert shown_group["group_key"] == group_key
       assert shown_group["notifications_count"] == 2
+      refute Map.has_key?(shown_group, "page_min_id")
+      refute Map.has_key?(shown_group, "page_max_id")
+      refute Map.has_key?(shown_group, "latest_page_notification_at")
     end
 
     test "round-trips ungrouped group keys when grouped_types excludes a type" do
@@ -648,6 +652,48 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
                |> json_response_and_validate_schema(200)
     end
 
+    test "keeps legacy notifications without persisted group keys ungrouped" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+      {:ok, favorite1} = CommonAPI.favorite(status.id, other_user1)
+      {:ok, favorite2} = CommonAPI.favorite(status.id, other_user2)
+
+      notification_ids =
+        [favorite1, favorite2]
+        |> Enum.map(&get_notification_id_by_activity/1)
+
+      Repo.update_all(Notification, set: [group_key: nil])
+
+      expected_group_keys = Enum.map(notification_ids, &"ungrouped-#{&1}")
+
+      assert [%{"group_key" => group_key1}, %{"group_key" => group_key2}] =
+               conn
+               |> get("/api/v1/notifications")
+               |> json_response_and_validate_schema(200)
+
+      assert Enum.sort([group_key1, group_key2]) == Enum.sort(expected_group_keys)
+
+      %{"notification_groups" => groups} =
+        conn
+        |> get("/api/v2/notifications")
+        |> json_response_and_validate_schema(200)
+
+      assert Enum.sort(Enum.map(groups, & &1["group_key"])) == Enum.sort(expected_group_keys)
+      assert Enum.all?(groups, &(&1["notifications_count"] == 1))
+
+      group_key = List.first(expected_group_keys)
+
+      assert %{
+               "notification_groups" => [%{"group_key" => ^group_key, "notifications_count" => 1}]
+             } =
+               conn
+               |> get("/api/v2/notifications/#{group_key}")
+               |> json_response_and_validate_schema(200)
+    end
+
     test "paginates notification groups instead of raw notifications" do
       %{user: user, conn: conn} = oauth_access(["read:notifications"])
       other_user1 = insert(:user)
@@ -674,6 +720,44 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
              ] = groups
     end
 
+    test "uses group-level cursors when paginating notification groups" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user1 = insert(:user)
+      other_user2 = insert(:user)
+      other_user3 = insert(:user)
+
+      {:ok, older_status} = CommonAPI.post(user, %{status: "older"})
+      {:ok, _} = CommonAPI.favorite(older_status.id, other_user3)
+
+      {:ok, newer_status} = CommonAPI.post(user, %{status: "newer"})
+      {:ok, _} = CommonAPI.favorite(newer_status.id, other_user1)
+      {:ok, _} = CommonAPI.favorite(newer_status.id, other_user2)
+      older_status_id = older_status.id
+      newer_status_id = newer_status.id
+
+      assert %{
+               "notification_groups" => [
+                 %{
+                   "status_id" => ^newer_status_id,
+                   "notifications_count" => 2,
+                   "most_recent_notification_id" => cursor
+                 }
+               ]
+             } =
+               conn
+               |> get("/api/v2/notifications?limit=1")
+               |> json_response_and_validate_schema(200)
+
+      assert %{
+               "notification_groups" => [
+                 %{"status_id" => ^older_status_id, "notifications_count" => 1}
+               ]
+             } =
+               conn
+               |> get("/api/v2/notifications?limit=1&max_id=#{cursor}")
+               |> json_response_and_validate_schema(200)
+    end
+
     test "returns total notification count for a partially represented group" do
       %{user: user, conn: conn} = oauth_access(["read:notifications"])
       other_user1 = insert(:user)
@@ -715,27 +799,78 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
                |> json_response_and_validate_schema(200)
     end
 
+    test "counts unread notification groups newer than the notification marker" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user = insert(:user)
+      mentioner = insert(:user)
+
+      {:ok, status} = CommonAPI.post(user, %{status: "older"})
+      {:ok, favorite_activity} = CommonAPI.favorite(status.id, other_user)
+      marker_id = get_notification_id_by_activity(favorite_activity)
+
+      {:ok, _} = CommonAPI.post(mentioner, %{status: "newer @#{user.nickname}"})
+
+      {:ok, _} =
+        Pleroma.Marker.upsert(user, %{"notifications" => %{"last_read_id" => marker_id}})
+
+      assert %{"count" => 1} =
+               conn
+               |> get("/api/v2/notifications/unread_count")
+               |> json_response_and_validate_schema(200)
+    end
+
+    test "does not preserve stale cursor params in grouped notification link headers" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
+      other_user = insert(:user)
+
+      {:ok, activity1} = CommonAPI.post(other_user, %{status: "one @#{user.nickname}"})
+      {:ok, _activity2} = CommonAPI.post(other_user, %{status: "two @#{user.nickname}"})
+      {:ok, activity3} = CommonAPI.post(other_user, %{status: "three @#{user.nickname}"})
+
+      notification1_id = get_notification_id_by_activity(activity1)
+      notification3_id = get_notification_id_by_activity(activity3)
+
+      conn = get(conn, "/api/v2/notifications?since_id=#{notification1_id}&limit=1")
+
+      assert [link_header] = get_resp_header(conn, "link")
+      assert link_header =~ ~r/max_id=#{notification3_id}/
+      refute link_header =~ "since_id="
+    end
+
     test "lists accounts from and dismisses a notification group" do
       %{user: user, conn: conn} = oauth_access(["read:notifications", "write:notifications"])
-      other_user1 = insert(:user)
-      other_user2 = insert(:user)
+      other_users = insert_list(9, :user)
 
       {:ok, status} = CommonAPI.post(user, %{status: "hello"})
-      {:ok, _} = CommonAPI.favorite(status.id, other_user1)
-      {:ok, _} = CommonAPI.favorite(status.id, other_user2)
 
-      %{"notification_groups" => [%{"group_key" => group_key}]} =
+      Enum.each(other_users, fn other_user ->
+        {:ok, _} = CommonAPI.favorite(status.id, other_user)
+      end)
+
+      %{
+        "notification_groups" => [
+          %{
+            "group_key" => group_key,
+            "notifications_count" => 9,
+            "sample_account_ids" => sample_account_ids
+          }
+        ]
+      } =
         conn
         |> get("/api/v2/notifications")
         |> json_response_and_validate_schema(200)
 
+      assert length(sample_account_ids) == 8
+
+      %{conn: read_conn} = oauth_access(["read:notifications"], user: user)
+
       account_ids =
-        conn
+        read_conn
         |> get("/api/v2/notifications/#{group_key}/accounts")
         |> json_response_and_validate_schema(200)
         |> Enum.map(& &1["id"])
 
-      assert Enum.sort(account_ids) == Enum.sort([other_user1.id, other_user2.id])
+      assert Enum.sort(account_ids) == Enum.sort(Enum.map(other_users, & &1.id))
 
       assert %{} =
                conn
diff --git a/test/pleroma/web/mastodon_api/views/notification_view_test.exs b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
index aa11ad682..2d0801589 100644
--- a/test/pleroma/web/mastodon_api/views/notification_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
@@ -98,6 +98,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
     {:ok, favorite_activity} = CommonAPI.favorite(create_activity.id, another_user)
     {:ok, [notification]} = Notification.create_notifications(favorite_activity)
     create_activity = Activity.get_by_id(create_activity.id)
+    assert is_binary(notification.group_key)
 
     expected = %{
       id: to_string(notification.id),
@@ -119,6 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
     {:ok, reblog_activity} = CommonAPI.repeat(create_activity.id, another_user)
     {:ok, [notification]} = Notification.create_notifications(reblog_activity)
     reblog_activity = Activity.get_by_id(create_activity.id)
+    assert is_binary(notification.group_key)
 
     expected = %{
       id: to_string(notification.id),
@@ -138,6 +140,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
     followed = insert(:user)
     {:ok, followed, follower, _activity} = CommonAPI.follow(followed, follower)
     notification = Notification |> Repo.one() |> Repo.preload(:activity)
+    assert is_binary(notification.group_key)
 
     expected = %{
       id: to_string(notification.id),

From 1db2b99e4873a5196cbbb393c294419e10045a15 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 23 May 2026 14:00:17 +0400
Subject: [PATCH 058/163] Run group key migration before notification backfill

---
 ...ions.exs => 20200602125217_add_group_key_to_notifications.exs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename priv/repo/migrations/{20260523070000_add_group_key_to_notifications.exs => 20200602125217_add_group_key_to_notifications.exs} (100%)

diff --git a/priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs b/priv/repo/migrations/20200602125217_add_group_key_to_notifications.exs
similarity index 100%
rename from priv/repo/migrations/20260523070000_add_group_key_to_notifications.exs
rename to priv/repo/migrations/20200602125217_add_group_key_to_notifications.exs

From a2a23b327b9c32420b5a6aed4198073b4f363864 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 23 May 2026 14:27:11 +0400
Subject: [PATCH 059/163] Keep cursor cleanup scoped to grouped notifications

---
 lib/pleroma/web/controller_helper.ex                   | 10 +++++++---
 .../controllers/notification_controller.ex             |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index eecd1774f..0c85e79f9 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -56,7 +56,11 @@ defmodule Pleroma.Web.ControllerHelper do
   # TODO: Only fetch the params from open_api_spex when everything is converted
   @id_keys Pagination.page_keys() -- ["limit", "order"]
   @id_key_atoms Enum.map(@id_keys, &String.to_atom/1)
+  @drop_id_params_key :drop_id_params
   defp build_pagination_fields(conn, min_id, max_id, extra_params, order) do
+    drop_id_params? = Map.get(extra_params, @drop_id_params_key, false)
+    extra_params = Map.delete(extra_params, @drop_id_params_key)
+
     path_param_keys =
       conn.path_params
       |> Map.keys()
@@ -70,9 +74,9 @@ defmodule Pleroma.Web.ControllerHelper do
       end
       |> Map.drop(path_param_keys)
       |> Map.merge(extra_params)
-      # OpenApiSpex casts params to atoms while uncast conn params are string-keyed. Drop both so
-      # generated links replace pagination cursors instead of preserving stale request cursors.
-      |> Map.drop(@id_keys ++ @id_key_atoms)
+      # Some OpenApiSpex routes cast cursor params to atoms. Keep the historical default for
+      # existing endpoints, but allow grouped notifications to opt out of stale request cursors.
+      |> Map.drop(@id_keys ++ if(drop_id_params?, do: @id_key_atoms, else: []))
 
     {{next_id, nid}, {prev_id, pid}} =
       if order == :desc,
diff --git a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
index 2cc31db0c..8a5f8e7b6 100644
--- a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
@@ -5,7 +5,7 @@
 defmodule Pleroma.Web.MastodonAPI.NotificationController do
   use Pleroma.Web, :controller
 
-  import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
+  import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2, add_link_headers: 3]
 
   alias Pleroma.Notification
   alias Pleroma.User
@@ -184,7 +184,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
       MastodonAPI.get_grouped_notification_page(user, params)
 
     conn
-    |> add_link_headers(page_notifications)
+    |> add_link_headers(page_notifications, %{drop_id_params: true})
     |> render("grouped_index.json",
       notification_groups: notification_groups,
       notification_group_counts: notification_group_counts,

From 94a28d128605bc4e3328293a01585471c193f82b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 16 May 2026 00:31:02 +0200
Subject: [PATCH 060/163] RichMedia Backfill: Add cachex positive test

---
 test/pleroma/web/rich_media/backfill_test.exs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
index 6d221fcf5..8b4834bf7 100644
--- a/test/pleroma/web/rich_media/backfill_test.exs
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -23,4 +23,26 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
 
     Backfill.run(%{"url" => url})
   end
+
+  test "sets a warm_cache entry" do
+    url = "https://good.example.com/"
+    url_hash = Card.url_to_hash(url)
+
+    Tesla.Mock.mock(fn %{url: ^url} ->
+      {:ok,
+       %Tesla.Env{
+         status: 200,
+         body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
+       }}
+    end)
+
+    Pleroma.CachexMock
+    |> expect(:put, fn :rich_media_cache,
+                       ^url_hash,
+                       %Pleroma.Web.RichMedia.Card{url_hash: ^url_hash} ->
+      {:ok, true}
+    end)
+
+    Backfill.run(%{"url" => url})
+  end
 end

From 678fe8a0642771e24d7b4d9b1df78578024351fe Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 20 May 2026 20:16:19 +0200
Subject: [PATCH 061/163] RichMedia: Add support for disabling wss streaming
 out on backfill

---
 .../web/mastodon_api/views/status_view.ex     |  9 +--
 lib/pleroma/web/rich_media/backfill.ex        | 14 +++--
 lib/pleroma/web/rich_media/card.ex            | 16 ++++--
 test/pleroma/web/rich_media/backfill_test.exs | 56 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 09af60865..80d53adff 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -28,9 +28,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   # This is a naive way to do this, just spawning a process per activity
   # to fetch the preview. However it should be fine considering
   # pagination is restricted to 40 activities at a time
-  defp fetch_rich_media_for_activities(activities) do
+  defp fetch_rich_media_for_activities(activities, opts) do
     Enum.each(activities, fn activity ->
-      Card.get_by_activity(activity)
+      Card.get_by_activity(activity, opts)
     end)
   end
 
@@ -113,7 +113,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     activities = Enum.filter(opts.activities, & &1)
 
     # Start prefetching rich media before doing anything else
-    fetch_rich_media_for_activities(activities)
+    fetch_rich_media_for_activities(activities, opts)
+
     replied_to_activities = get_replied_to_activities(activities)
     quoted_activities = get_quoted_activities(activities)
 
@@ -362,7 +363,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     summary = object.data["summary"] || ""
 
     card =
-      case Card.get_by_activity(activity) do
+      case Card.get_by_activity(activity, opts) do
         %Card{} = result -> render("card.json", result)
         _ -> nil
       end
diff --git a/lib/pleroma/web/rich_media/backfill.ex b/lib/pleroma/web/rich_media/backfill.ex
index 1cd90629f..607c5238a 100644
--- a/lib/pleroma/web/rich_media/backfill.ex
+++ b/lib/pleroma/web/rich_media/backfill.ex
@@ -11,6 +11,8 @@ defmodule Pleroma.Web.RichMedia.Backfill do
 
   require Logger
 
+  @callback run(map()) :: :ok | Parser.parse_errors() | Helpers.get_errors()
+
   @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
   @stream_out_impl Pleroma.Config.get(
                      [__MODULE__, :stream_out],
@@ -26,11 +28,7 @@ defmodule Pleroma.Web.RichMedia.Backfill do
         {:ok, card} = Card.create(url, fields)
 
         maybe_schedule_expiration(url, fields)
-
-        with %{"activity_id" => activity_id} <- args,
-             false <- is_nil(activity_id) do
-          stream_update(args)
-        end
+        maybe_update_stream(args)
 
         warm_cache(url_hash, card)
         :ok
@@ -55,12 +53,16 @@ defmodule Pleroma.Web.RichMedia.Backfill do
     end
   end
 
-  defp stream_update(%{"activity_id" => activity_id}) do
+  defp maybe_update_stream(%{"activity_id" => activity_id, "stream" => true}) when is_binary(activity_id) do
     Pleroma.Activity.get_by_id(activity_id)
     |> Pleroma.Activity.normalize()
     |> @stream_out_impl.stream_out()
   end
 
+  # Streamer.stream_out returns noop when unsupported activity type is requested to be streamed.
+  # Do the same here for unwanted streaming
+  defp maybe_update_stream(_), do: :noop
+
   defp warm_cache(key, val), do: @cachex.put(:rich_media_cache, key, val)
 
   defp negative_cache(key, ttl \\ :timer.minutes(15)),
diff --git a/lib/pleroma/web/rich_media/card.ex b/lib/pleroma/web/rich_media/card.ex
index 6b4bb9555..86a4f577a 100644
--- a/lib/pleroma/web/rich_media/card.ex
+++ b/lib/pleroma/web/rich_media/card.ex
@@ -90,8 +90,12 @@ defmodule Pleroma.Web.RichMedia.Card do
 
         nil ->
           activity_id = Keyword.get(opts, :activity_id, nil)
+          # Nested opts, first layer comes from get_by_activity/2 as Keyword, second from API views/Federation as Map.
+          # Provide default Map when called directly.
+          opts = Keyword.get(opts, :opts, %{})
+          stream = Map.get(opts, :stream, true)
 
-          RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id})
+          RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id, "stream" => stream})
           |> Oban.insert()
 
           nil
@@ -112,9 +116,11 @@ defmodule Pleroma.Web.RichMedia.Card do
     end
   end
 
-  @spec get_by_activity(Activity.t()) :: t() | nil | :error
+  @spec get_by_activity(Activity.t(), %{}) :: t() | nil | :error
+  def get_by_activity(activity, opts \\ %{})
+
   # Fake/Draft activity
-  def get_by_activity(%Activity{id: "pleroma:fakeid"} = activity) do
+  def get_by_activity(%Activity{id: "pleroma:fakeid"} = activity, _opts) do
     with {_, true} <- {:config, @config_impl.get([:rich_media, :enabled])},
          %Object{} = object <- Object.normalize(activity, fetch: false),
          url when not is_nil(url) <- HTML.extract_first_external_url_from_object(object) do
@@ -138,13 +144,13 @@ defmodule Pleroma.Web.RichMedia.Card do
     end
   end
 
-  def get_by_activity(activity) do
+  def get_by_activity(activity, opts) do
     with %Object{} = object <- Object.normalize(activity, fetch: false),
          {_, nil} <- {:cached, get_cached_url(object, activity.id)} do
       nil
     else
       {:cached, url} ->
-        get_or_backfill_by_url(url, activity_id: activity.id)
+        get_or_backfill_by_url(url, activity_id: activity.id, opts: opts)
 
       _ ->
         :error
diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
index 8b4834bf7..f7e74c02a 100644
--- a/test/pleroma/web/rich_media/backfill_test.exs
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -5,12 +5,20 @@
 defmodule Pleroma.Web.RichMedia.BackfillTest do
   use Pleroma.DataCase
 
+  alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.RichMedia.Backfill
   alias Pleroma.Web.RichMedia.Card
 
   import Mox
+  import Pleroma.Factory
 
-  setup_all do: clear_config([:rich_media, :enabled], true)
+  setup do 
+    clear_config([:rich_media, :enabled], true)
+
+    Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
+
+    :ok
+  end
 
   test "sets a negative cache entry for an error" do
     url = "https://bad.example.com/"
@@ -45,4 +53,50 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
 
     Backfill.run(%{"url" => url})
   end
+
+  test "streams out update when stream == true" do
+    url = "https://example.com"
+    user = insert(:user)
+
+    Tesla.Mock.mock(fn %{url: ^url} ->
+      {:ok,
+       %Tesla.Env{
+         status: 200,
+         body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
+       }}
+    end)
+
+    {:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
+
+    Pleroma.CachexMock
+    |> expect(:put, fn :rich_media_cache, _, _ -> {:ok, true} end)
+
+    Pleroma.Web.ActivityPub.ActivityPubMock
+    |> expect(:stream_out, fn _ -> :ok end)
+
+    Backfill.run(%{"url" => url, "activity_id" => "#{activity.data["id"]}", "stream" => true})
+  end
+
+  test "does not stream out update when stream == false" do
+    url = "https://example.com"
+    user = insert(:user)
+
+    Tesla.Mock.mock(fn %{url: ^url} ->
+      {:ok,
+       %Tesla.Env{
+         status: 200,
+         body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
+       }}
+    end)
+
+    {:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
+
+    Pleroma.CachexMock
+    |> expect(:put, fn :rich_media_cache, _, _ -> {:ok, true} end)
+
+    Pleroma.Web.ActivityPub.ActivityPubMock
+    |> deny(:stream_out, 1)
+
+    Backfill.run(%{"url" => url, "activity_id" => "#{activity.data["id"]}", "stream" => false})
+  end
 end

From 5f55c9653c64ced6e1461224a942a303e82627d8 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 20 May 2026 20:18:47 +0200
Subject: [PATCH 062/163] RichMedia: Disable websockets backfill streaming in
 StatusView

---
 lib/pleroma/web/mastodon_api/views/status_view.ex | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 80d53adff..cc807f603 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -28,7 +28,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   # This is a naive way to do this, just spawning a process per activity
   # to fetch the preview. However it should be fine considering
   # pagination is restricted to 40 activities at a time
+  # Force disable Websockets streaming for backfill jobs,
+  # otherwise old posts can show up on timelines.
   defp fetch_rich_media_for_activities(activities, opts) do
+    opts = Map.put(opts, :stream, false)
     Enum.each(activities, fn activity ->
       Card.get_by_activity(activity, opts)
     end)
@@ -362,8 +365,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
     summary = object.data["summary"] || ""
 
+    # Force disable Websockets streaming for backfill jobs which the below call will create,
+    # otherwise old posts can show up on timelines.
     card =
-      case Card.get_by_activity(activity, opts) do
+      case Card.get_by_activity(activity, Map.put(opts, :stream, false)) do
         %Card{} = result -> render("card.json", result)
         _ -> nil
       end

From ff7927e219f84ada9235353457f2c2497d336964 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 22 May 2026 14:53:28 +0200
Subject: [PATCH 063/163] changelog

---
 changelog.d/wss-necroposts.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/wss-necroposts.fix

diff --git a/changelog.d/wss-necroposts.fix b/changelog.d/wss-necroposts.fix
new file mode 100644
index 000000000..743f9087c
--- /dev/null
+++ b/changelog.d/wss-necroposts.fix
@@ -0,0 +1 @@
+RichMedia: Fix backfill causing old posts to show up on timelines by disabling it in MastoAPI StatusView

From 6ee40cb2ebe7a6666bedea3773710a3b555791ad Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 23 May 2026 19:43:44 +0200
Subject: [PATCH 064/163] RichMedia: Add StatusView backfill streaming tests

---
 test/pleroma/web/rich_media/backfill_test.exs | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
index f7e74c02a..a4b2d34fd 100644
--- a/test/pleroma/web/rich_media/backfill_test.exs
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -8,6 +8,7 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.RichMedia.Backfill
   alias Pleroma.Web.RichMedia.Card
+  alias Pleroma.Tests.ObanHelpers
 
   import Mox
   import Pleroma.Factory
@@ -15,6 +16,7 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
   setup do 
     clear_config([:rich_media, :enabled], true)
 
+    Mox.stub_with(Pleroma.UnstubbedConfigMock, Pleroma.Test.StaticConfig)
     Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
 
     :ok
@@ -99,4 +101,64 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
 
     Backfill.run(%{"url" => url, "activity_id" => "#{activity.data["id"]}", "stream" => false})
   end
+
+  # NOTE: Below two MastoAPI tests cover almost the same code paths.
+  # index.json will always prefetch rich media, while show.json will try to get the card and
+  # fetch it when it isn't cached (both use Card.get_by_activity in the end).
+  # So if index.json doesn't fetch the rich media, show.json will when it renders the post,
+  # hence why index.json test will only call ActivityPub.stream_out twice,
+  # if streaming is re-enabled for in both.
+  test "does not stream out in MastoAPI StatusView index" do
+    url = "https://example.com"
+    user = insert(:user)
+
+    Tesla.Mock.mock(fn %{url: ^url} ->
+      {:ok,
+       %Tesla.Env{
+         status: 200,
+         body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
+       }}
+    end)
+
+    # CommonAPI federation processing will stream out once as a new post
+    Pleroma.Web.ActivityPub.ActivityPubMock
+    |> expect(:stream_out, 1, fn _ -> :ok end)
+
+    {:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
+    ObanHelpers.perform_all()
+
+    # Clear cache to force backfill below
+    Pleroma.Activity.HTML.invalidate_cache_for(activity.id)
+    Pleroma.Web.RichMedia.Card.delete(url)
+
+    Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{activities: [activity], as: :activity})
+    ObanHelpers.perform_all()
+  end
+
+  test "does not stream out in MastoAPI StatusView show" do
+    url = "https://example.com"
+    user = insert(:user)
+
+    Tesla.Mock.mock(fn %{url: ^url} ->
+      {:ok,
+       %Tesla.Env{
+         status: 200,
+         body: "<head><meta name=\"twitter:title\" content=\"Cofe\"></head>"
+       }}
+    end)
+
+    # CommonAPI federation processing will stream out once as a new post
+    Pleroma.Web.ActivityPub.ActivityPubMock
+    |> expect(:stream_out, 1, fn _ -> :ok end)
+
+    {:ok, activity} = CommonAPI.post(user, %{status: "#cofe #{url}"})
+    ObanHelpers.perform_all()
+
+    # Clear cache to force backfill below
+    Pleroma.Activity.HTML.invalidate_cache_for(activity.id)
+    Pleroma.Web.RichMedia.Card.delete(url)
+
+    Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity)
+    ObanHelpers.perform_all()
+  end
 end

From 0c0d6873306244ad98273a6ae661a4414cee875b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 23 May 2026 19:49:22 +0200
Subject: [PATCH 065/163] credo, lint

---
 lib/pleroma/web/mastodon_api/views/status_view.ex |  1 +
 lib/pleroma/web/rich_media/backfill.ex            |  3 ++-
 lib/pleroma/web/rich_media/card.ex                | 11 +++++++++--
 test/pleroma/web/rich_media/backfill_test.exs     | 10 +++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index cc807f603..6949c5f2d 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -32,6 +32,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   # otherwise old posts can show up on timelines.
   defp fetch_rich_media_for_activities(activities, opts) do
     opts = Map.put(opts, :stream, false)
+
     Enum.each(activities, fn activity ->
       Card.get_by_activity(activity, opts)
     end)
diff --git a/lib/pleroma/web/rich_media/backfill.ex b/lib/pleroma/web/rich_media/backfill.ex
index 607c5238a..a100b39ab 100644
--- a/lib/pleroma/web/rich_media/backfill.ex
+++ b/lib/pleroma/web/rich_media/backfill.ex
@@ -53,7 +53,8 @@ defmodule Pleroma.Web.RichMedia.Backfill do
     end
   end
 
-  defp maybe_update_stream(%{"activity_id" => activity_id, "stream" => true}) when is_binary(activity_id) do
+  defp maybe_update_stream(%{"activity_id" => activity_id, "stream" => true})
+       when is_binary(activity_id) do
     Pleroma.Activity.get_by_id(activity_id)
     |> Pleroma.Activity.normalize()
     |> @stream_out_impl.stream_out()
diff --git a/lib/pleroma/web/rich_media/card.ex b/lib/pleroma/web/rich_media/card.ex
index 86a4f577a..1e9e66ec1 100644
--- a/lib/pleroma/web/rich_media/card.ex
+++ b/lib/pleroma/web/rich_media/card.ex
@@ -90,12 +90,19 @@ defmodule Pleroma.Web.RichMedia.Card do
 
         nil ->
           activity_id = Keyword.get(opts, :activity_id, nil)
-          # Nested opts, first layer comes from get_by_activity/2 as Keyword, second from API views/Federation as Map.
+
+          # Nested opts, first layer comes from get_by_activity/2 as Keyword,
+          # second from API views/Federation as Map.
           # Provide default Map when called directly.
           opts = Keyword.get(opts, :opts, %{})
           stream = Map.get(opts, :stream, true)
 
-          RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id, "stream" => stream})
+          RichMediaWorker.new(%{
+            "op" => "backfill",
+            "url" => url,
+            "activity_id" => activity_id,
+            "stream" => stream
+          })
           |> Oban.insert()
 
           nil
diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
index a4b2d34fd..a1949533a 100644
--- a/test/pleroma/web/rich_media/backfill_test.exs
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -5,15 +5,15 @@
 defmodule Pleroma.Web.RichMedia.BackfillTest do
   use Pleroma.DataCase
 
+  alias Pleroma.Tests.ObanHelpers
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.RichMedia.Backfill
   alias Pleroma.Web.RichMedia.Card
-  alias Pleroma.Tests.ObanHelpers
 
   import Mox
   import Pleroma.Factory
 
-  setup do 
+  setup do
     clear_config([:rich_media, :enabled], true)
 
     Mox.stub_with(Pleroma.UnstubbedConfigMock, Pleroma.Test.StaticConfig)
@@ -131,7 +131,11 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
     Pleroma.Activity.HTML.invalidate_cache_for(activity.id)
     Pleroma.Web.RichMedia.Card.delete(url)
 
-    Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{activities: [activity], as: :activity})
+    Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{
+      activities: [activity],
+      as: :activity
+    })
+
     ObanHelpers.perform_all()
   end
 

From 4c9fc6287e547d908ee0723996fc978653d4652d Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 09:26:07 +0400
Subject: [PATCH 066/163] Remove unreachable WebSocket protocol match

---
 lib/pleroma/web/mastodon_api/websocket_plug.ex | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/pleroma/web/mastodon_api/websocket_plug.ex b/lib/pleroma/web/mastodon_api/websocket_plug.ex
index 58ee913b4..c5fb5b748 100644
--- a/lib/pleroma/web/mastodon_api/websocket_plug.ex
+++ b/lib/pleroma/web/mastodon_api/websocket_plug.ex
@@ -94,7 +94,6 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketPlug do
       [protocols | _] ->
         case Plug.Conn.Utils.list(protocols) do
           [protocol | _] -> put_resp_header(conn, "sec-websocket-protocol", protocol)
-          nil -> conn
           [] -> conn
         end
 

From cdb0f103a8f7f141185e2bff6d686b047f368fa2 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 14:08:07 +0400
Subject: [PATCH 067/163] Tighten rich media backfill stream test

---
 test/pleroma/web/rich_media/backfill_test.exs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
index a1949533a..071f9b48a 100644
--- a/test/pleroma/web/rich_media/backfill_test.exs
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -74,9 +74,12 @@ defmodule Pleroma.Web.RichMedia.BackfillTest do
     |> expect(:put, fn :rich_media_cache, _, _ -> {:ok, true} end)
 
     Pleroma.Web.ActivityPub.ActivityPubMock
-    |> expect(:stream_out, fn _ -> :ok end)
+    |> expect(:stream_out, fn %Pleroma.Activity{id: id} ->
+      assert id == activity.id
+      :ok
+    end)
 
-    Backfill.run(%{"url" => url, "activity_id" => "#{activity.data["id"]}", "stream" => true})
+    Backfill.run(%{"url" => url, "activity_id" => activity.id, "stream" => true})
   end
 
   test "does not stream out update when stream == false" do

From 8a410bf49f1818ebf631020c55ba05012efcb8f7 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 16:04:53 +0400
Subject: [PATCH 068/163] Quote E2E entrypoint variables

---
 docker-entrypoint-e2e.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-entrypoint-e2e.sh b/docker-entrypoint-e2e.sh
index c83c44a80..528a09619 100755
--- a/docker-entrypoint-e2e.sh
+++ b/docker-entrypoint-e2e.sh
@@ -5,12 +5,12 @@ SEED_SENTINEL_PATH=/var/lib/pleroma/.e2e_seeded
 CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs
 
 echo '-- Waiting for database...'
-while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do
+while ! pg_isready -U "${DB_USER:-pleroma}" -d "postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma}" -t 1; do
 	sleep 1s
 done
 
 echo '-- Writing E2E config overrides...'
-cat > $CONFIG_OVERRIDE_PATH <<EOF
+cat > "$CONFIG_OVERRIDE_PATH" <<EOF
 import Config
 
 config :pleroma, Pleroma.Captcha,
@@ -30,9 +30,9 @@ echo '-- Starting!'
 PLEROMA_PID=$!
 
 cleanup() {
-	if kill -0 $PLEROMA_PID 2>/dev/null; then
-		kill -TERM $PLEROMA_PID
-		wait $PLEROMA_PID || true
+	if kill -0 "$PLEROMA_PID" 2>/dev/null; then
+		kill -TERM "$PLEROMA_PID"
+		wait "$PLEROMA_PID" || true
 	fi
 }
 
@@ -48,23 +48,23 @@ for _i in $(seq 1 120); do
 	sleep 1s
 done
 
-if [ $api_ok != true ]; then
+if [ "$api_ok" != true ]; then
 	echo 'Timed out waiting for Pleroma API to become available'
 	exit 1
 fi
 
-if [ ! -f $SEED_SENTINEL_PATH ]; then
-	if [ -n ${E2E_ADMIN_USERNAME:-} ] && [ -n ${E2E_ADMIN_PASSWORD:-} ] && [ -n ${E2E_ADMIN_EMAIL:-} ]; then
-		echo '-- Seeding admin user' $E2E_ADMIN_USERNAME '...'
-		if ! /opt/pleroma/bin/pleroma_ctl user new $E2E_ADMIN_USERNAME $E2E_ADMIN_EMAIL --admin --password $E2E_ADMIN_PASSWORD -y; then
+if [ ! -f "$SEED_SENTINEL_PATH" ]; then
+	if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then
+		echo '-- Seeding admin user' "$E2E_ADMIN_USERNAME" '...'
+		if ! /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then
 			echo '-- User already exists or creation failed, ensuring admin + confirmed...'
-			/opt/pleroma/bin/pleroma_ctl user set $E2E_ADMIN_USERNAME --admin --confirmed
+			/opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed
 		fi
 	else
 		echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
 	fi
 
-	touch $SEED_SENTINEL_PATH
+	touch "$SEED_SENTINEL_PATH"
 fi
 
-wait $PLEROMA_PID
+wait "$PLEROMA_PID"

From 54369c93d78d4431f10a44af9c8f28a416262f8e Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 16:05:21 +0400
Subject: [PATCH 069/163] Use E2E approval config key

---
 docker-entrypoint-e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint-e2e.sh b/docker-entrypoint-e2e.sh
index 528a09619..772ac7cec 100755
--- a/docker-entrypoint-e2e.sh
+++ b/docker-entrypoint-e2e.sh
@@ -19,7 +19,7 @@ config :pleroma, Pleroma.Captcha,
 config :pleroma, :instance,
 	registrations_open: true,
 	account_activation_required: false,
-	approval_required: false
+	account_approval_required: false
 EOF
 
 echo '-- Running migrations...'

From e023ed7a5a450d909565cfd5451b4fb4ab7df4fe Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 16:06:21 +0400
Subject: [PATCH 070/163] Seed E2E admin before API readiness

---
 docker-entrypoint-e2e.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker-entrypoint-e2e.sh b/docker-entrypoint-e2e.sh
index 772ac7cec..d7aa332f7 100755
--- a/docker-entrypoint-e2e.sh
+++ b/docker-entrypoint-e2e.sh
@@ -25,6 +25,20 @@ EOF
 echo '-- Running migrations...'
 /opt/pleroma/bin/pleroma_ctl migrate
 
+if [ ! -f "$SEED_SENTINEL_PATH" ]; then
+	if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then
+		echo '-- Seeding admin user' "$E2E_ADMIN_USERNAME" '...'
+		if ! PLEROMA_CTL_RPC_DISABLED=true /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then
+			echo '-- User already exists or creation failed, ensuring admin + confirmed...'
+			PLEROMA_CTL_RPC_DISABLED=true /opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed
+		fi
+	else
+		echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
+	fi
+
+	touch "$SEED_SENTINEL_PATH"
+fi
+
 echo '-- Starting!'
 /opt/pleroma/bin/pleroma start &
 PLEROMA_PID=$!
@@ -53,18 +67,4 @@ if [ "$api_ok" != true ]; then
 	exit 1
 fi
 
-if [ ! -f "$SEED_SENTINEL_PATH" ]; then
-	if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then
-		echo '-- Seeding admin user' "$E2E_ADMIN_USERNAME" '...'
-		if ! /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then
-			echo '-- User already exists or creation failed, ensuring admin + confirmed...'
-			/opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed
-		fi
-	else
-		echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
-	fi
-
-	touch "$SEED_SENTINEL_PATH"
-fi
-
 wait "$PLEROMA_PID"

From a84d16831f788d82ec77eceb51debf359cf397d2 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 25 May 2026 18:09:18 +0400
Subject: [PATCH 071/163] Fix account favourites ordering

---
 changelog.d/account-favourites-order.fix      |  1 +
 lib/pleroma/web/activity_pub/activity_pub.ex  | 17 +++-
 .../controllers/account_controller_test.exs   | 84 +++++++++++++++++--
 3 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/account-favourites-order.fix

diff --git a/changelog.d/account-favourites-order.fix b/changelog.d/account-favourites-order.fix
new file mode 100644
index 000000000..94e27e499
--- /dev/null
+++ b/changelog.d/account-favourites-order.fix
@@ -0,0 +1 @@
+Fixed `/api/v1/pleroma/accounts/:id/favourites` ordering and pagination to use the favourite date.
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 1e8bfe3dd..be7b63725 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -537,9 +537,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     #   and extra sorting on "activities.id DESC NULLS LAST" would worse the query plan
     opts = Map.put(opts, :skip_extra_order, true)
 
-    Pagination.fetch_paginated(query, opts, pagination)
+    Pagination.fetch_paginated(query, opts, pagination, pagination_binding(opts))
   end
 
+  defp pagination_binding(%{favorited_by: _}), do: :favorited_activity
+  defp pagination_binding(_), do: nil
+
   def fetch_activities(recipients, opts \\ %{}, pagination \\ :keyset) do
     list_memberships = Pleroma.List.memberships(opts[:user])
 
@@ -786,6 +789,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_since(query, %{since_id: ""}), do: query
 
+  defp restrict_since(query, %{favorited_by: _, since_id: _}), do: query
+
   defp restrict_since(query, %{since_id: since_id}) do
     from(activity in query, where: activity.id > ^since_id)
   end
@@ -1013,8 +1018,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_favorited_by(query, %{favorited_by: ap_id}) do
     from(
-      [_activity, object] in query,
-      where: fragment("(?)->'likes' \\? (?)", object.data, ^ap_id)
+      [activity, object: object] in query,
+      join: favorited_activity in Activity,
+      as: :favorited_activity,
+      on:
+        favorited_activity.actor == ^ap_id and
+          fragment("?->>'type' = ?", favorited_activity.data, "Like") and
+          fragment("associated_object_id(?) = (?)->>'id'", favorited_activity.data, object.data),
+      select: %Activity{activity | pagination_id: favorited_activity.id}
     )
   end
 
diff --git a/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
index 38a928f30..e93b277cc 100644
--- a/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
@@ -105,6 +105,28 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
       assert length(response) == 1
     end
 
+    test "orders statuses by favorite date", %{
+      conn: conn,
+      user: user
+    } do
+      other_user = insert(:user)
+
+      {:ok, first_post} = CommonAPI.post(other_user, %{status: "first post"})
+      {:ok, second_post} = CommonAPI.post(other_user, %{status: "second post"})
+      {:ok, third_post} = CommonAPI.post(other_user, %{status: "third post"})
+
+      {:ok, _} = CommonAPI.favorite(third_post.id, user)
+      {:ok, _} = CommonAPI.favorite(first_post.id, user)
+      {:ok, _} = CommonAPI.favorite(second_post.id, user)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/accounts/#{user.id}/favourites")
+        |> json_response_and_validate_schema(:ok)
+
+      assert Enum.map(response, & &1["id"]) == [second_post.id, first_post.id, third_post.id]
+    end
+
     test "returns favorited DM only when user is logged in and he is one of recipients", %{
       current_user: current_user,
       user: user
@@ -164,23 +186,67 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
     } do
       activities = insert_list(10, :note_activity)
 
-      Enum.each(activities, fn activity ->
-        CommonAPI.favorite(activity.id, user)
-      end)
+      favorite_pairs =
+        Enum.map(activities, fn activity ->
+          {:ok, favorite} = CommonAPI.favorite(activity.id, user)
+          {favorite, activity}
+        end)
+        |> Enum.sort_by(fn {favorite, _activity} -> FlakeId.from_string(favorite.id) end)
 
-      third_activity = Enum.at(activities, 2)
-      seventh_activity = Enum.at(activities, 6)
+      {third_favorite, _} = Enum.at(favorite_pairs, 2)
+      {seventh_favorite, _} = Enum.at(favorite_pairs, 6)
+
+      expected_ids =
+        favorite_pairs
+        |> Enum.slice(3, 3)
+        |> Enum.reverse()
+        |> Enum.map(fn {_favorite, activity} -> activity.id end)
 
       response =
         conn
         |> get(
-          "/api/v1/pleroma/accounts/#{user.id}/favourites?since_id=#{third_activity.id}&max_id=#{seventh_activity.id}"
+          "/api/v1/pleroma/accounts/#{user.id}/favourites?since_id=#{third_favorite.id}&max_id=#{seventh_favorite.id}"
         )
         |> json_response_and_validate_schema(:ok)
 
-      assert length(response) == 3
-      refute third_activity in response
-      refute seventh_activity in response
+      assert Enum.map(response, & &1["id"]) == expected_ids
+    end
+
+    test "paginates favorites using min_id and limit", %{
+      conn: conn,
+      user: user
+    } do
+      activities = insert_list(10, :note_activity)
+
+      favorite_pairs =
+        Enum.map(activities, fn activity ->
+          {:ok, favorite} = CommonAPI.favorite(activity.id, user)
+          {favorite, activity}
+        end)
+        |> Enum.sort_by(fn {favorite, _activity} -> FlakeId.from_string(favorite.id) end)
+
+      {third_favorite, _} = Enum.at(favorite_pairs, 2)
+      {fourth_favorite, _} = Enum.at(favorite_pairs, 3)
+      {fifth_favorite, _} = Enum.at(favorite_pairs, 4)
+
+      expected_ids =
+        favorite_pairs
+        |> Enum.slice(3, 2)
+        |> Enum.reverse()
+        |> Enum.map(fn {_favorite, activity} -> activity.id end)
+
+      conn =
+        get(
+          conn,
+          "/api/v1/pleroma/accounts/#{user.id}/favourites?min_id=#{third_favorite.id}&limit=2"
+        )
+
+      response = json_response_and_validate_schema(conn, :ok)
+
+      assert Enum.map(response, & &1["id"]) == expected_ids
+      assert [link_header] = get_resp_header(conn, "link")
+      assert link_header =~ "max_id=#{fourth_favorite.id}"
+      assert link_header =~ "min_id=#{fifth_favorite.id}"
     end
 
     test "limits favorites using limit parameter", %{

From fc9e6793ce3aaf1c9f4b305d2b9692ed59d3c058 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 29 May 2026 12:30:33 +0400
Subject: [PATCH 072/163] Address grouped notification review cleanup

---
 lib/pleroma/web/mastodon_api/mastodon_api.ex  | 23 +++-----
 .../notification_controller_test.exs          | 59 +++++++++++--------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index cb11a3f4a..d6f2dd3a3 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -73,7 +73,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   def get_grouped_notification_page(user, params \\ %{}) do
     grouped_types =
       params
-      |> Map.get("grouped_types", Map.get(params, :grouped_types))
+      |> Map.get("grouped_types")
       |> Notification.normalize_grouped_types()
 
     query = notifications_query(user, params)
@@ -98,13 +98,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
     }
   end
 
-  def get_grouped_notification_groups(user, params \\ %{}) do
-    {groups, _notifications, _notification_group_counts, _notification_group_bounds} =
-      get_grouped_notification_page(user, params)
-
-    groups
-  end
-
   def get_notification_group_result(user, group_key, params \\ %{}) do
     notifications = notification_group_sample(user, params, group_key)
     metadata = notification_group_metadata(user, group_key, params)
@@ -163,21 +156,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
 
   defp group_pagination(params) do
     cond do
-      min_id = Map.get(params, "min_id", Map.get(params, :min_id)) ->
+      min_id = Map.get(params, "min_id") ->
         cursor_filters = [{:gt, min_id}]
 
         cursor_filters =
-          case Map.get(params, "max_id", Map.get(params, :max_id)) do
+          case Map.get(params, "max_id") do
             nil -> cursor_filters
             max_id -> [{:lt, max_id} | cursor_filters]
           end
 
         {:asc, cursor_filters}
 
-      since_id = Map.get(params, "since_id", Map.get(params, :since_id)) ->
+      since_id = Map.get(params, "since_id") ->
         {:desc, [{:gt, since_id}]}
 
-      max_id = Map.get(params, "max_id", Map.get(params, :max_id)) ->
+      max_id = Map.get(params, "max_id") ->
         {:desc, [{:lt, max_id}]}
 
       true ->
@@ -187,7 +180,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
 
   defp grouped_limit(params) do
     params
-    |> Map.get("limit", Map.get(params, :limit, 40))
+    |> Map.get("limit", 40)
     |> parse_limit(40)
     |> min(80)
   end
@@ -195,7 +188,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
   def unread_notification_group_count(user, params \\ %{}) do
     grouped_types =
       params
-      |> Map.get("grouped_types", Map.get(params, :grouped_types))
+      |> Map.get("grouped_types")
       |> Notification.normalize_grouped_types()
 
     limit = unread_count_limit(params)
@@ -406,7 +399,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
 
   defp unread_count_limit(params) do
     params
-    |> Map.get("limit", Map.get(params, :limit, 100))
+    |> Map.get("limit", 100)
     |> parse_limit(100)
     |> min(1000)
   end
diff --git a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
index e9c521d6b..55df41ec6 100644
--- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
@@ -837,40 +837,28 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
       refute link_header =~ "since_id="
     end
 
-    test "lists accounts from and dismisses a notification group" do
-      %{user: user, conn: conn} = oauth_access(["read:notifications", "write:notifications"])
-      other_users = insert_list(9, :user)
+    test "lists accounts from a notification group" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications"])
 
-      {:ok, status} = CommonAPI.post(user, %{status: "hello"})
-
-      Enum.each(other_users, fn other_user ->
-        {:ok, _} = CommonAPI.favorite(status.id, other_user)
-      end)
-
-      %{
-        "notification_groups" => [
-          %{
-            "group_key" => group_key,
-            "notifications_count" => 9,
-            "sample_account_ids" => sample_account_ids
-          }
-        ]
-      } =
-        conn
-        |> get("/api/v2/notifications")
-        |> json_response_and_validate_schema(200)
+      {other_users, %{"group_key" => group_key, "sample_account_ids" => sample_account_ids}} =
+        create_favourite_notification_group(user, conn)
 
       assert length(sample_account_ids) == 8
 
-      %{conn: read_conn} = oauth_access(["read:notifications"], user: user)
-
       account_ids =
-        read_conn
+        conn
         |> get("/api/v2/notifications/#{group_key}/accounts")
         |> json_response_and_validate_schema(200)
         |> Enum.map(& &1["id"])
 
       assert Enum.sort(account_ids) == Enum.sort(Enum.map(other_users, & &1.id))
+    end
+
+    test "dismisses a notification group" do
+      %{user: user, conn: conn} = oauth_access(["read:notifications", "write:notifications"])
+
+      {_other_users, %{"group_key" => group_key}} =
+        create_favourite_notification_group(user, conn)
 
       assert %{} =
                conn
@@ -1012,6 +1000,29 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
     |> to_string()
   end
 
+  defp create_favourite_notification_group(user, conn) do
+    other_users = insert_list(9, :user)
+
+    {:ok, status} = CommonAPI.post(user, %{status: "hello"})
+
+    Enum.each(other_users, fn other_user ->
+      {:ok, _} = CommonAPI.favorite(status.id, other_user)
+    end)
+
+    %{
+      "notification_groups" => [
+        %{
+          "notifications_count" => 9
+        } = group
+      ]
+    } =
+      conn
+      |> get("/api/v2/notifications")
+      |> json_response_and_validate_schema(200)
+
+    {other_users, group}
+  end
+
   defp params_to_query(%{} = params) do
     Enum.map_join(params, "&", fn
       {k, v} when is_list(v) -> Enum.map_join(v, "&", &"#{k}[]=#{&1}")

From 86dd9663fc3e1162d5747fc140774374dcc65896 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Jun 2026 22:06:12 +0300
Subject: [PATCH 073/163] allow <center> (used by mfm)

---
 priv/scrubbers/default.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index cc5eba027..8e2d16650 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -46,6 +46,7 @@ defmodule Pleroma.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes(:b, ["lang"])
   Meta.allow_tag_with_these_attributes(:blockquote, ["lang"])
   Meta.allow_tag_with_these_attributes(:br, ["lang"])
+  Meta.allow_tag_with_these_attributes(:center, [])
   Meta.allow_tag_with_these_attributes(:cite, ["lang"])
   Meta.allow_tag_with_these_attributes(:code, ["lang"])
   Meta.allow_tag_with_these_attributes(:del, ["lang"])

From 07c65adb0c5ad94610a998730cd81439bf498f8b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 10 Jun 2026 22:26:16 +0200
Subject: [PATCH 074/163] Grouped Notifications: Add feature flag to instance
 view and nodeinfo

---
 changelog.d/grouped_notifications_flag.skip         | 0
 lib/pleroma/web/mastodon_api/views/instance_view.ex | 1 +
 test/pleroma/web/node_info_test.exs                 | 1 +
 3 files changed, 2 insertions(+)
 create mode 100644 changelog.d/grouped_notifications_flag.skip

diff --git a/changelog.d/grouped_notifications_flag.skip b/changelog.d/grouped_notifications_flag.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index d64ce4fb5..4fccdd01e 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -166,6 +166,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
     [
       "pleroma_api",
       "mastodon_api",
+      "mastodon_api_grouped_notifications",
       "mastodon_api_streaming",
       "polls",
       "v2_suggestions",
diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs
index afe4ebb36..e2bf3400a 100644
--- a/test/pleroma/web/node_info_test.exs
+++ b/test/pleroma/web/node_info_test.exs
@@ -160,6 +160,7 @@ defmodule Pleroma.Web.NodeInfoTest do
     default_features = [
       "pleroma_api",
       "mastodon_api",
+      "mastodon_api_grouped_notifications",
       "mastodon_api_streaming",
       "polls",
       "pleroma_explicit_addressing",

From 9782bcf979c12b06b7aefde14ed3708e74ff0657 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 16 Jun 2026 18:22:23 +0200
Subject: [PATCH 075/163] Elixir 1.19: Fix most MRFs being absent from AdminAPI
 suggestions.

Elixir 1.19 started lazily loading modules, so modules only get loaded
when referenced. Thus :code.all_loaded would no longer include all MRF
policies which is used on startup to generate sugestions for AdminAPI.
---
 lib/pleroma/docs/generator.ex | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/docs/generator.ex b/lib/pleroma/docs/generator.ex
index 93b19484f..70413837a 100644
--- a/lib/pleroma/docs/generator.ex
+++ b/lib/pleroma/docs/generator.ex
@@ -12,13 +12,27 @@ defmodule Pleroma.Docs.Generator do
 
   @spec list_behaviour_implementations(behaviour :: module()) :: [module()]
   def list_behaviour_implementations(behaviour) do
-    :code.all_loaded()
-    |> Enum.filter(fn {module, _} ->
+    # :code.all_loaded() no longer works on Elixir 1.19 and newer since modules are lazily loaded.
+    # We can get a complete list of modules by interating over Application.loaded_applications/0,
+    # but that includes every module which would get loaded below, which is very slow.
+    # Hardcode the Pleroma application instead, which is good enough for now.
+    application_modules =
+      case :application.get_key(:pleroma, :modules) do
+        {:ok, modules} -> modules
+        :undefined -> []
+      end
+
+    # At compile time or in tests some modules will be outside of the Pleroma application.
+    loaded_modules = Enum.map(:code.all_loaded(), fn {module, _} -> module end)
+
+    (application_modules ++ loaded_modules)
+    |> Enum.uniq()
+    |> Enum.filter(fn module ->
+      Code.ensure_loaded(module)
+
       # This shouldn't be needed as all modules are expected to have module_info/1,
       # but in test environments some transient modules `:elixir_compiler_XX`
       # are loaded for some reason (where XX is a random integer).
-      Code.ensure_loaded(module)
-
       if function_exported?(module, :module_info, 1) do
         module.module_info(:attributes)
         |> Keyword.get_values(:behaviour)
@@ -26,7 +40,6 @@ defmodule Pleroma.Docs.Generator do
         |> Enum.member?(behaviour)
       end
     end)
-    |> Enum.map(fn {module, _} -> module end)
   end
 
   @doc """

From c6d1cead8323ac8ce7ebd13395f84d90fea43518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 23 Jun 2026 16:08:52 +0200
Subject: [PATCH 076/163] Allow attaching emojis to user lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 changelog.d/list-emoji.add                    |  1 +
 lib/pleroma/list.ex                           | 42 ++++++++++++++++++-
 .../web/api_spec/operations/list_operation.ex |  9 ++--
 lib/pleroma/web/api_spec/schemas/list.ex      | 17 +++++++-
 .../web/mastodon_api/views/list_view.ex       | 23 +++++++++-
 .../20260623000000_add_emoji_to_lists.exs     |  9 ++++
 test/pleroma/list_test.exs                    | 23 ++++++++++
 .../controllers/list_controller_test.exs      | 33 +++++++++++++++
 .../web/mastodon_api/views/list_view_test.exs | 18 +++++++-
 9 files changed, 168 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/list-emoji.add
 create mode 100644 priv/repo/migrations/20260623000000_add_emoji_to_lists.exs

diff --git a/changelog.d/list-emoji.add b/changelog.d/list-emoji.add
new file mode 100644
index 000000000..dce4874d3
--- /dev/null
+++ b/changelog.d/list-emoji.add
@@ -0,0 +1 @@
+Allow attaching emojis to user lists
diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex
index cd23bd0a9..3e8a83342 100644
--- a/lib/pleroma/list.ex
+++ b/lib/pleroma/list.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.List do
   import Ecto.Changeset
 
   alias Pleroma.Activity
+  alias Pleroma.Emoji
   alias Pleroma.Repo
   alias Pleroma.User
 
@@ -18,14 +19,53 @@ defmodule Pleroma.List do
     field(:following, {:array, :string}, default: [])
     field(:ap_id, :string)
     field(:exclusive, :boolean, default: false)
+    field(:emoji, :string)
 
     timestamps()
   end
 
   def update_changeset(list, attrs \\ %{}) do
     list
-    |> cast(attrs, [:title, :exclusive])
+    |> cast(attrs, [:title, :exclusive, :emoji])
     |> validate_required([:title])
+    |> fix_emoji()
+    |> validate_emoji()
+  end
+
+  defp fix_emoji(changeset) do
+    with {:emoji_field, emoji} when is_binary(emoji) <-
+           {:emoji_field, get_field(changeset, :emoji)},
+         {:fixed_emoji, emoji} <-
+           {:fixed_emoji,
+            emoji
+            |> Emoji.fully_qualify_emoji()
+            |> Emoji.maybe_quote()} do
+      put_change(changeset, :emoji, emoji)
+    else
+      {:emoji_field, _} -> changeset
+    end
+  end
+
+  defp validate_emoji(changeset) do
+    validate_change(changeset, :emoji, fn
+      :emoji, nil ->
+        []
+
+      :emoji, emoji ->
+        if Emoji.unicode?(emoji) or valid_local_custom_emoji?(emoji) do
+          []
+        else
+          [emoji: "Invalid emoji"]
+        end
+    end)
+  end
+
+  defp valid_local_custom_emoji?(emoji) do
+    with %{file: _path} <- Emoji.get(emoji) do
+      true
+    else
+      _ -> false
+    end
   end
 
   def follow_changeset(list, attrs \\ %{}) do
diff --git a/lib/pleroma/web/api_spec/operations/list_operation.ex b/lib/pleroma/web/api_spec/operations/list_operation.ex
index 87189edc2..8aec1c352 100644
--- a/lib/pleroma/web/api_spec/operations/list_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/list_operation.ex
@@ -41,7 +41,8 @@ defmodule Pleroma.Web.ApiSpec.ListOperation do
       responses: %{
         200 => Operation.response("List", "application/json", List),
         400 => Operation.response("Error", "application/json", ApiError),
-        404 => Operation.response("Error", "application/json", ApiError)
+        404 => Operation.response("Error", "application/json", ApiError),
+        422 => Operation.response("Error", "application/json", ApiError)
       }
     }
   end
@@ -175,7 +176,8 @@ defmodule Pleroma.Web.ApiSpec.ListOperation do
           exclusive: %Schema{
             type: :boolean,
             description: "Whether members of the list should be removed from the “Home” feed"
-          }
+          },
+          emoji: %Schema{type: :string, description: "List emoji", nullable: true}
         },
         required: [:title]
       },
@@ -194,7 +196,8 @@ defmodule Pleroma.Web.ApiSpec.ListOperation do
           exclusive: %Schema{
             type: :boolean,
             description: "Whether members of the list should be removed from the “Home” feed"
-          }
+          },
+          emoji: %Schema{type: :string, description: "List emoji", nullable: true}
         }
       },
       required: true
diff --git a/lib/pleroma/web/api_spec/schemas/list.ex b/lib/pleroma/web/api_spec/schemas/list.ex
index 5df674894..ff52b1def 100644
--- a/lib/pleroma/web/api_spec/schemas/list.ex
+++ b/lib/pleroma/web/api_spec/schemas/list.ex
@@ -17,11 +17,26 @@ defmodule Pleroma.Web.ApiSpec.Schemas.List do
       exclusive: %Schema{
         type: :boolean,
         description: "Whether members of the list should be removed from the “Home” feed"
+      },
+      pleroma: %Schema{
+        type: :object,
+        properties: %{
+          emoji: %Schema{type: :string, description: "List emoji", nullable: true},
+          emoji_url: %Schema{
+            type: :string,
+            description: "URL of the list emoji if it's a custom emoji, null otherwise",
+            nullable: true
+          }
+        }
       }
     },
     example: %{
       "id" => "12249",
-      "title" => "Friends"
+      "title" => "Friends",
+      "pleroma" => %{
+        "emoji" => nil,
+        "emoji_url" => nil
+      }
     }
   })
 end
diff --git a/lib/pleroma/web/mastodon_api/views/list_view.ex b/lib/pleroma/web/mastodon_api/views/list_view.ex
index 740f458d4..508169fc1 100644
--- a/lib/pleroma/web/mastodon_api/views/list_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/list_view.ex
@@ -4,6 +4,8 @@
 
 defmodule Pleroma.Web.MastodonAPI.ListView do
   use Pleroma.Web, :view
+
+  alias Pleroma.Emoji
   alias Pleroma.Web.MastodonAPI.ListView
 
   def render("index.json", %{lists: lists} = opts) do
@@ -11,10 +13,29 @@ defmodule Pleroma.Web.MastodonAPI.ListView do
   end
 
   def render("show.json", %{list: list}) do
+    {emoji, emoji_url} = get_emoji(list.emoji)
+
     %{
       id: to_string(list.id),
       title: list.title,
-      exclusive: list.exclusive
+      exclusive: list.exclusive,
+      pleroma: %{
+        emoji: emoji,
+        emoji_url: emoji_url
+      }
     }
   end
+
+  defp get_emoji(nil), do: {nil, nil}
+
+  defp get_emoji(emoji) do
+    if Emoji.unicode?(emoji) do
+      {emoji, nil}
+    else
+      case Emoji.get(emoji) do
+        nil -> {nil, nil}
+        emoji_data -> {emoji, Emoji.local_url(emoji_data.file)}
+      end
+    end
+  end
 end
diff --git a/priv/repo/migrations/20260623000000_add_emoji_to_lists.exs b/priv/repo/migrations/20260623000000_add_emoji_to_lists.exs
new file mode 100644
index 000000000..b72ff0c13
--- /dev/null
+++ b/priv/repo/migrations/20260623000000_add_emoji_to_lists.exs
@@ -0,0 +1,9 @@
+defmodule Pleroma.Repo.Migrations.AddEmojiToLists do
+  use Ecto.Migration
+
+  def change do
+    alter table(:lists) do
+      add(:emoji, :string)
+    end
+  end
+end
diff --git a/test/pleroma/list_test.exs b/test/pleroma/list_test.exs
index d44310689..32121b8fd 100644
--- a/test/pleroma/list_test.exs
+++ b/test/pleroma/list_test.exs
@@ -23,6 +23,29 @@ defmodule Pleroma.ListTest do
     assert changeset.errors == [title: {"can't be blank", [validation: :required]}]
   end
 
+  test "creating a list with an emoji" do
+    user = insert(:user)
+    {:ok, %Pleroma.List{} = list} = Pleroma.List.create(%{title: "title", emoji: "🕓"}, user)
+    %Pleroma.List{emoji: emoji} = Pleroma.List.get(list.id, user)
+    assert emoji == "🕓"
+  end
+
+  test "validates emoji" do
+    user = insert(:user)
+
+    assert {:error, changeset} =
+             Pleroma.List.create(%{title: "title", emoji: "not an emoji"}, user)
+
+    assert changeset.errors == [emoji: {"Invalid emoji", []}]
+  end
+
+  test "updating a list's emoji" do
+    user = insert(:user)
+    {:ok, list} = Pleroma.List.create(%{title: "title"}, user)
+    {:ok, %{emoji: emoji}} = Pleroma.List.update(list, %{emoji: "🕓"})
+    assert "🕓" == emoji
+  end
+
   test "getting a list not belonging to the user" do
     user = insert(:user)
     other_user = insert(:user)
diff --git a/test/pleroma/web/mastodon_api/controllers/list_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/list_controller_test.exs
index bfda48be4..2845f67ed 100644
--- a/test/pleroma/web/mastodon_api/controllers/list_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/list_controller_test.exs
@@ -19,6 +19,16 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              |> json_response_and_validate_schema(:ok)
   end
 
+  test "creating a list with an emoji" do
+    %{conn: conn} = oauth_access(["write:lists"])
+
+    assert %{"title" => "cuties", "pleroma" => %{"emoji" => "🕓", "emoji_url" => nil}} =
+             conn
+             |> put_req_header("content-type", "application/json")
+             |> post("/api/v1/lists", %{"title" => "cuties", "emoji" => "🕓"})
+             |> json_response_and_validate_schema(:ok)
+  end
+
   test "renders error for invalid params" do
     %{conn: conn} = oauth_access(["write:lists"])
 
@@ -31,6 +41,18 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              json_response_and_validate_schema(conn, 400)
   end
 
+  test "renders error for an invalid emoji" do
+    %{conn: conn} = oauth_access(["write:lists"])
+
+    conn =
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/v1/lists", %{"title" => "cuties", "emoji" => "not an emoji"})
+
+    assert %{"error" => "Invalid emoji"} =
+             json_response_and_validate_schema(conn, :unprocessable_entity)
+  end
+
   test "listing a user's lists" do
     %{conn: conn} = oauth_access(["read:lists", "write:lists"])
 
@@ -159,6 +181,17 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              |> json_response_and_validate_schema(:ok)
   end
 
+  test "updating a list's emoji" do
+    %{user: user, conn: conn} = oauth_access(["write:lists"])
+    {:ok, list} = Pleroma.List.create(%{title: "name"}, user)
+
+    assert %{"pleroma" => %{"emoji" => "🕓", "emoji_url" => nil}} =
+             conn
+             |> put_req_header("content-type", "application/json")
+             |> put("/api/v1/lists/#{list.id}", %{"title" => "name", "emoji" => "🕓"})
+             |> json_response_and_validate_schema(:ok)
+  end
+
   test "validates title when renaming a list" do
     %{user: user, conn: conn} = oauth_access(["write:lists"])
     {:ok, list} = Pleroma.List.create(%{title: "name"}, user)
diff --git a/test/pleroma/web/mastodon_api/views/list_view_test.exs b/test/pleroma/web/mastodon_api/views/list_view_test.exs
index ae0593b6b..86f461ded 100644
--- a/test/pleroma/web/mastodon_api/views/list_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/list_view_test.exs
@@ -15,12 +15,28 @@ defmodule Pleroma.Web.MastodonAPI.ListViewTest do
     expected = %{
       id: to_string(list.id),
       title: title,
-      exclusive: false
+      exclusive: false,
+      pleroma: %{
+        emoji: nil,
+        emoji_url: nil
+      }
     }
 
     assert expected == ListView.render("show.json", %{list: list})
   end
 
+  test "show with a unicode emoji" do
+    user = insert(:user)
+    {:ok, list} = Pleroma.List.create(%{title: "mortal enemies", emoji: "🕓"}, user)
+
+    assert %{
+             pleroma: %{
+               emoji: "🕓",
+               emoji_url: nil
+             }
+           } = ListView.render("show.json", %{list: list})
+  end
+
   test "index" do
     user = insert(:user)
 

From 19a84baf82da5b8e8204bff9e305eeac5bdb4189 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 10 Jun 2026 22:54:22 +0200
Subject: [PATCH 077/163] InstanceView: Add feature flag tests

---
 .../mastodon_api/views/instance_view_test.exs | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 test/pleroma/web/mastodon_api/views/instance_view_test.exs

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
new file mode 100644
index 000000000..46bb80ba4
--- /dev/null
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -0,0 +1,98 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2026 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
+  use Pleroma.DataCase, async: true
+
+  alias Pleroma.Language.LanguageDetectorMock
+  alias Pleroma.StaticStubbedConfigMock
+  alias Pleroma.Web.MastodonAPI.InstanceView
+
+  import Mox
+
+  @features [
+    "pleroma_api",
+    "mastodon_api",
+    "mastodon_api_grouped_notifications",
+    "mastodon_api_streaming",
+    "polls",
+    "v2_suggestions",
+    "pleroma_explicit_addressing",
+    "shareable_emoji_packs",
+    "multifetch",
+    "pleroma:api/v1/notifications:include_types_filter",
+    "editing",
+    "quote_posting",
+    "pleroma_emoji_reactions",
+    "pleroma_custom_emoji_reactions",
+    "pleroma_chat_messages",
+    "pleroma:pin_chats",
+    "pleroma:get:main/ostatus",
+    "pleroma:group_actors",
+    "pleroma:bookmark_folders",
+    "pleroma:block_expiration"
+  ]
+
+  @configureable_features [
+    "blockers_visible",
+    "media_proxy",
+    "gopher",
+    "chat",
+    "shout",
+    "relay",
+    "safe_dm_mentions",
+    "exposable_reactions",
+    "profile_directory",
+    "pleroma:language_detection"
+  ]
+  @configurable_features_flags [
+    [:activitypub, :blockers_visible],
+    [:media_proxy, :enabled],
+    [:gopher, :enabled],
+    [:shout, :enabled],
+    [:instance, :allow_relay],
+    [:instance, :safe_dm_mentions],
+    [:instance, :show_reactions],
+    [:instance, :profile_directory]
+  ]
+
+  # When this fails, a new feature flag was probably added. Add it to the macros above.
+  describe "uncofigurable features" do
+    setup do
+      Enum.each(@configurable_features_flags, &clear_config(&1, false))
+    end
+
+    test "returns always enabled features" do
+      features = @features
+
+      assert Enum.sort(InstanceView.features()) == Enum.sort(features)
+    end
+  end
+
+  describe "all features" do
+    setup do
+      Enum.each(@configurable_features_flags, &clear_config(&1, true))
+
+      # Stub the StaticStubbedConfigMock to return our mock for the provider
+      StaticStubbedConfigMock
+      |> stub(:get, fn
+        [Pleroma.Language.LanguageDetector, :provider] -> LanguageDetectorMock
+        _other -> nil
+      end)
+
+      # Stub the LanguageDetectorMock with default implementations
+      LanguageDetectorMock
+      |> stub(:missing_dependencies, fn -> [] end)
+      |> stub(:configured?, fn -> true end)
+
+      :ok
+    end
+
+    test "returns all features including configurable ones" do
+      features = @features ++ @configureable_features
+
+      assert Enum.sort(InstanceView.features()) == Enum.sort(features)
+    end
+  end
+end

From 7e9b8a766340248578a675df772410b1960ee22c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 23 Jun 2026 18:20:16 +0200
Subject: [PATCH 078/163] InstanceView: Add federation/0 func test

---
 .../mastodon_api/views/instance_view_test.exs | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 46bb80ba4..d34aad25b 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -95,4 +95,72 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       assert Enum.sort(InstanceView.features()) == Enum.sort(features)
     end
   end
+
+  describe "federation/0" do
+    setup do: clear_config([:mrf, :transparency], true)
+
+    test "quarantined instances" do
+      clear_config([:instance, :quarantined_instances], [{"quarantine.example.com", "crimes"}])
+
+      output = InstanceView.federation()
+      assert %{quarantined_instances: ["quarantine.example.com"]} = output
+      assert %{quarantined_instances_info:  %{"quarantined_instances" => %{"quarantine.example.com" => %{"reason" => "crimes"}}}} = output
+    end
+
+    test "rejected instances" do
+      clear_config([:instance, :rejected_instances], [{"rejected.example.com", "not enough #cofe posting"}])
+
+      output = InstanceView.federation()
+      assert %{rejected_instances: %{"rejected.example.com" => %{"reason" => "not enough #cofe posting"}}} = output
+    end
+
+    test "federating" do
+      clear_config([:instance, :federating], true)
+
+      output = InstanceView.federation()
+      assert %{enabled: true} = output
+    end
+
+    test "transparency" do
+      clear_config([:instance, :quarantined_instances], [{"quarantine.example.com", "crimes"}])
+      clear_config([:instance, :rejected_instances], [{"rejected.example.com", "not enough #cofe posting"}])
+      clear_config([:instance, :federating], true)
+      clear_config([:mrf, :transparency], false)
+
+      output = InstanceView.federation()
+      assert %{enabled: true} == output
+    end
+
+    test "MRFs" do
+      clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
+      clear_config([:mrf, :transparency_exclusions], [{"media1.example.com", "the Fediverse doesn't need to know"}])
+      clear_config([:mrf_simple, :media_removal], [{"media1.example.com", "NSFW"}, {"media2.example.com", "usual suspects"}])
+      clear_config([:mrf_simple, :reject], [{"rejected.example.com", "not enough #cofe posting"}])
+
+      output = InstanceView.federation()
+
+      expected = %{
+        mrf_simple: %{
+          reject: ["rejected.example.com"],
+          media_removal: ["media2.example.com"],
+        },
+        mrf_hashtag: %{
+          sensitive: ["nsfw"],
+        },
+        exclusions: true,
+        mrf_policies: ["SimplePolicy", "HashtagPolicy"],
+        mrf_simple_info: %{
+          reject: %{
+            "rejected.example.com" => %{"reason" => "not enough #cofe posting"}
+          },
+          media_removal: %{"media2.example.com" => %{"reason" => "usual suspects"}}
+        }
+      }
+
+      assert expected.mrf_simple.reject == output.mrf_simple.reject
+      assert expected.mrf_simple.media_removal == output.mrf_simple.media_removal
+      assert expected.mrf_simple_info == output.mrf_simple_info
+      assert expected.exclusions == output.exclusions
+    end
+  end
 end

From 86725b5a000a6992cad522be06d0aa99dd829bcb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 23 Jun 2026 22:22:49 +0200
Subject: [PATCH 079/163] InstanceView: add rule(s), translation render tests

---
 .../mastodon_api/views/instance_view_test.exs | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index d34aad25b..d3e850766 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -163,4 +163,49 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       assert expected.exclusions == output.exclusions
     end
   end
+
+  describe "render rule.json" do
+    setup do
+      rule = Pleroma.Rule.create(%{text: "hambaga"})
+
+      %{rule: rule}
+    end
+
+    test "renders properly", %{rule: rule} do
+      output = InstanceView.render("rule.json", %{rule: rule})
+
+      assert %{text: "hambaga"} = output
+    end
+  end
+
+  describe "render rules.json" do
+    setup do
+      Pleroma.Rule.create(%{text: "rule 1"})
+      Pleroma.Rule.create(%{text: "rule 2"})
+      Pleroma.Rule.create(%{text: "rule 3"})
+      Pleroma.Rule.create(%{text: "rule 4"})
+
+      :ok
+    end
+
+    test "renders properly" do
+      output = InstanceView.render("rules.json", %{})
+      keys = Enum.map(output, fn %{text: text} -> text end)
+
+      assert length(keys) == 4
+      assert Enum.all?(output, fn %{text: "rule " <> num} -> String.to_integer(num) end)
+    end
+  end
+
+  describe "render translation_languages.json" do
+    setup do
+      clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
+    end
+
+    test "returns language matrix" do
+      output = InstanceView.render("translation_languages.json", %{})
+
+      assert %{"en" => ["pl"], "pl" => ["en"]} == output
+    end
+  end
 end

From df67f219748418b18063d9e788a1945d9dbf14a8 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 23 Jun 2026 22:24:44 +0200
Subject: [PATCH 080/163] InstanceView: use shorter setup syntax when
 applicable

---
 .../pleroma/web/mastodon_api/views/instance_view_test.exs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index d3e850766..f1852cadd 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -59,9 +59,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   # When this fails, a new feature flag was probably added. Add it to the macros above.
   describe "uncofigurable features" do
-    setup do
-      Enum.each(@configurable_features_flags, &clear_config(&1, false))
-    end
+    setup do: Enum.each(@configurable_features_flags, &clear_config(&1, false))
 
     test "returns always enabled features" do
       features = @features
@@ -198,9 +196,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   end
 
   describe "render translation_languages.json" do
-    setup do
-      clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
-    end
+    setup do: clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
 
     test "returns language matrix" do
       output = InstanceView.render("translation_languages.json", %{})

From e45dad21046435a3f5e93412a183955c34df16fb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 23 Jun 2026 22:42:15 +0200
Subject: [PATCH 081/163] InstanceView: Add domain_blocks.json render test

---
 .../mastodon_api/views/instance_view_test.exs | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index f1852cadd..9701fab85 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -195,6 +195,46 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     end
   end
 
+  describe "render domain_blocks.json" do
+    setup do
+      clear_config([:mrf, :transparency], true)
+      clear_config([:mrf, :transparency_exclusions], [{"removed1.example.com", "the Fediverse doesn't need to know"}])
+      clear_config([:mrf_simple, :media_removal], [{"media1.example.com", "NSFW"}])
+      clear_config([:mrf_simple, :reject], [{"rejected.example.com", "not enough #cofe posting"}, {"rejected-without-reason.example.com", ""}])
+      clear_config([:mrf_simple, :federated_timeline_removal], [{"removed1.example.com", "spam"}, {"removed2.example.com", "more spam"}])
+
+      :ok
+    end
+
+    test "renders properly" do
+      output = InstanceView.render("domain_blocks.json", %{})
+
+      # Media removal is not in @block_severities in the view.
+      # NOTE: Order of these two matters!
+      expected = [
+        %{
+          domain: "removed2.example.com",
+          comment: "more spam",
+          severity: "silence",
+          digest: "5f6649cfc780fac5172dbbcc8a552953f6621a14368d82728b6e8faf51295dc0"
+        },
+        %{
+          domain: "rejected.example.com",
+          comment: "not enough #cofe posting",
+          severity: "suspend",
+          digest: "c15082d347fb7eccd251e199a98dcdce94a8dfc1d33d6ece80889eed374b6f92"
+        },
+        %{
+          domain: "rejected-without-reason.example.com",
+          severity: "suspend",
+          digest: "48297155018c626c8867ca0bba4a2621eccdf51c6f7ac91b7099ed8b2ee9863f"
+        }
+      ]
+
+      assert expected == output
+    end
+  end
+
   describe "render translation_languages.json" do
     setup do: clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
 

From c290f022de1b262d8e4d84be84ad7095a89043b5 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 24 Jun 2026 00:28:44 +0200
Subject: [PATCH 082/163] InstanceView: Add show.json render test

---
 .../web/mastodon_api/views/instance_view.ex   |   2 +
 .../mastodon_api/views/instance_view_test.exs | 194 ++++++++++++++++++
 2 files changed, 196 insertions(+)

diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 4fccdd01e..1a0f63ffa 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -17,6 +17,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
     reject: "suspend"
   }
 
+  def mastodon_api_level, do: @mastodon_api_level
+
   def render("show.json", _) do
     instance = Config.get(:instance)
 
diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 9701fab85..3b24e8e5f 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -5,12 +5,63 @@
 defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   use Pleroma.DataCase, async: true
 
+  import Pleroma.Factory
+
   alias Pleroma.Language.LanguageDetectorMock
   alias Pleroma.StaticStubbedConfigMock
   alias Pleroma.Web.MastodonAPI.InstanceView
 
   import Mox
 
+  @atom_common_information_keys [
+    :languages,
+    :rules,
+    :title,
+    :version
+  ]
+
+  @common_information_keys Enum.map(@atom_common_information_keys, &to_string/1)
+
+  @atom_configuration_keys [
+    :accounts,
+    :statuses,
+    :media_attachments,
+    :polls
+  ]
+
+  @atom_pleroma_configuration_keys [
+    :metadata,
+    :stats,
+    :vapid_public_key
+  ]
+
+  @show_keys @common_information_keys ++ [
+    "uri",
+    "description",
+    "short_description",
+    "email",
+    "urls",
+    "stats",
+    "thumbnail",
+    "registrations",
+    "approval_required",
+    "contact_account",
+    "configuration",
+    # Extra (not present in Mastodon)"
+    "max_toot_chars",
+    "max_media_attachments",
+    "poll_limits",
+    "upload_limit",
+    "avatar_upload_limit",
+    "background_upload_limit",
+    "banner_upload_limit",
+    "background_image",
+    "shout_limit",
+    "description_limit",
+    "chat_limit",
+    "pleroma"
+  ]
+
   @features [
     "pleroma_api",
     "mastodon_api",
@@ -57,6 +108,96 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     [:instance, :profile_directory]
   ]
 
+  defp check_common_information(info) do
+    filtered_info = Map.reject(info, fn {key, _value} -> key not in @atom_common_information_keys end)
+
+    expected = %{
+      languages: ["en", "cs"],
+      rules: InstanceView.render("rules.json", %{}),
+      title: "test title",
+      version: InstanceView.mastodon_api_level() <> " (compatible; #{Pleroma.Application.named_version()})"
+    }
+
+    Map.equal?(expected, filtered_info)
+  end
+
+  defp check_contact_name(info, user) do
+    contact = info[:contact_account]
+    view = Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user, for: nil})
+
+    contact == view
+  end
+
+  defp check_configuration(info) do
+    configuration = info[:configuration]
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_configuration_keys end)
+
+    expected = %{
+      accounts: %{
+        max_featured_tags: 0
+      },
+      statuses: %{
+        max_characters: 4096,
+        max_media_attachments: 1
+      },
+      media_attachments: %{
+        image_size_limit: 1024,
+        video_size_limit: 1024,
+        supported_mime_types: ["application/octet-stream"]
+      },
+      polls: %{
+        max_options: 4,
+        max_characters_per_option: 120,
+        min_expiration: 1,
+        max_expiration: 2
+      }
+    }
+
+    Map.equal?(expected, filtered_configuration)
+  end
+
+  defp check_pleroma_configuration(info) do
+    configuration = info[:pleroma]
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_pleroma_configuration_keys end)
+    metadata = Map.fetch!(filtered_configuration, :metadata)
+    # Tested elsewhere already
+    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+    filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
+
+    expected = %{
+      metadata: %{
+        account_activation_required: true,
+        fields_limits: %{
+          max_fields: 1,
+          max_remote_fields: 1,
+          name_length: 1,
+          value_length: 1
+        },
+        post_formats: ["text/plain"],
+        birthday_required: true,
+        birthday_min_age: 1,
+        translation:
+          %{
+            source_languages: ["en", "pl"],
+            target_languages: ["en", "pl"]
+          },
+        base_urls: %{
+          media_proxy: "https://mediaproxy.example.com",
+          upload: "https://upload.example.com"
+        },
+        markup: %{
+            allow_inline_images: true,
+            allow_headings: true,
+            allow_tables: true
+        }
+      },
+      stats: %{mau: Pleroma.User.active_user_count()},
+      vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
+    }
+
+    Map.equal?(expected, filtered_configuration)
+  end
+
   # When this fails, a new feature flag was probably added. Add it to the macros above.
   describe "uncofigurable features" do
     setup do: Enum.each(@configurable_features_flags, &clear_config(&1, false))
@@ -162,6 +303,59 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     end
   end
 
+  describe "render show.json" do
+    setup do
+      Pleroma.Rule.create(%{text: "rule 1"})
+      Pleroma.Rule.create(%{text: "rule 2"})
+
+      user = insert(:user)
+
+      # Wall of configs for testing whether they are rendered properly
+      clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
+
+      clear_config([:instance, :languages], ["en", "cs"])
+      clear_config([:instance, :name], "test title")
+      clear_config([:instance, :contact_username], user.nickname)
+      clear_config([:instance, :limit], 4096)
+      clear_config([:instance, :max_media_attachments], 1)
+      clear_config([:instance, :upload_limit], 1024)
+      clear_config([:instance, :poll_limits, :max_options], 4)
+      clear_config([:instance, :poll_limits, :max_option_chars], 120)
+      clear_config([:instance, :poll_limits, :min_expiration], 1)
+      clear_config([:instance, :poll_limits, :max_expiration], 2)
+      clear_config([:instance, :account_activation_required], true)
+      clear_config([:instance, :max_account_fields], 1)
+      clear_config([:instance, :max_remote_account_fields], 1)
+      clear_config([:instance, :account_field_name_length], 1)
+      clear_config([:instance, :account_field_value_length], 1)
+      clear_config([:instance, :allowed_post_formats], ["text/plain"])
+      clear_config([:instance, :birthday_required], true)
+      clear_config([:instance, :birthday_min_age], 1)
+
+      clear_config([:media_proxy, :enabled], true)
+      clear_config([:media_proxy, :base_url], "https://mediaproxy.example.com")
+
+      clear_config([Pleroma.Upload, :base_url], "https://upload.example.com")
+
+      clear_config([:markup, :allow_inline_images], true)
+      clear_config([:markup, :allow_headings], true)
+      clear_config([:markup, :allow_tables], true)
+
+      %{user: user}
+    end
+
+    test "renders properly", %{user: user} do
+      output = InstanceView.render("show.json", %{})
+      expected_keys = Enum.sort(@show_keys)
+
+      assert check_common_information(output)
+      assert check_contact_name(output, user)
+      assert check_configuration(output)
+      assert check_pleroma_configuration(output)
+      assert expected_keys == Enum.sort(Enum.map(Map.keys(output), &to_string/1))
+    end
+  end
+
   describe "render rule.json" do
     setup do
       rule = Pleroma.Rule.create(%{text: "hambaga"})

From 0337bd0ae4ff1adf26dda28af5405a092c4782e1 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 25 Jun 2026 00:19:15 +0200
Subject: [PATCH 083/163] InstanceView: Add show2.json render test

---
 .../mastodon_api/views/instance_view_test.exs | 194 +++++++++++++++++-
 1 file changed, 192 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 3b24e8e5f..b4622191b 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -29,12 +29,20 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     :polls
   ]
 
+  @atom_configuration2_keys @atom_configuration_keys ++ [
+    :urls,
+    :vapid,
+    :translation,
+    :timelines_access
+  ]
+
   @atom_pleroma_configuration_keys [
     :metadata,
     :stats,
     :vapid_public_key
   ]
 
+  # TODO: Simplify this, so ideally only atoms are macroed
   @show_keys @common_information_keys ++ [
     "uri",
     "description",
@@ -62,6 +70,19 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     "pleroma"
   ]
 
+  @show2_keys @common_information_keys ++ [
+      "domain",
+      "source_url",
+      "description",
+      "usage",
+      "thumbnail",
+      "configuration",
+      "registrations",
+      "contact",
+      # Extra (not present in Mastodon):
+      "pleroma"
+    ]
+
   @features [
     "pleroma_api",
     "mastodon_api",
@@ -121,6 +142,27 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, filtered_info)
   end
 
+  defp check_thumbnail(info) do
+    thumbnail = info[:thumbnail]
+
+    expected = %{
+      url: URI.merge(Pleroma.Web.Endpoint.url(), "https://example.com/thumbnail.png") |> to_string
+    }
+
+    expected == thumbnail
+  end
+
+  defp check_contact(info, user) do
+    contact = info[:contact]
+
+    expected = %{
+      email: "nonexist@example.com",
+      account: Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user, for: nil})
+    }
+
+    Map.equal?(expected, contact)
+  end
+
   defp check_contact_name(info, user) do
     contact = info[:contact_account]
     view = Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user, for: nil})
@@ -156,6 +198,70 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, filtered_configuration)
   end
 
+  defp check_configuration2(info) do
+    configuration = info[:configuration]
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_configuration2_keys end)
+
+    # configuration2 also includes parts from configuration
+    expected = %{
+      accounts: %{
+        max_featured_tags: 0,
+        max_pinned_statuses: 1,
+        max_profile_fields: 1,
+        profile_field_name_limit: 1,
+        profile_field_value_limit: 1
+      },
+      statuses: %{
+        max_characters: 4096,
+        max_media_attachments: 1,
+        characters_reserved_per_url: 0
+      },
+      media_attachments: %{
+        image_size_limit: 1024,
+        video_size_limit: 1024,
+        supported_mime_types: ["application/octet-stream"]
+      },
+      polls: %{
+        max_options: 4,
+        max_characters_per_option: 120,
+        min_expiration: 1,
+        max_expiration: 2
+      },
+      urls: %{
+        streaming: Pleroma.Web.Endpoint.websocket_url(),
+        status: "https://status.example.com"
+      },
+      vapid: %{
+        public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
+      },
+      translation: %{enabled: true},
+      timelines_access: %{
+        live_feeds: %{local: "authenticated", remote: "authenticated"},
+        hashtag_feeds: %{local: "authenticated", remote: "authenticated"},
+        # not implemented in Pleroma
+        trending_link_feeds: %{
+          local: "disabled",
+          remote: "disabled"
+        }
+      }
+    }
+
+    Map.equal?(expected, filtered_configuration)
+  end
+
+  defp check_registrations(info) do
+    registrations = info[:registrations]
+
+    expected = %{
+      enabled: false,
+      approval_required: true,
+      message: nil,
+      url: nil
+    }
+
+    Map.equal?(expected, registrations)
+  end
+
   defp check_pleroma_configuration(info) do
     configuration = info[:pleroma]
     filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_pleroma_configuration_keys end)
@@ -198,6 +304,56 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, filtered_configuration)
   end
 
+  defp check_pleroma_configuration2(info) do
+    configuration = info[:pleroma]
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_pleroma_configuration_keys end)
+    metadata = Map.fetch!(filtered_configuration, :metadata)
+    # Tested elsewhere already
+    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+    filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
+
+    # pleroma_configuration2 also includes parts from pleroma_configuration
+    expected = %{
+      metadata: %{
+        account_activation_required: true,
+        fields_limits: %{
+          max_fields: 1,
+          max_remote_fields: 1,
+          name_length: 1,
+          value_length: 1
+        },
+        post_formats: ["text/plain"],
+        birthday_required: true,
+        birthday_min_age: 1,
+        translation:
+          %{
+            source_languages: ["en", "pl"],
+            target_languages: ["en", "pl"]
+          },
+        base_urls: %{
+          media_proxy: "https://mediaproxy.example.com",
+          upload: "https://upload.example.com"
+        },
+        markup: %{
+            allow_inline_images: true,
+            allow_headings: true,
+            allow_tables: true
+        },
+        avatar_upload_limit: 1024,
+        background_upload_limit: 1024,
+        banner_upload_limit: 1024,
+        background_image: Pleroma.Web.Endpoint.url() <> "/media/background.png",
+        chat_limit: 120,
+        description_limit: 120,
+        shout_limit: 120
+      },
+      stats: %{mau: Pleroma.User.active_user_count()},
+      vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
+    }
+
+    Map.equal?(expected, filtered_configuration)
+  end
+
   # When this fails, a new feature flag was probably added. Add it to the macros above.
   describe "uncofigurable features" do
     setup do: Enum.each(@configurable_features_flags, &clear_config(&1, false))
@@ -303,7 +459,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     end
   end
 
-  describe "render show.json" do
+  describe "render show.json/show2.json" do
     setup do
       Pleroma.Rule.create(%{text: "rule 1"})
       Pleroma.Rule.create(%{text: "rule 2"})
@@ -332,6 +488,23 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       clear_config([:instance, :birthday_required], true)
       clear_config([:instance, :birthday_min_age], 1)
 
+      clear_config([:instance, :short_description], "Corndog Emporium!")
+      clear_config([:instance, :instance_thumbnail], "https://example.com/thumbnail.png")
+      clear_config([:instance, :registrations_open], false)
+      clear_config([:instance, :account_approval_required], true)
+
+      clear_config([:instance, :max_pinned_statuses], 1)
+      clear_config([:instance, :status_page], "https://status.example.com")
+
+      clear_config([:instance, :email], "nonexist@example.com")
+
+      clear_config([:instance, :avatar_upload_limit], 1024)
+      clear_config([:instance, :background_upload_limit], 1024)
+      clear_config([:instance, :banner_upload_limit], 1024)
+      clear_config([:instance, :background_image], "/media/background.png")
+      clear_config([:instance, :chat_limit], 120)
+      clear_config([:instance, :description_limit], 120)
+
       clear_config([:media_proxy, :enabled], true)
       clear_config([:media_proxy, :base_url], "https://mediaproxy.example.com")
 
@@ -341,10 +514,14 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       clear_config([:markup, :allow_headings], true)
       clear_config([:markup, :allow_tables], true)
 
+      clear_config([:restrict_unauthenticated, :timelines], %{local: true, federated: true})
+
+      clear_config([:shout, :limit], 120)
+
       %{user: user}
     end
 
-    test "renders properly", %{user: user} do
+    test "renders show.json properly", %{user: user} do
       output = InstanceView.render("show.json", %{})
       expected_keys = Enum.sort(@show_keys)
 
@@ -354,6 +531,19 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       assert check_pleroma_configuration(output)
       assert expected_keys == Enum.sort(Enum.map(Map.keys(output), &to_string/1))
     end
+
+    test "renders show2.json properly", %{user: user} do
+      output = InstanceView.render("show2.json", %{})
+      expected_keys = Enum.sort(@show2_keys)
+
+      assert check_common_information(output)
+      assert check_thumbnail(output)
+      assert check_configuration2(output)
+      assert check_registrations(output)
+      assert check_contact(output, user)
+      assert check_pleroma_configuration2(output)
+      assert expected_keys == Enum.sort(Enum.map(Map.keys(output), &to_string/1))
+    end
   end
 
   describe "render rule.json" do

From 6393fe0a9e62051393c44acc1d66bd196616ea54 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Thu, 25 Jun 2026 23:21:09 +0200
Subject: [PATCH 084/163] InstanceView: removing unneeded doubling of
 attributes in tests

---
 .../mastodon_api/views/instance_view_test.exs | 97 +++++++++----------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index b4622191b..93b5c60c9 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -13,74 +13,71 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   import Mox
 
-  @atom_common_information_keys [
+  @common_information_keys [
     :languages,
     :rules,
     :title,
     :version
   ]
 
-  @common_information_keys Enum.map(@atom_common_information_keys, &to_string/1)
-
-  @atom_configuration_keys [
+  @configuration_keys [
     :accounts,
     :statuses,
     :media_attachments,
     :polls
   ]
 
-  @atom_configuration2_keys @atom_configuration_keys ++ [
+  @configuration2_keys @configuration_keys ++ [
     :urls,
     :vapid,
     :translation,
     :timelines_access
   ]
 
-  @atom_pleroma_configuration_keys [
+  @pleroma_configuration_keys [
     :metadata,
     :stats,
     :vapid_public_key
   ]
 
-  # TODO: Simplify this, so ideally only atoms are macroed
   @show_keys @common_information_keys ++ [
-    "uri",
-    "description",
-    "short_description",
-    "email",
-    "urls",
-    "stats",
-    "thumbnail",
-    "registrations",
-    "approval_required",
-    "contact_account",
-    "configuration",
-    # Extra (not present in Mastodon)"
-    "max_toot_chars",
-    "max_media_attachments",
-    "poll_limits",
-    "upload_limit",
-    "avatar_upload_limit",
-    "background_upload_limit",
-    "banner_upload_limit",
-    "background_image",
-    "shout_limit",
-    "description_limit",
-    "chat_limit",
-    "pleroma"
+    :uri,
+    :description,
+    :short_description,
+    :email,
+    :urls,
+    :stats,
+    :thumbnail,
+    :registrations,
+    :approval_required,
+    :contact_account,
+    :configuration,
+    # Extra (not present in Mastodon)
+    :max_toot_chars,
+    :max_media_attachments,
+    :poll_limits,
+    :upload_limit,
+    :avatar_upload_limit,
+    :background_upload_limit,
+    :banner_upload_limit,
+    :background_image,
+    :shout_limit,
+    :description_limit,
+    :chat_limit,
+    :pleroma
   ]
 
   @show2_keys @common_information_keys ++ [
-      "domain",
-      "source_url",
-      "description",
-      "usage",
-      "thumbnail",
-      "configuration",
-      "registrations",
-      "contact",
-      # Extra (not present in Mastodon):
-      "pleroma"
+      :domain,
+      :source_url,
+      :description,
+      :usage,
+      :thumbnail,
+      :configuration,
+      :registrations,
+      :contact,
+      # Extra (not present in Mastodon)
+      :pleroma
     ]
 
   @features [
@@ -106,7 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     "pleroma:block_expiration"
   ]
 
-  @configureable_features [
+  @configurable_features [
     "blockers_visible",
     "media_proxy",
     "gopher",
@@ -130,7 +127,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   ]
 
   defp check_common_information(info) do
-    filtered_info = Map.reject(info, fn {key, _value} -> key not in @atom_common_information_keys end)
+    filtered_info = Map.reject(info, fn {key, _value} -> key not in @common_information_keys end)
 
     expected = %{
       languages: ["en", "cs"],
@@ -172,7 +169,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_configuration(info) do
     configuration = info[:configuration]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_configuration_keys end)
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @configuration_keys end)
 
     expected = %{
       accounts: %{
@@ -200,7 +197,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_configuration2(info) do
     configuration = info[:configuration]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_configuration2_keys end)
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @configuration2_keys end)
 
     # configuration2 also includes parts from configuration
     expected = %{
@@ -264,7 +261,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_pleroma_configuration(info) do
     configuration = info[:pleroma]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_pleroma_configuration_keys end)
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
     metadata = Map.fetch!(filtered_configuration, :metadata)
     # Tested elsewhere already
     filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
@@ -306,7 +303,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_pleroma_configuration2(info) do
     configuration = info[:pleroma]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @atom_pleroma_configuration_keys end)
+    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
     metadata = Map.fetch!(filtered_configuration, :metadata)
     # Tested elsewhere already
     filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
@@ -385,7 +382,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     end
 
     test "returns all features including configurable ones" do
-      features = @features ++ @configureable_features
+      features = @features ++ @configurable_features
 
       assert Enum.sort(InstanceView.features()) == Enum.sort(features)
     end
@@ -529,7 +526,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       assert check_contact_name(output, user)
       assert check_configuration(output)
       assert check_pleroma_configuration(output)
-      assert expected_keys == Enum.sort(Enum.map(Map.keys(output), &to_string/1))
+      assert expected_keys == Enum.sort(Map.keys(output))
     end
 
     test "renders show2.json properly", %{user: user} do
@@ -542,7 +539,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       assert check_registrations(output)
       assert check_contact(output, user)
       assert check_pleroma_configuration2(output)
-      assert expected_keys == Enum.sort(Enum.map(Map.keys(output), &to_string/1))
+      assert expected_keys == Enum.sort(Map.keys(output))
     end
   end
 

From 93fe0f5ab5ed258d6b6e3b42e007ca37336218fb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 26 Jun 2026 01:41:32 +0200
Subject: [PATCH 085/163] InstanceView: Filter out *configuration keys from
 *configuration2

---
 .../mastodon_api/views/instance_view_test.exs | 88 ++++++++-----------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 93b5c60c9..e6c8185c1 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -34,12 +34,26 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     :timelines_access
   ]
 
+  # Used for filtering out values from configuration.json render in configuration2.json render
+  @configuration2_filter [
+    {:accounts, [:max_pinned_statuses, :max_profile_fields, :profile_field_name_limit, :profile_field_value_limit]},
+    {:statuses, [:characters_reserved_per_url]},
+    {:urls, [:streaming, :status]},
+    {:vapid, [:public_key]},
+    {:translation, [:enabled]},
+    {:timelines_access, [:live_feeds, :hashtag_feeds, :trending_link_feeds]}
+  ]
+
   @pleroma_configuration_keys [
     :metadata,
     :stats,
     :vapid_public_key
   ]
 
+  @pleroma_configuration2_filter [
+    {:metadata, [:avatar_upload_limit, :background_upload_limit, :banner_upload_limit, :background_image, :chat_limit, :description_limit, :shout_limit]}
+  ]
+
   @show_keys @common_information_keys ++ [
     :uri,
     :description,
@@ -126,6 +140,17 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     [:instance, :profile_directory]
   ]
 
+  # Filters out values from one layer deep nested Maps.
+  defp filter_render(%{}, [], acc), do: acc
+
+  defp filter_render(input, filter, acc) do
+    {{filter_key, filters}, filter_rest} = List.pop_at(filter, 0)
+    {config_key_values, input_rest} = Map.pop!(input, filter_key)
+    filtered = Map.reject(config_key_values, fn {key, _} -> key not in filters end)
+
+    filter_render(input_rest, filter_rest, Map.put(acc, filter_key, filtered))
+  end
+
   defp check_common_information(info) do
     filtered_info = Map.reject(info, fn {key, _value} -> key not in @common_information_keys end)
 
@@ -197,33 +222,21 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_configuration2(info) do
     configuration = info[:configuration]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @configuration2_keys end)
+    filtered_configuration =
+      configuration
+      |> Map.reject(fn {key, _value} -> key not in @configuration2_keys end)
+      |> filter_render(@configuration2_filter, %{})
 
-    # configuration2 also includes parts from configuration
     expected = %{
       accounts: %{
-        max_featured_tags: 0,
         max_pinned_statuses: 1,
         max_profile_fields: 1,
         profile_field_name_limit: 1,
         profile_field_value_limit: 1
       },
       statuses: %{
-        max_characters: 4096,
-        max_media_attachments: 1,
         characters_reserved_per_url: 0
       },
-      media_attachments: %{
-        image_size_limit: 1024,
-        video_size_limit: 1024,
-        supported_mime_types: ["application/octet-stream"]
-      },
-      polls: %{
-        max_options: 4,
-        max_characters_per_option: 120,
-        min_expiration: 1,
-        max_expiration: 2
-      },
       urls: %{
         streaming: Pleroma.Web.Endpoint.websocket_url(),
         status: "https://status.example.com"
@@ -262,8 +275,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   defp check_pleroma_configuration(info) do
     configuration = info[:pleroma]
     filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
-    metadata = Map.fetch!(filtered_configuration, :metadata)
+
     # Tested elsewhere already
+    metadata = Map.fetch!(filtered_configuration, :metadata)
     filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
     filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
 
@@ -304,38 +318,16 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   defp check_pleroma_configuration2(info) do
     configuration = info[:pleroma]
     filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
-    metadata = Map.fetch!(filtered_configuration, :metadata)
-    # Tested elsewhere already
-    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
-    filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
 
-    # pleroma_configuration2 also includes parts from pleroma_configuration
+    # Tested elsewhere already
+    metadata = Map.fetch!(filtered_configuration, :metadata)
+    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+    filtered_configuration =
+      %{filtered_configuration | metadata: filtered_metadata}
+      |> filter_render(@pleroma_configuration2_filter, %{})
+
     expected = %{
       metadata: %{
-        account_activation_required: true,
-        fields_limits: %{
-          max_fields: 1,
-          max_remote_fields: 1,
-          name_length: 1,
-          value_length: 1
-        },
-        post_formats: ["text/plain"],
-        birthday_required: true,
-        birthday_min_age: 1,
-        translation:
-          %{
-            source_languages: ["en", "pl"],
-            target_languages: ["en", "pl"]
-          },
-        base_urls: %{
-          media_proxy: "https://mediaproxy.example.com",
-          upload: "https://upload.example.com"
-        },
-        markup: %{
-            allow_inline_images: true,
-            allow_headings: true,
-            allow_tables: true
-        },
         avatar_upload_limit: 1024,
         background_upload_limit: 1024,
         banner_upload_limit: 1024,
@@ -343,9 +335,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
         chat_limit: 120,
         description_limit: 120,
         shout_limit: 120
-      },
-      stats: %{mau: Pleroma.User.active_user_count()},
-      vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
+      }
     }
 
     Map.equal?(expected, filtered_configuration)

From 9912b2d16af01d322a1e3a4eb78efbd6f42efdf5 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 26 Jun 2026 01:57:32 +0200
Subject: [PATCH 086/163] InstanceView: lint tests

---
 .../mastodon_api/views/instance_view_test.exs | 207 ++++++++++++------
 1 file changed, 136 insertions(+), 71 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index e6c8185c1..cae704b90 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -27,16 +27,23 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     :polls
   ]
 
-  @configuration2_keys @configuration_keys ++ [
-    :urls,
-    :vapid,
-    :translation,
-    :timelines_access
-  ]
+  @configuration2_keys @configuration_keys ++
+                         [
+                           :urls,
+                           :vapid,
+                           :translation,
+                           :timelines_access
+                         ]
 
   # Used for filtering out values from configuration.json render in configuration2.json render
   @configuration2_filter [
-    {:accounts, [:max_pinned_statuses, :max_profile_fields, :profile_field_name_limit, :profile_field_value_limit]},
+    {:accounts,
+     [
+       :max_pinned_statuses,
+       :max_profile_fields,
+       :profile_field_name_limit,
+       :profile_field_value_limit
+     ]},
     {:statuses, [:characters_reserved_per_url]},
     {:urls, [:streaming, :status]},
     {:vapid, [:public_key]},
@@ -51,48 +58,59 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   ]
 
   @pleroma_configuration2_filter [
-    {:metadata, [:avatar_upload_limit, :background_upload_limit, :banner_upload_limit, :background_image, :chat_limit, :description_limit, :shout_limit]}
+    {:metadata,
+     [
+       :avatar_upload_limit,
+       :background_upload_limit,
+       :banner_upload_limit,
+       :background_image,
+       :chat_limit,
+       :description_limit,
+       :shout_limit
+     ]}
   ]
 
-  @show_keys @common_information_keys ++ [
-    :uri,
-    :description,
-    :short_description,
-    :email,
-    :urls,
-    :stats,
-    :thumbnail,
-    :registrations,
-    :approval_required,
-    :contact_account,
-    :configuration,
-    # Extra (not present in Mastodon)
-    :max_toot_chars,
-    :max_media_attachments,
-    :poll_limits,
-    :upload_limit,
-    :avatar_upload_limit,
-    :background_upload_limit,
-    :banner_upload_limit,
-    :background_image,
-    :shout_limit,
-    :description_limit,
-    :chat_limit,
-    :pleroma
-  ]
+  @show_keys @common_information_keys ++
+               [
+                 :uri,
+                 :description,
+                 :short_description,
+                 :email,
+                 :urls,
+                 :stats,
+                 :thumbnail,
+                 :registrations,
+                 :approval_required,
+                 :contact_account,
+                 :configuration,
+                 # Extra (not present in Mastodon)
+                 :max_toot_chars,
+                 :max_media_attachments,
+                 :poll_limits,
+                 :upload_limit,
+                 :avatar_upload_limit,
+                 :background_upload_limit,
+                 :banner_upload_limit,
+                 :background_image,
+                 :shout_limit,
+                 :description_limit,
+                 :chat_limit,
+                 :pleroma
+               ]
 
-  @show2_keys @common_information_keys ++ [
-      :domain,
-      :source_url,
-      :description,
-      :usage,
-      :thumbnail,
-      :configuration,
-      :registrations,
-      :contact,
-      # Extra (not present in Mastodon)
-      :pleroma
-    ]
+  @show2_keys @common_information_keys ++
+                [
+                  :domain,
+                  :source_url,
+                  :description,
+                  :usage,
+                  :thumbnail,
+                  :configuration,
+                  :registrations,
+                  :contact,
+                  # Extra (not present in Mastodon)
+                  :pleroma
+                ]
 
   @features [
     "pleroma_api",
@@ -158,7 +176,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       languages: ["en", "cs"],
       rules: InstanceView.render("rules.json", %{}),
       title: "test title",
-      version: InstanceView.mastodon_api_level() <> " (compatible; #{Pleroma.Application.named_version()})"
+      version:
+        InstanceView.mastodon_api_level() <>
+          " (compatible; #{Pleroma.Application.named_version()})"
     }
 
     Map.equal?(expected, filtered_info)
@@ -194,7 +214,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_configuration(info) do
     configuration = info[:configuration]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @configuration_keys end)
+
+    filtered_configuration =
+      Map.reject(configuration, fn {key, _value} -> key not in @configuration_keys end)
 
     expected = %{
       accounts: %{
@@ -222,6 +244,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_configuration2(info) do
     configuration = info[:configuration]
+
     filtered_configuration =
       configuration
       |> Map.reject(fn {key, _value} -> key not in @configuration2_keys end)
@@ -274,11 +297,16 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_pleroma_configuration(info) do
     configuration = info[:pleroma]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
+
+    filtered_configuration =
+      Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
 
     # Tested elsewhere already
     metadata = Map.fetch!(filtered_configuration, :metadata)
-    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+
+    filtered_metadata =
+      Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+
     filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
 
     expected = %{
@@ -293,19 +321,18 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
         post_formats: ["text/plain"],
         birthday_required: true,
         birthday_min_age: 1,
-        translation:
-          %{
-            source_languages: ["en", "pl"],
-            target_languages: ["en", "pl"]
-          },
+        translation: %{
+          source_languages: ["en", "pl"],
+          target_languages: ["en", "pl"]
+        },
         base_urls: %{
           media_proxy: "https://mediaproxy.example.com",
           upload: "https://upload.example.com"
         },
         markup: %{
-            allow_inline_images: true,
-            allow_headings: true,
-            allow_tables: true
+          allow_inline_images: true,
+          allow_headings: true,
+          allow_tables: true
         }
       },
       stats: %{mau: Pleroma.User.active_user_count()},
@@ -317,11 +344,16 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
   defp check_pleroma_configuration2(info) do
     configuration = info[:pleroma]
-    filtered_configuration = Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
+
+    filtered_configuration =
+      Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
 
     # Tested elsewhere already
     metadata = Map.fetch!(filtered_configuration, :metadata)
-    filtered_metadata = Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+
+    filtered_metadata =
+      Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
+
     filtered_configuration =
       %{filtered_configuration | metadata: filtered_metadata}
       |> filter_render(@pleroma_configuration2_filter, %{})
@@ -386,14 +418,26 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
       output = InstanceView.federation()
       assert %{quarantined_instances: ["quarantine.example.com"]} = output
-      assert %{quarantined_instances_info:  %{"quarantined_instances" => %{"quarantine.example.com" => %{"reason" => "crimes"}}}} = output
+
+      assert %{
+               quarantined_instances_info: %{
+                 "quarantined_instances" => %{"quarantine.example.com" => %{"reason" => "crimes"}}
+               }
+             } = output
     end
 
     test "rejected instances" do
-      clear_config([:instance, :rejected_instances], [{"rejected.example.com", "not enough #cofe posting"}])
+      clear_config([:instance, :rejected_instances], [
+        {"rejected.example.com", "not enough #cofe posting"}
+      ])
 
       output = InstanceView.federation()
-      assert %{rejected_instances: %{"rejected.example.com" => %{"reason" => "not enough #cofe posting"}}} = output
+
+      assert %{
+               rejected_instances: %{
+                 "rejected.example.com" => %{"reason" => "not enough #cofe posting"}
+               }
+             } = output
     end
 
     test "federating" do
@@ -405,29 +449,39 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
     test "transparency" do
       clear_config([:instance, :quarantined_instances], [{"quarantine.example.com", "crimes"}])
-      clear_config([:instance, :rejected_instances], [{"rejected.example.com", "not enough #cofe posting"}])
       clear_config([:instance, :federating], true)
       clear_config([:mrf, :transparency], false)
 
+      clear_config([:instance, :rejected_instances], [
+        {"rejected.example.com", "not enough #cofe posting"}
+      ])
+
       output = InstanceView.federation()
       assert %{enabled: true} == output
     end
 
     test "MRFs" do
       clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
-      clear_config([:mrf, :transparency_exclusions], [{"media1.example.com", "the Fediverse doesn't need to know"}])
-      clear_config([:mrf_simple, :media_removal], [{"media1.example.com", "NSFW"}, {"media2.example.com", "usual suspects"}])
       clear_config([:mrf_simple, :reject], [{"rejected.example.com", "not enough #cofe posting"}])
 
+      clear_config([:mrf, :transparency_exclusions], [
+        {"media1.example.com", "the Fediverse doesn't need to know"}
+      ])
+
+      clear_config([:mrf_simple, :media_removal], [
+        {"media1.example.com", "NSFW"},
+        {"media2.example.com", "usual suspects"}
+      ])
+
       output = InstanceView.federation()
 
       expected = %{
         mrf_simple: %{
           reject: ["rejected.example.com"],
-          media_removal: ["media2.example.com"],
+          media_removal: ["media2.example.com"]
         },
         mrf_hashtag: %{
-          sensitive: ["nsfw"],
+          sensitive: ["nsfw"]
         },
         exclusions: true,
         mrf_policies: ["SimplePolicy", "HashtagPolicy"],
@@ -569,10 +623,21 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   describe "render domain_blocks.json" do
     setup do
       clear_config([:mrf, :transparency], true)
-      clear_config([:mrf, :transparency_exclusions], [{"removed1.example.com", "the Fediverse doesn't need to know"}])
       clear_config([:mrf_simple, :media_removal], [{"media1.example.com", "NSFW"}])
-      clear_config([:mrf_simple, :reject], [{"rejected.example.com", "not enough #cofe posting"}, {"rejected-without-reason.example.com", ""}])
-      clear_config([:mrf_simple, :federated_timeline_removal], [{"removed1.example.com", "spam"}, {"removed2.example.com", "more spam"}])
+
+      clear_config([:mrf, :transparency_exclusions], [
+        {"removed1.example.com", "the Fediverse doesn't need to know"}
+      ])
+
+      clear_config([:mrf_simple, :reject], [
+        {"rejected.example.com", "not enough #cofe posting"},
+        {"rejected-without-reason.example.com", ""}
+      ])
+
+      clear_config([:mrf_simple, :federated_timeline_removal], [
+        {"removed1.example.com", "spam"},
+        {"removed2.example.com", "more spam"}
+      ])
 
       :ok
     end

From 6c79cc792f856027fb8c1e9372ede341272d166f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 27 Jun 2026 22:41:45 +0200
Subject: [PATCH 087/163] InstanceView: improve filtering in tests, simplify

---
 .../mastodon_api/views/instance_view_test.exs | 108 +++++++-----------
 1 file changed, 42 insertions(+), 66 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index cae704b90..7bdd9a126 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -20,21 +20,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     :version
   ]
 
-  @configuration_keys [
-    :accounts,
-    :statuses,
-    :media_attachments,
-    :polls
-  ]
-
-  @configuration2_keys @configuration_keys ++
-                         [
-                           :urls,
-                           :vapid,
-                           :translation,
-                           :timelines_access
-                         ]
-
   # Used for filtering out values from configuration.json render in configuration2.json render
   @configuration2_filter [
     {:accounts,
@@ -51,12 +36,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     {:timelines_access, [:live_feeds, :hashtag_feeds, :trending_link_feeds]}
   ]
 
-  @pleroma_configuration_keys [
-    :metadata,
-    :stats,
-    :vapid_public_key
-  ]
-
   @pleroma_configuration2_filter [
     {:metadata,
      [
@@ -159,14 +138,37 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   ]
 
   # Filters out values from one layer deep nested Maps.
-  defp filter_render(%{}, [], acc), do: acc
+  # Filtering types:
+  #   - :inclusive -> filters out everything that is not in the filters
+  #   - :discriminative -> filters out what is in the filters
+  defp filter_render(input, filter, type, acc)
 
-  defp filter_render(input, filter, acc) do
-    {{filter_key, filters}, filter_rest} = List.pop_at(filter, 0)
-    {config_key_values, input_rest} = Map.pop!(input, filter_key)
-    filtered = Map.reject(config_key_values, fn {key, _} -> key not in filters end)
+  defp filter_render(_input_rest, [], type, acc) when type == :inclusive, do: acc
 
-    filter_render(input_rest, filter_rest, Map.put(acc, filter_key, filtered))
+  defp filter_render(input_rest, [], type, acc) when type == :discriminative,
+    do: Map.merge(input_rest, acc)
+
+  defp filter_render(input, filter, type, acc) do
+    {current_filter, filter_rest} = List.pop_at(filter, 0)
+
+    case current_filter do
+      nil ->
+        filter_render(input, filter_rest, type, acc)
+
+      {filter_key, filters} ->
+        {config_key_values, input_rest} = Map.pop!(input, filter_key)
+
+        filtered =
+          case type do
+            :inclusive ->
+              Map.reject(config_key_values, fn {key, _} -> key not in filters end)
+
+            :discriminative ->
+              Map.reject(config_key_values, fn {key, _} -> key in filters end)
+          end
+
+        filter_render(input_rest, filter_rest, type, Map.put(acc, filter_key, filtered))
+    end
   end
 
   defp check_common_information(info) do
@@ -215,9 +217,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   defp check_configuration(info) do
     configuration = info[:configuration]
 
-    filtered_configuration =
-      Map.reject(configuration, fn {key, _value} -> key not in @configuration_keys end)
-
     expected = %{
       accounts: %{
         max_featured_tags: 0
@@ -239,16 +238,13 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       }
     }
 
-    Map.equal?(expected, filtered_configuration)
+    Map.equal?(expected, configuration)
   end
 
   defp check_configuration2(info) do
-    configuration = info[:configuration]
-
-    filtered_configuration =
-      configuration
-      |> Map.reject(fn {key, _value} -> key not in @configuration2_keys end)
-      |> filter_render(@configuration2_filter, %{})
+    configuration =
+      info[:configuration]
+      |> filter_render(@configuration2_filter, :inclusive, %{})
 
     expected = %{
       accounts: %{
@@ -279,7 +275,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       }
     }
 
-    Map.equal?(expected, filtered_configuration)
+    Map.equal?(expected, configuration)
   end
 
   defp check_registrations(info) do
@@ -296,18 +292,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   end
 
   defp check_pleroma_configuration(info) do
-    configuration = info[:pleroma]
-
-    filtered_configuration =
-      Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
-
-    # Tested elsewhere already
-    metadata = Map.fetch!(filtered_configuration, :metadata)
-
-    filtered_metadata =
-      Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
-
-    filtered_configuration = %{filtered_configuration | metadata: filtered_metadata}
+    configuration =
+      info[:pleroma]
+      |> filter_render([{:metadata, [:features, :federation]}], :discriminative, %{})
 
     expected = %{
       metadata: %{
@@ -339,24 +326,13 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
     }
 
-    Map.equal?(expected, filtered_configuration)
+    Map.equal?(expected, configuration)
   end
 
   defp check_pleroma_configuration2(info) do
-    configuration = info[:pleroma]
-
-    filtered_configuration =
-      Map.reject(configuration, fn {key, _value} -> key not in @pleroma_configuration_keys end)
-
-    # Tested elsewhere already
-    metadata = Map.fetch!(filtered_configuration, :metadata)
-
-    filtered_metadata =
-      Map.reject(metadata, fn {key, _value} -> key in [:features, :federation] end)
-
-    filtered_configuration =
-      %{filtered_configuration | metadata: filtered_metadata}
-      |> filter_render(@pleroma_configuration2_filter, %{})
+    configuration =
+      info[:pleroma]
+      |> filter_render(@pleroma_configuration2_filter, :inclusive, %{})
 
     expected = %{
       metadata: %{
@@ -370,7 +346,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       }
     }
 
-    Map.equal?(expected, filtered_configuration)
+    Map.equal?(expected, configuration)
   end
 
   # When this fails, a new feature flag was probably added. Add it to the macros above.

From ef321846d4bc4860789ce24edeeeda6384fede67 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 27 Jun 2026 22:44:59 +0200
Subject: [PATCH 088/163] InstanceView: Use attribute for pleroma_configuration
 filter in test

---
 test/pleroma/web/mastodon_api/views/instance_view_test.exs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 7bdd9a126..f7d058365 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -36,6 +36,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     {:timelines_access, [:live_feeds, :hashtag_feeds, :trending_link_feeds]}
   ]
 
+  @pleroma_configuration_filter [{:metadata, [:features, :federation]}]
+
   @pleroma_configuration2_filter [
     {:metadata,
      [
@@ -294,7 +296,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
   defp check_pleroma_configuration(info) do
     configuration =
       info[:pleroma]
-      |> filter_render([{:metadata, [:features, :federation]}], :discriminative, %{})
+      |> filter_render(@pleroma_configuration_filter, :discriminative, %{})
 
     expected = %{
       metadata: %{

From 6e03f1d7898b8b9cc5ccfe40d81954ef91d24f5c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 27 Jun 2026 23:34:01 +0200
Subject: [PATCH 089/163] InstanceView: Tighten show.json render test, rename
 show2-only funcs

---
 .../mastodon_api/views/instance_view_test.exs | 53 ++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index f7d058365..b0ef4b659 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -79,6 +79,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
                  :pleroma
                ]
 
+  # Checked in other check_* functions
+  @show_filter @common_information_keys ++ [:contact_account, :configuration, :pleroma]
+
   @show2_keys @common_information_keys ++
                 [
                   :domain,
@@ -188,7 +191,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, filtered_info)
   end
 
-  defp check_thumbnail(info) do
+  defp check_thumbnail2(info) do
     thumbnail = info[:thumbnail]
 
     expected = %{
@@ -209,7 +212,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, contact)
   end
 
-  defp check_contact_name(info, user) do
+  defp check_contact_account(info, user) do
     contact = info[:contact_account]
     view = Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user, for: nil})
 
@@ -280,7 +283,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, configuration)
   end
 
-  defp check_registrations(info) do
+  defp check_registrations2(info) do
     registrations = info[:registrations]
 
     expected = %{
@@ -351,6 +354,43 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, configuration)
   end
 
+  defp check_show(info) do
+    filter = @show_filter
+    filtered_info = Map.reject(info, fn {key, _value} -> key in filter end)
+
+    expected = %{
+      uri: Pleroma.Web.WebFinger.host(),
+      description: "Pleroma: An efficient and flexible fediverse server",
+      short_description: "Corndog Emporium!",
+      email: "nonexist@example.com",
+      urls: %{
+        streaming_api: Pleroma.Web.Endpoint.websocket_url(),
+      },
+      stats: Pleroma.Stats.get_stats(),
+      thumbnail: "https://example.com/thumbnail.png",
+      registrations: false,
+      approval_required: true,
+      max_toot_chars: 4096,
+      max_media_attachments: 1,
+      poll_limits: %{
+        max_options: 4,
+        max_option_chars: 120,
+        min_expiration: 1,
+        max_expiration: 2
+      },
+      upload_limit: 1024,
+      avatar_upload_limit: 1024,
+      background_upload_limit: 1024,
+      banner_upload_limit: 1024,
+      background_image: Pleroma.Web.Endpoint.url() <> "/media/background.png",
+      shout_limit: 120,
+      description_limit: 120,
+      chat_limit: 120,
+    }
+
+    Map.equal?(expected, filtered_info)
+  end
+
   # When this fails, a new feature flag was probably added. Add it to the macros above.
   describe "uncofigurable features" do
     setup do: Enum.each(@configurable_features_flags, &clear_config(&1, false))
@@ -545,7 +585,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       expected_keys = Enum.sort(@show_keys)
 
       assert check_common_information(output)
-      assert check_contact_name(output, user)
+      assert check_show(output)
+      assert check_contact_account(output, user)
       assert check_configuration(output)
       assert check_pleroma_configuration(output)
       assert expected_keys == Enum.sort(Map.keys(output))
@@ -556,9 +597,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       expected_keys = Enum.sort(@show2_keys)
 
       assert check_common_information(output)
-      assert check_thumbnail(output)
+      assert check_thumbnail2(output)
       assert check_configuration2(output)
-      assert check_registrations(output)
+      assert check_registrations2(output)
       assert check_contact(output, user)
       assert check_pleroma_configuration2(output)
       assert expected_keys == Enum.sort(Map.keys(output))

From d19a9f768c996c845222805d6d6dd9b648580d95 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 27 Jun 2026 23:39:48 +0200
Subject: [PATCH 090/163] InstanceView: Tighten show2.json

---
 .../mastodon_api/views/instance_view_test.exs   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index b0ef4b659..3f7c83968 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -96,6 +96,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
                   :pleroma
                 ]
 
+  @show2_filter @common_information_keys ++ [:thumbnail, :configuration, :registrations, :contact, :pleroma]
+
   @features [
     "pleroma_api",
     "mastodon_api",
@@ -391,6 +393,20 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     Map.equal?(expected, filtered_info)
   end
 
+  defp check_show2(info) do
+    filter = @show2_filter
+    filtered_info = Map.reject(info, fn {key, _value} -> key in filter end)
+
+    expected = %{
+      domain: Pleroma.Web.WebFinger.host(),
+      source_url: Pleroma.Application.repository(),
+      description: "Corndog Emporium!",
+      usage: %{users: %{active_month: Pleroma.User.active_user_count()}}
+    }
+
+    Map.equal?(expected, filtered_info)
+  end
+
   # When this fails, a new feature flag was probably added. Add it to the macros above.
   describe "uncofigurable features" do
     setup do: Enum.each(@configurable_features_flags, &clear_config(&1, false))
@@ -597,6 +613,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       expected_keys = Enum.sort(@show2_keys)
 
       assert check_common_information(output)
+      assert check_show2(output)
       assert check_thumbnail2(output)
       assert check_configuration2(output)
       assert check_registrations2(output)

From 3027052b0dbc042af45135b041754b05ffe4893d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 28 Jun 2026 00:17:28 +0200
Subject: [PATCH 091/163] InstanceView: Remove wall of changed configs in show
 render tests.

Switched to using config defaults instead.
---
 .../mastodon_api/views/instance_view_test.exs | 180 +++++++-----------
 1 file changed, 70 insertions(+), 110 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 3f7c83968..6acfbab99 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -182,9 +182,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     filtered_info = Map.reject(info, fn {key, _value} -> key not in @common_information_keys end)
 
     expected = %{
-      languages: ["en", "cs"],
+      languages: ["en"],
       rules: InstanceView.render("rules.json", %{}),
-      title: "test title",
+      title: "Pleroma",
       version:
         InstanceView.mastodon_api_level() <>
           " (compatible; #{Pleroma.Application.named_version()})"
@@ -197,7 +197,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     thumbnail = info[:thumbnail]
 
     expected = %{
-      url: URI.merge(Pleroma.Web.Endpoint.url(), "https://example.com/thumbnail.png") |> to_string
+      url: URI.merge(Pleroma.Web.Endpoint.url(), "http://localhost:4001/instance/thumbnail.jpeg") |> to_string
     }
 
     expected == thumbnail
@@ -207,7 +207,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     contact = info[:contact]
 
     expected = %{
-      email: "nonexist@example.com",
+      email: "admin@example.com",
       account: Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user, for: nil})
     }
 
@@ -229,19 +229,19 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
         max_featured_tags: 0
       },
       statuses: %{
-        max_characters: 4096,
-        max_media_attachments: 1
+        max_characters: 5_000,
+        max_media_attachments: 1_000
       },
       media_attachments: %{
-        image_size_limit: 1024,
-        video_size_limit: 1024,
+        image_size_limit: 16_000_000,
+        video_size_limit: 16_000_000,
         supported_mime_types: ["application/octet-stream"]
       },
       polls: %{
-        max_options: 4,
-        max_characters_per_option: 120,
-        min_expiration: 1,
-        max_expiration: 2
+        max_options: 20,
+        max_characters_per_option: 200,
+        min_expiration: 0,
+        max_expiration: 365 * 24 * 60 * 60
       }
     }
 
@@ -256,24 +256,24 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     expected = %{
       accounts: %{
         max_pinned_statuses: 1,
-        max_profile_fields: 1,
-        profile_field_name_limit: 1,
-        profile_field_value_limit: 1
+        max_profile_fields: 10,
+        profile_field_name_limit: 512,
+        profile_field_value_limit: 2048
       },
       statuses: %{
         characters_reserved_per_url: 0
       },
       urls: %{
         streaming: Pleroma.Web.Endpoint.websocket_url(),
-        status: "https://status.example.com"
+        status: nil
       },
       vapid: %{
         public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
       },
       translation: %{enabled: true},
       timelines_access: %{
-        live_feeds: %{local: "authenticated", remote: "authenticated"},
-        hashtag_feeds: %{local: "authenticated", remote: "authenticated"},
+        live_feeds: %{local: "public", remote: "public"},
+        hashtag_feeds: %{local: "public", remote: "public"},
         # not implemented in Pleroma
         trending_link_feeds: %{
           local: "disabled",
@@ -289,8 +289,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     registrations = info[:registrations]
 
     expected = %{
-      enabled: false,
-      approval_required: true,
+      enabled: true,
+      approval_required: false,
       message: nil,
       url: nil
     }
@@ -305,28 +305,31 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
     expected = %{
       metadata: %{
-        account_activation_required: true,
+        account_activation_required: false,
         fields_limits: %{
-          max_fields: 1,
-          max_remote_fields: 1,
-          name_length: 1,
-          value_length: 1
+          max_fields: 10,
+          max_remote_fields: 20,
+          name_length: 512,
+          value_length: 2048
         },
-        post_formats: ["text/plain"],
-        birthday_required: true,
-        birthday_min_age: 1,
+        post_formats: [
+              "text/plain",
+              "text/html",
+              "text/markdown",
+              "text/bbcode",
+              "text/x.misskeymarkdown"
+        ],
+        birthday_required: false,
+        birthday_min_age: 0,
         translation: %{
           source_languages: ["en", "pl"],
           target_languages: ["en", "pl"]
         },
-        base_urls: %{
-          media_proxy: "https://mediaproxy.example.com",
-          upload: "https://upload.example.com"
-        },
+        base_urls: %{},
         markup: %{
           allow_inline_images: true,
-          allow_headings: true,
-          allow_tables: true
+          allow_headings: false,
+          allow_tables: false
         }
       },
       stats: %{mau: Pleroma.User.active_user_count()},
@@ -343,13 +346,13 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
     expected = %{
       metadata: %{
-        avatar_upload_limit: 1024,
-        background_upload_limit: 1024,
-        banner_upload_limit: 1024,
-        background_image: Pleroma.Web.Endpoint.url() <> "/media/background.png",
-        chat_limit: 120,
-        description_limit: 120,
-        shout_limit: 120
+        avatar_upload_limit: 2_000_000,
+        background_upload_limit: 4_000_000,
+        banner_upload_limit: 4_000_000,
+        background_image: Pleroma.Web.Endpoint.url() <> "/images/city.jpg",
+        chat_limit: 5_000,
+        description_limit: 5_000,
+        shout_limit: 5_000
       }
     }
 
@@ -363,31 +366,31 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     expected = %{
       uri: Pleroma.Web.WebFinger.host(),
       description: "Pleroma: An efficient and flexible fediverse server",
-      short_description: "Corndog Emporium!",
-      email: "nonexist@example.com",
+      short_description: "",
+      email: "admin@example.com",
       urls: %{
         streaming_api: Pleroma.Web.Endpoint.websocket_url(),
       },
       stats: Pleroma.Stats.get_stats(),
-      thumbnail: "https://example.com/thumbnail.png",
-      registrations: false,
-      approval_required: true,
-      max_toot_chars: 4096,
-      max_media_attachments: 1,
+      thumbnail: "http://localhost:4001/instance/thumbnail.jpeg",
+      registrations: true,
+      approval_required: false,
+      max_toot_chars: 5_000,
+      max_media_attachments: 1_000,
       poll_limits: %{
-        max_options: 4,
-        max_option_chars: 120,
-        min_expiration: 1,
-        max_expiration: 2
+        max_options: 20,
+        max_option_chars: 200,
+        min_expiration: 0,
+        max_expiration: 365 * 24 * 60 * 60
       },
-      upload_limit: 1024,
-      avatar_upload_limit: 1024,
-      background_upload_limit: 1024,
-      banner_upload_limit: 1024,
-      background_image: Pleroma.Web.Endpoint.url() <> "/media/background.png",
-      shout_limit: 120,
-      description_limit: 120,
-      chat_limit: 120,
+      upload_limit: 16_000_000,
+      avatar_upload_limit: 2_000_000,
+      background_upload_limit: 4_000_000,
+      banner_upload_limit: 4_000_000,
+      background_image: Pleroma.Web.Endpoint.url() <> "/images/city.jpg",
+      shout_limit: 5_000,
+      description_limit: 5_000,
+      chat_limit: 5_000,
     }
 
     Map.equal?(expected, filtered_info)
@@ -400,7 +403,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     expected = %{
       domain: Pleroma.Web.WebFinger.host(),
       source_url: Pleroma.Application.repository(),
-      description: "Corndog Emporium!",
+      description: "",
       usage: %{users: %{active_month: Pleroma.User.active_user_count()}}
     }
 
@@ -541,57 +544,14 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
 
       user = insert(:user)
 
-      # Wall of configs for testing whether they are rendered properly
+      # contact in show2.json
+      clear_config([:instance, :contact_username], user.nickname)
+
+      # Pleroma.Language.Translation.configured?() -> true
       clear_config([Pleroma.Language.Translation, :provider], TranslationMock)
 
-      clear_config([:instance, :languages], ["en", "cs"])
-      clear_config([:instance, :name], "test title")
-      clear_config([:instance, :contact_username], user.nickname)
-      clear_config([:instance, :limit], 4096)
-      clear_config([:instance, :max_media_attachments], 1)
-      clear_config([:instance, :upload_limit], 1024)
-      clear_config([:instance, :poll_limits, :max_options], 4)
-      clear_config([:instance, :poll_limits, :max_option_chars], 120)
-      clear_config([:instance, :poll_limits, :min_expiration], 1)
-      clear_config([:instance, :poll_limits, :max_expiration], 2)
-      clear_config([:instance, :account_activation_required], true)
-      clear_config([:instance, :max_account_fields], 1)
-      clear_config([:instance, :max_remote_account_fields], 1)
-      clear_config([:instance, :account_field_name_length], 1)
-      clear_config([:instance, :account_field_value_length], 1)
-      clear_config([:instance, :allowed_post_formats], ["text/plain"])
-      clear_config([:instance, :birthday_required], true)
-      clear_config([:instance, :birthday_min_age], 1)
-
-      clear_config([:instance, :short_description], "Corndog Emporium!")
-      clear_config([:instance, :instance_thumbnail], "https://example.com/thumbnail.png")
-      clear_config([:instance, :registrations_open], false)
-      clear_config([:instance, :account_approval_required], true)
-
-      clear_config([:instance, :max_pinned_statuses], 1)
-      clear_config([:instance, :status_page], "https://status.example.com")
-
-      clear_config([:instance, :email], "nonexist@example.com")
-
-      clear_config([:instance, :avatar_upload_limit], 1024)
-      clear_config([:instance, :background_upload_limit], 1024)
-      clear_config([:instance, :banner_upload_limit], 1024)
-      clear_config([:instance, :background_image], "/media/background.png")
-      clear_config([:instance, :chat_limit], 120)
-      clear_config([:instance, :description_limit], 120)
-
-      clear_config([:media_proxy, :enabled], true)
-      clear_config([:media_proxy, :base_url], "https://mediaproxy.example.com")
-
-      clear_config([Pleroma.Upload, :base_url], "https://upload.example.com")
-
-      clear_config([:markup, :allow_inline_images], true)
-      clear_config([:markup, :allow_headings], true)
-      clear_config([:markup, :allow_tables], true)
-
-      clear_config([:restrict_unauthenticated, :timelines], %{local: true, federated: true})
-
-      clear_config([:shout, :limit], 120)
+      # Deprecated, but still used in view
+      clear_config([:instance, :chat_limit], 5_000)
 
       %{user: user}
     end

From dd070883778107e2dba73821ceb66aeefb3d6a82 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 28 Jun 2026 00:19:38 +0200
Subject: [PATCH 092/163] InstanceView: lint tests

---
 .../mastodon_api/views/instance_view_test.exs | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 6acfbab99..8f066a6f5 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -96,7 +96,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
                   :pleroma
                 ]
 
-  @show2_filter @common_information_keys ++ [:thumbnail, :configuration, :registrations, :contact, :pleroma]
+  @show2_filter @common_information_keys ++
+                  [:thumbnail, :configuration, :registrations, :contact, :pleroma]
 
   @features [
     "pleroma_api",
@@ -197,7 +198,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     thumbnail = info[:thumbnail]
 
     expected = %{
-      url: URI.merge(Pleroma.Web.Endpoint.url(), "http://localhost:4001/instance/thumbnail.jpeg") |> to_string
+      url:
+        URI.merge(Pleroma.Web.Endpoint.url(), "http://localhost:4001/instance/thumbnail.jpeg")
+        |> to_string
     }
 
     expected == thumbnail
@@ -313,11 +316,11 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
           value_length: 2048
         },
         post_formats: [
-              "text/plain",
-              "text/html",
-              "text/markdown",
-              "text/bbcode",
-              "text/x.misskeymarkdown"
+          "text/plain",
+          "text/html",
+          "text/markdown",
+          "text/bbcode",
+          "text/x.misskeymarkdown"
         ],
         birthday_required: false,
         birthday_min_age: 0,
@@ -369,7 +372,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       short_description: "",
       email: "admin@example.com",
       urls: %{
-        streaming_api: Pleroma.Web.Endpoint.websocket_url(),
+        streaming_api: Pleroma.Web.Endpoint.websocket_url()
       },
       stats: Pleroma.Stats.get_stats(),
       thumbnail: "http://localhost:4001/instance/thumbnail.jpeg",
@@ -390,7 +393,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
       background_image: Pleroma.Web.Endpoint.url() <> "/images/city.jpg",
       shout_limit: 5_000,
       description_limit: 5_000,
-      chat_limit: 5_000,
+      chat_limit: 5_000
     }
 
     Map.equal?(expected, filtered_info)

From 964feb1e470ba666b70c9acd3d329043a849e030 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 28 Jun 2026 00:36:43 +0200
Subject: [PATCH 093/163] InstanceView: Remove unreachable guards in
 filter_render

---
 .../mastodon_api/views/instance_view_test.exs | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 8f066a6f5..66485be0e 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -157,26 +157,19 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     do: Map.merge(input_rest, acc)
 
   defp filter_render(input, filter, type, acc) do
-    {current_filter, filter_rest} = List.pop_at(filter, 0)
+    {{filter_key, filters}, filter_rest} = List.pop_at(filter, 0)
+    {config_key_values, input_rest} = Map.pop!(input, filter_key)
 
-    case current_filter do
-      nil ->
-        filter_render(input, filter_rest, type, acc)
+    filtered =
+      case type do
+        :inclusive ->
+          Map.reject(config_key_values, fn {key, _} -> key not in filters end)
 
-      {filter_key, filters} ->
-        {config_key_values, input_rest} = Map.pop!(input, filter_key)
+        :discriminative ->
+          Map.reject(config_key_values, fn {key, _} -> key in filters end)
+      end
 
-        filtered =
-          case type do
-            :inclusive ->
-              Map.reject(config_key_values, fn {key, _} -> key not in filters end)
-
-            :discriminative ->
-              Map.reject(config_key_values, fn {key, _} -> key in filters end)
-          end
-
-        filter_render(input_rest, filter_rest, type, Map.put(acc, filter_key, filtered))
-    end
+    filter_render(input_rest, filter_rest, type, Map.put(acc, filter_key, filtered))
   end
 
   defp check_common_information(info) do

From a020b8a1901720238e8749d8487ddb218b82472b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 29 Jun 2026 23:47:43 +0200
Subject: [PATCH 094/163] Elixir 1.19: Ensure default primary logger configg
 level is debug

Setting the default handler and ex_syslogger handler levels does not
necessarily have to set the primary logger log level, at least in the
future. Without this, the primary log level might be lower than the
configured console/syslog levels, which would cause some desired logs to
not be logged.
---
 config/config.exs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/config.exs b/config/config.exs
index 37a2590ca..80183a3d9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -133,12 +133,17 @@ config :pleroma, Pleroma.Web.Endpoint,
   ]
 
 # Configures Elixir's Logger
+# Primary config
+config :logger, level: :debug
+
+# Console config
 config :logger, :default_handler, level: :debug
 
 config :logger, :default_formatter,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:actor, :path, :type, :user]
 
+# Syslog config
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "pleroma",

From 7d9175350d0f2ce715048ac1795ec4790d192c3b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 30 Jun 2026 00:24:48 +0200
Subject: [PATCH 095/163] Elixir 1.19: Completely overwrite formatter for
 default handler

:logger.update_handler_config/3 can merge configs,
:logger.set_handler_config/3 instead resets the rest to defaults.
---
 lib/pleroma/config/deprecation_warnings.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index e77785483..8f8786ee7 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -435,7 +435,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
       """)
 
       if log_level, do: :logger.update_handler_config(:default, :level, log_level)
-      :logger.update_handler_config(:default, :formatter, formatter)
+      :logger.set_handler_config(:default, :formatter, formatter)
     end
   end
 

From f4b415c54e475f891cffe9363d4e19d58a062ad3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 22 May 2026 12:12:11 -0700
Subject: [PATCH 096/163] Improve RSS compliance

The core feed reader issue was that RSS 2.0 <link> is a simple text
element and can only appear once per <item>.
By having multiple <link> tags with rel attributes, parsers were
getting confused and resolving entries to the wrong URL.
Now each item has exactly one <link>: the post URL. Everything else
uses valid <atom:link> or dedicated extension elements where
appropriate.
---
 changelog.d/rss.fix                           |   1 +
 lib/pleroma/web/feed/feed_view.ex             | 151 +++++++++++++++++-
 .../templates/feed/feed/_activity.atom.eex    |  24 +--
 .../web/templates/feed/feed/_activity.rss.eex |  35 ++--
 .../feed/feed/_tag_activity.atom.eex          |  32 ++--
 .../templates/feed/feed/_tag_activity.xml.eex |  22 ++-
 .../web/templates/feed/feed/tag.atom.eex      |   6 +-
 .../web/templates/feed/feed/tag.rss.eex       |   5 +
 .../web/templates/feed/feed/user.atom.eex     |   6 +-
 .../web/templates/feed/feed/user.rss.eex      |  12 +-
 test/pleroma/web/feed/tag_controller_test.exs |   2 +-
 11 files changed, 212 insertions(+), 84 deletions(-)
 create mode 100644 changelog.d/rss.fix

diff --git a/changelog.d/rss.fix b/changelog.d/rss.fix
new file mode 100644
index 000000000..a3455698a
--- /dev/null
+++ b/changelog.d/rss.fix
@@ -0,0 +1 @@
+Fix RSS feeds to be W3C compliant and render better in RSS readers
diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index e1ee33d62..a433b8403 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -97,6 +97,64 @@ defmodule Pleroma.Web.Feed.FeedView do
     end
   end
 
+  def rss_content_encoded(data) do
+    data
+    |> feed_content_encoded()
+    |> String.replace("]]>", "]]&gt;")
+  end
+
+  def atom_content_encoded(data), do: feed_content_encoded(data)
+
+  defp feed_content_encoded(data) do
+    base_content =
+      case activity_content(data) do
+        "" ->
+          data["summary"] || data["type"] ||
+            ""
+            |> escape()
+
+        content ->
+          content
+      end
+
+    attachments_html =
+      (data["attachment"] || [])
+      |> Enum.map(&rss_attachment_preview/1)
+      |> Enum.reject(&(&1 == ""))
+      |> Enum.join("<br/><br/>")
+
+    [base_content, attachments_html]
+    |> Enum.reject(&(&1 == ""))
+    |> Enum.join("<br/><br/>")
+  end
+
+  defp rss_attachment_preview(attachment) do
+    href = attachment_href(attachment)
+
+    if is_binary(href) and href != "" do
+      media_type = attachment_type(attachment) || "application/octet-stream"
+      escaped_href = escape(href)
+      name = attachment["name"] || "Attachment"
+      escaped_name = escape(name)
+
+      cond do
+        String.starts_with?(media_type, "image/") ->
+          ~s(<p><img src="#{escaped_href}" alt="#{escaped_name}" loading="lazy"/></p>)
+
+        String.starts_with?(media_type, "video/") ->
+          ~s(<p><video controls preload="metadata" src="#{escaped_href}"></video></p><p><a href="#{escaped_href}">#{escaped_name}</a></p>)
+
+        String.starts_with?(media_type, "audio/") ->
+          ~s(<p><audio controls preload="metadata" src="#{escaped_href}"></audio></p><p><a href="#{escaped_href}">#{escaped_name}</a></p>)
+
+        true ->
+          ~s(<p><a href="#{escaped_href}">#{escaped_name}</a></p>)
+      end
+    else
+      ""
+    end
+  end
+
   def activity_content(%{"content" => content}) do
     content
     |> String.replace(~r/[\n\r]/, "")
@@ -106,16 +164,99 @@ defmodule Pleroma.Web.Feed.FeedView do
 
   def activity_context(activity), do: escape(activity.data["context"])
 
+  def feed_self_url(conn), do: Phoenix.Controller.current_url(conn)
+
+  def activity_link(activity, data) do
+    cond do
+      activity.local -> data["id"] || data["url"]
+      true -> data["external_url"] || data["id"] || data["url"]
+    end
+  end
+
   def attachment_href(attachment) do
-    attachment["url"]
-    |> hd()
+    attachment
+    |> attachment_url_data()
     |> Map.get("href")
   end
 
   def attachment_type(attachment) do
-    attachment["url"]
-    |> hd()
-    |> Map.get("mediaType")
+    attachment
+    |> attachment_url_data()
+    |> Map.get("mediaType") || attachment["mediaType"]
+  end
+
+  def attachment_size(attachment) do
+    attachment
+    |> attachment_url_data()
+    |> Map.get("size", 0)
+  end
+
+  def attachment_size_positive(attachment) do
+    case attachment_size(attachment) do
+      size when is_integer(size) and size > 0 ->
+        size
+
+      size when is_binary(size) ->
+        case Integer.parse(size) do
+          {parsed, ""} when parsed > 0 -> parsed
+          _ -> nil
+        end
+
+      _ ->
+        nil
+    end
+  end
+
+  def attachment_medium(attachment) do
+    case attachment_type(attachment) do
+      "image/" <> _rest -> "image"
+      "video/" <> _rest -> "video"
+      "audio/" <> _rest -> "audio"
+      _ -> "document"
+    end
+  end
+
+  def attachment_previewable?(attachment) do
+    attachment_medium(attachment) in ["image", "video", "audio"]
+  end
+
+  def attachment_description(attachment) do
+    attachment["name"] || ""
+  end
+
+  def media_content_xml(attachment) do
+    href = escape(attachment_href(attachment) || "")
+    type = escape(attachment_type(attachment) || "application/octet-stream")
+    medium = escape(attachment_medium(attachment))
+
+    file_size_attr =
+      case attachment_size_positive(attachment) do
+        size when is_integer(size) -> ~s( fileSize="#{size}")
+        _ -> ""
+      end
+
+    description_xml =
+      case attachment_description(attachment) do
+        "" ->
+          ""
+
+        description ->
+          ~s(\n  <media:description type="plain">#{escape(description)}</media:description>)
+      end
+
+    """
+    <media:content url="#{href}" type="#{type}"#{file_size_attr} medium="#{medium}">
+      <media:rating scheme="urn:simple">nonadult</media:rating>#{description_xml}
+    </media:content>
+    """
+  end
+
+  defp attachment_url_data(attachment) do
+    case attachment["url"] do
+      [first | _] when is_map(first) -> first
+      %{} = map -> map
+      _ -> %{}
+    end
   end
 
   def get_href(id) do
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index b774f7984..f87d97cb4 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -3,7 +3,7 @@
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
   <id><%= @data["id"] %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
-  <content type="html"><%= activity_description(@data) %></content>
+  <content type="html"><%= escape(atom_content_encoded(@data)) %></content>
   <published><%= to_rfc3339(@data["published"]) %></published>
   <updated><%= to_rfc3339(@data["published"]) %></updated>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
@@ -15,35 +15,23 @@
     <summary><%= escape(@data["summary"]) %></summary>
   <% end %>
 
-  <%= if @activity.local do %>
-    <link type="application/atom+xml" href='<%= @data["id"] %>' rel="self"/>
-    <link type="text/html" href='<%= @data["id"] %>' rel="alternate"/>
-  <% else %>
-    <link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
-  <% end %>
+  <link type="application/atom+xml" href='<%= activity_link(@activity, @data) %>' rel="self"/>
+  <link type="text/html" href='<%= activity_link(@activity, @data) %>' rel="alternate"/>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
     <category term="<%= tag %>"></category>
   <% end %>
 
   <%= for attachment <- @data["attachment"] || [] do %>
-    <link rel="enclosure" href="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>"/>
+    <%= unless attachment_previewable?(attachment) do %>
+      <link rel="enclosure" href="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= attachment_size(attachment) %>"/>
+    <% end %>
   <% end %>
 
   <%= if @data["inReplyTo"] do %>
     <thr:in-reply-to ref='<%= @data["inReplyTo"] %>' href='<%= get_href(@data["inReplyTo"]) %>'/>
   <% end %>
 
-  <%= for id <- @activity.recipients do %>
-    <%= if id == Pleroma.Constants.as_public() do %>
-      <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
-    <% else %>
-      <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
-        <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="<%= id %>"/>
-      <% end %>
-    <% end %>
-  <% end %>
-
   <%= for {emoji, file} <- @data["emoji"] || %{} do %>
     <link name="<%= emoji %>" rel="emoji" href="<%= file %>"/>
   <% end %>
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index 7de98f736..a8c2aa342 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -1,45 +1,32 @@
 <item>
   <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-  <guid><%= @data["id"] %></guid>
+  <guid isPermaLink="true"><%= @data["id"] %></guid>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <description><%= activity_description(@data) %></description>
+  <content:encoded><![CDATA[<%= rss_content_encoded(@data) %>]]></content:encoded>
   <pubDate><%= to_rfc2822(@data["published"]) %></pubDate>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
     <%= activity_context(@activity) %>
   </ostatus:conversation>
 
-  <%= if @activity.local do %>
-    <link><%= @data["id"] %></link>
-  <% else %>
-    <link><%= @data["external_url"] %></link>
-  <% end %>
-
-  <link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
+  <link><%= activity_link(@activity, @data) %></link>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
-    <category term="<%= tag %>"></category>
+    <%= if tag && tag != "" do %>
+      <category><%= tag %></category>
+    <% end %>
   <% end %>
 
   <%= for attachment <- @data["attachment"] || [] do %>
-    <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" />
+    <%= size = attachment_size_positive(attachment) %>
+    <%= unless attachment_previewable?(attachment) do %>
+      <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>" />
+    <% end %>
+    <%= media_content_xml(attachment) %>
   <% end %>
 
   <%= if @data["inReplyTo"] do %>
     <thr:in-reply-to ref='<%= @data["inReplyTo"] %>' href='<%= get_href(@data["inReplyTo"]) %>'/>
   <% end %>
-
-  <%= for id <- @activity.recipients do %>
-    <%= if id == Pleroma.Constants.as_public() do %>
-      <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection">http://activityschema.org/collection/public</link>
-    <% else %>
-      <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
-        <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person"><%= id %></link>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <%= for {emoji, file} <- @data["emoji"] || %{} do %>
-    <link name="<%= emoji %>" rel="emoji"><%= file %></link>
-  <% end %>
 </item>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 03c222975..ae762f9ed 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -6,7 +6,7 @@
 
   <id><%= @data["id"] %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
-  <content type="html"><%= activity_description(@data) %></content>
+  <content type="html"><%= escape(atom_content_encoded(@data)) %></content>
   <published><%= to_rfc3339(@data["published"]) %></published>
   <updated><%= to_rfc3339(@data["published"]) %></updated>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
@@ -15,34 +15,22 @@
   <link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/>
 
   <%= if @data["summary"] != "" do %>
-    <summary><%= @data["summary"] %></summary>
+    <summary><%= escape(@data["summary"]) %></summary>
   <% end %>
 
-  <%= if @activity.local do %>
-    <link type="application/atom+xml" href='<%= @data["id"] %>' rel="self"/>
-    <link type="text/html" href='<%= @data["id"] %>' rel="alternate"/>
-  <% else %>
-    <link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
-  <% end %>
-
-  <%= for id <- @activity.recipients do %>
-    <%= if id == Pleroma.Constants.as_public() do %>
-      <link rel="mentioned"
-            ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"
-            href="http://activityschema.org/collection/public"/>
-    <% else %>
-      <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
-        <link rel="mentioned"
-              ostatus:object-type="http://activitystrea.ms/schema/1.0/person"
-              href="<%= id %>" />
-      <% end %>
-    <% end %>
-  <% end %>
+  <link type="application/atom+xml" href='<%= activity_link(@activity, @data) %>' rel="self"/>
+  <link type="text/html" href='<%= activity_link(@activity, @data) %>' rel="alternate"/>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
     <category term="<%= tag %>"></category>
   <% end %>
 
+  <%= for attachment <- @data["attachment"] || [] do %>
+    <%= unless attachment_previewable?(attachment) do %>
+      <link rel="enclosure" href="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= attachment_size(attachment) %>"/>
+    <% end %>
+  <% end %>
+
   <%= for {emoji, file} <- @data["emoji"] || %{} do %>
     <link name="<%= emoji %>" rel="emoji" href="<%= file %>"/>
   <% end %>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index 1b8c34b87..6ae3c5a55 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@ -1,14 +1,22 @@
 <item>
-  <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
-
-
-  <guid isPermalink="true"><%= activity_context(@activity) %></guid>
-  <link><%= activity_context(@activity) %></link>
+  <guid isPermalink="true"><%= activity_link(@activity, @data) %></guid>
+  <link><%= activity_link(@activity, @data) %></link>
   <pubDate><%= to_rfc2822(@data["published"]) %></pubDate>
-
+  <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <description><%= activity_description(@data) %></description>
+  <content:encoded><![CDATA[<%= rss_content_encoded(@data) %>]]></content:encoded>
+
   <%= for attachment <- @data["attachment"] || [] do %>
-    <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>"/>
+    <%= size = attachment_size_positive(attachment) %>
+    <%= unless attachment_previewable?(attachment) do %>
+      <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>"/>
+    <% end %>
+    <%= media_content_xml(attachment) %>
   <% end %>
 
+  <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+    <%= if tag && tag != "" do %>
+      <category><%= tag %></category>
+    <% end %>
+  <% end %>
 </item>
diff --git a/lib/pleroma/web/templates/feed/feed/tag.atom.eex b/lib/pleroma/web/templates/feed/feed/tag.atom.eex
index 3449c97ff..1646aeec7 100644
--- a/lib/pleroma/web/templates/feed/feed/tag.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.atom.eex
@@ -9,10 +9,12 @@
 
   <id><%= Routes.tag_feed_url(@conn, :feed, @tag) <> ".atom" %></id>
   <title>#<%= @tag %></title>
-  <subtitle><%= Gettext.dpgettext("static_pages", "tag feed description", "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse.", tag: @tag) %></subtitle>
+  <%= with subtitle when subtitle not in [nil, ""] <- Gettext.dpgettext("static_pages", "tag feed description", "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse.", tag: @tag) do %>
+    <subtitle><%= subtitle %></subtitle>
+  <% end %>
   <logo><%= feed_logo() %></logo>
   <updated><%= most_recent_update(@activities) %></updated>
-  <link rel="self" href="<%= "#{Routes.tag_feed_url(@conn, :feed, @tag)}.atom"  %>" type="application/atom+xml"/>
+  <link rel="self" href="<%= feed_self_url(@conn) %>" type="application/atom+xml"/>
 
   <%= for activity <- @activities do %>
   <%= render Phoenix.Controller.view_module(@conn), "_tag_activity.atom", Map.merge(assigns, prepare_activity(activity, actor: true)) %>
diff --git a/lib/pleroma/web/templates/feed/feed/tag.rss.eex b/lib/pleroma/web/templates/feed/feed/tag.rss.eex
index a87f9bf50..618b89ba3 100644
--- a/lib/pleroma/web/templates/feed/feed/tag.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.rss.eex
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0"
      xmlns:webfeeds="http://webfeeds.org/rss/1.0"
+     xmlns:content="http://purl.org/rss/1.0/modules/content/"
+     xmlns:media="http://search.yahoo.com/mrss/"
      xmlns:thr="http://purl.org/syndication/thread/1.0">
   <channel>
 
@@ -8,7 +10,10 @@
     <description><%= Gettext.dpgettext("static_pages", "tag feed description", "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse.", tag: @tag) %></description>
     <link><%= "#{Routes.tag_feed_url(@conn, :feed, @tag)}.rss" %></link>
     <webfeeds:logo><%= feed_logo() %></webfeeds:logo>
+    <webfeeds:icon><%= feed_logo() %></webfeeds:icon>
     <webfeeds:accentColor>2b90d9</webfeeds:accentColor>
+    <lastBuildDate><%= most_recent_update(@activities) || to_rfc2822(NaiveDateTime.utc_now()) %></lastBuildDate>
+    <generator><%= Pleroma.Application.named_version() %></generator>
     <%= for activity <- @activities do %>
     <%= render Phoenix.Controller.view_module(@conn), "_tag_activity.xml", Map.merge(assigns, prepare_activity(activity)) %>
     <% end %>
diff --git a/lib/pleroma/web/templates/feed/feed/user.atom.eex b/lib/pleroma/web/templates/feed/feed/user.atom.eex
index c2c77cfed..cc6883727 100644
--- a/lib/pleroma/web/templates/feed/feed/user.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/user.atom.eex
@@ -8,10 +8,12 @@
 
   <id><%= Routes.user_feed_url(@conn, :feed, @user.nickname) <> ".atom" %></id>
   <title><%= @user.nickname <> "'s timeline" %></title>
-  <subtitle><%= escape(@user.bio) %></subtitle>
+  <%= if @user.bio && @user.bio != "" do %>
+    <subtitle><%= escape(@user.bio) %></subtitle>
+  <% end %>
   <updated><%= most_recent_update(@activities, @user, :atom) %></updated>
   <logo><%= logo(@user) %></logo>
-  <link rel="self" href="<%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.atom" %>" type="application/atom+xml"/>
+  <link rel="self" href="<%= feed_self_url(@conn) %>" type="application/atom+xml"/>
 
   <%= render Phoenix.Controller.view_module(@conn), "_author.atom", assigns %>
 
diff --git a/lib/pleroma/web/templates/feed/feed/user.rss.eex b/lib/pleroma/web/templates/feed/feed/user.rss.eex
index b907a7e57..e2150d8b6 100644
--- a/lib/pleroma/web/templates/feed/feed/user.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/user.rss.eex
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0"
      xmlns:atom="http://www.w3.org/2005/Atom"
+     xmlns:content="http://purl.org/rss/1.0/modules/content/"
+     xmlns:webfeeds="http://webfeeds.org/rss/1.0"
+     xmlns:media="http://search.yahoo.com/mrss/"
      xmlns:thr="http://purl.org/syndication/thread/1.0"
      xmlns:activity="http://activitystrea.ms/spec/1.0/"
      xmlns:ostatus="http://ostatus.org/schema/1.0"
      xmlns:poco="http://portablecontacts.net/spec/1.0">
   <channel>
     <title><%= @user.nickname <> "'s timeline" %></title>
-    <link><%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss" %></link>
-    <atom:link href="<%= Routes.user_feed_url(@conn, :feed, @user.nickname) <> ".atom" %>"
+    <atom:link href="<%= feed_self_url(@conn) %>"
                rel="self" type="application/rss+xml" />
+    <link><%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss" %></link>
     <description><%= escape(@user.bio) %></description>
     <image>
       <url><%= logo(@user) %></url>
       <title><%= @user.nickname <> "'s timeline" %></title>
       <link><%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss" %></link>
     </image>
+    <lastBuildDate><%= most_recent_update(@activities, @user, :rss) %></lastBuildDate>
+    <webfeeds:icon><%= logo(@user) %></webfeeds:icon>
+    <generator><%= Pleroma.Application.named_version() %></generator>
 
     <%= render Phoenix.Controller.view_module(@conn), "_author.rss", assigns %>
 
     <%= if last_activity(@activities) do %>
-      <link rel="next"><%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss?max_id=#{last_activity(@activities).id}" %></link>
+      <atom:link rel="next" href="<%= "#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss?max_id=#{last_activity(@activities).id}" %>" />
     <% end %>
 
     <%= for activity <- @activities do %>
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index 662235f31..7f2f57b07 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -141,7 +141,7 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
              FeedView.to_rfc2822(activity1.data["published"])
            ]
 
-    assert xpath(xml, ~x"//channel/item/enclosure/@url"sl) == [
+    assert xpath(xml, ~x"//channel/item/media:content/@url"sl) == [
              "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4"
            ]
 

From b11e8888d16298bd3ea61e73a21330586833ea49 Mon Sep 17 00:00:00 2001
From: "moon.eth" <moon@shipoclu.com>
Date: Tue, 14 Jul 2026 15:04:06 +0900
Subject: [PATCH 097/163] MediaProxy: improve inline rendering of remote image
 attachments

Two related changes that ensure remote images render inline in timelines
instead of as clickable links.

reverse_proxy: always force inline for whitelisted content types
  When `inline_content_types` is configured as a whitelist, the upstream's
  `content-disposition` header used to be passed through unchanged. Some
  origins send `content-disposition: attachment` for media we want
  embedded, so the proxy now always emits `content-disposition: inline`
  for whitelisted types (overriding the upstream header), deriving a
  filename from `MIME.extensions/1` (e.g. `inline.gif`) so browsers have
  something to use for "Save As". When the type has no known extension,
  the bare token `inline` is emitted. The `inline_content_types: true`
  (pass-through) and `:false` (always attachment) behaviours are
  unchanged.

ActivityPub: sniff MIME type for extensionless/generic attachments
  Some remotes (e.g. extensionless Cloudflare Images URLs) ship
  attachments with no usable `mediaType` (missing, empty, or
  `application/octet-stream`), which would render as links instead of
  inline images. `AttachmentValidator.fix_media_type/1` now fetches the
  first 8 KB of the URL and runs it through libmagic when the declared
  type carries no real information. Only `image/*` results replace the
  declared type; any other result, non-2xx response, transport error, or
  exception yields `nil` and the original type is kept, so ingestion
  never blocks and non-image media is never reclassified. Present real
  types are left untouched (no fetch is attempted).

The new logic lives in `Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer`.

Tests: comprehensive coverage of both changes, including a dedicated
suite for the sniffer covering happy paths, non-image bodies, HTTP
failures, raised exceptions, guard clauses, and verification that the
Range header is sent; AttachmentValidator tests for mimeType fallback,
empty-string mediaType, multi-URL sniffing, and HTTP-failure fallback;
ReverseProxy tests for inline_content_types `true`/`false`/custom
whitelists, bare-inline for types without a MIME extension, and
attachment_name handling.
---
 lib/pleroma/reverse_proxy.ex                  |  26 ++-
 .../attachment_type_sniffer.ex                |  59 +++++
 .../object_validators/attachment_validator.ex |  21 +-
 test/pleroma/reverse_proxy_test.exs           | 176 +++++++++++++-
 .../attachment_type_sniffer_test.exs          | 178 ++++++++++++++
 .../attachment_validator_test.exs             | 221 ++++++++++++++++++
 6 files changed, 670 insertions(+), 11 deletions(-)
 create mode 100644 lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
 create mode 100644 test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs

diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index c7ee47c6e..11f041c57 100644
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -59,7 +59,9 @@ defmodule Pleroma.ReverseProxy do
   * `inline_content_types`:
     * `true` will not alter `content-disposition` (up to the upstream),
     * `false` will add `content-disposition: attachment` to any request,
-    * a list of whitelisted content types
+    * a list of whitelisted content types for which `content-disposition: inline`
+    is always set (overriding any upstream header) so the media can be embedded
+    in pages; the filename is derived from the content type
 
   * `req_headers`, `resp_headers` additional headers.
 
@@ -386,7 +388,27 @@ defmodule Pleroma.ReverseProxy do
 
       List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
     else
-      headers
+      if opt == true do
+        headers
+      else
+        name = inline_filename(content_type)
+
+        disposition =
+          if name do
+            "inline; filename=\"#{name}\""
+          else
+            "inline"
+          end
+
+        List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
+      end
+    end
+  end
+
+  defp inline_filename(content_type) do
+    case MIME.extensions(content_type) do
+      [ext | _] when ext != "" -> "inline.#{ext}"
+      _ -> nil
     end
   end
 
diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
new file mode 100644
index 000000000..19215b627
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
@@ -0,0 +1,59 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer do
+  @moduledoc """
+  Best-effort MIME sniffing for remote attachments whose declared type is
+  unusable (missing or `application/octet-stream`).
+
+  Fetches the first chunk of the URL and runs it through libmagic. Only
+  `image/*` results are returned; anything else, or any failure, yields `nil` —
+  so this never reclassifies non-image media and never blocks ingestion. This
+  exists because some remotes (e.g. extensionless Cloudflare Images URLs) ship
+  attachments with no usable `mediaType`, which would otherwise render in the
+  timeline as a clickable link instead of an inline image.
+  """
+
+  alias Pleroma.HTTP
+
+  require Logger
+
+  # libmagic only needs the file header; a few KB is plenty and keeps the
+  # request cheap even when the origin ignores Range.
+  @sniff_bytes 8 * 1024
+  @timeout 5_000
+
+  @spec sniff_image_type(binary() | nil) :: {:ok, binary() | nil}
+  def sniff_image_type(url) when is_binary(url) and url != "" do
+    do_sniff(url)
+  rescue
+    e ->
+      Logger.debug(
+        "Attachment type sniff failed for #{url}: #{Exception.format(:error, e, __STACKTRACE__)}"
+      )
+
+      {:ok, nil}
+  end
+
+  def sniff_image_type(_), do: {:ok, nil}
+
+  defp do_sniff(url) do
+    headers = [{"range", "bytes=0-#{@sniff_bytes - 1}"}]
+    opts = [pool: :media, timeout: @timeout, recv_timeout: @timeout]
+
+    with {:ok, %Tesla.Env{status: status, body: body}} when status in 200..299 <-
+           HTTP.get(url, headers, opts),
+         false <- blank?(body),
+         {:ok, %{mime_type: mime}} <- Majic.perform({:bytes, body}, pool: Pleroma.MajicPool),
+         true <- String.starts_with?(mime, "image/") do
+      {:ok, mime}
+    else
+      _ -> {:ok, nil}
+    end
+  end
+
+  defp blank?(nil), do: true
+  defp blank?(""), do: true
+  defp blank?(_), do: false
+end
diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
index 5ee9e7549..b6e30a438 100644
--- a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
   use Ecto.Schema
 
   alias Pleroma.EctoType.ActivityPub.ObjectValidators
+  alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer
 
   import Ecto.Changeset
 
@@ -61,9 +62,27 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
   end
 
   def fix_media_type(data) do
-    Map.put_new(data, "mediaType", data["mimeType"] || "application/octet-stream")
+    current = data["mediaType"] || data["mimeType"] || "application/octet-stream"
+
+    resolved =
+      if sniffable?(current) do
+        case AttachmentTypeSniffer.sniff_image_type(data["href"]) do
+          {:ok, mime} when is_binary(mime) -> mime
+          _ -> current
+        end
+      else
+        current
+      end
+
+    Map.put(data, "mediaType", resolved)
   end
 
+  # Only sniff when the declared type carries no real information. Everything
+  # else (including unrecognized-but-present types) is left as the remote sent it.
+  defp sniffable?("application/octet-stream"), do: true
+  defp sniffable?(""), do: true
+  defp sniffable?(_), do: false
+
   defp handle_href(href, mediaType, data) do
     [
       %{
diff --git a/test/pleroma/reverse_proxy_test.exs b/test/pleroma/reverse_proxy_test.exs
index ec4470379..5f75f2a07 100644
--- a/test/pleroma/reverse_proxy_test.exs
+++ b/test/pleroma/reverse_proxy_test.exs
@@ -298,21 +298,21 @@ defmodule Pleroma.ReverseProxyTest do
     end
   end
 
-  defp disposition_headers_mock(headers) do
+  defp disposition_headers_mock(headers, url \\ "/disposition") do
     ClientMock
-    |> expect(:request, fn :get, "/disposition", _, _, _ ->
-      Registry.register(ClientMock, "/disposition", 0)
+    |> expect(:request, fn :get, ^url, _, _, _ ->
+      Registry.register(ClientMock, url, 0)
 
-      {:ok, 200, headers, %{url: "/disposition"}}
+      {:ok, 200, headers, %{url: url}}
     end)
-    |> expect(:stream_body, 2, fn %{url: "/disposition"} = client ->
-      case Registry.lookup(ClientMock, "/disposition") do
+    |> expect(:stream_body, 2, fn %{url: ^url} = client ->
+      case Registry.lookup(ClientMock, url) do
         [{_, 0}] ->
-          Registry.update_value(ClientMock, "/disposition", &(&1 + 1))
+          Registry.update_value(ClientMock, url, &(&1 + 1))
           {:ok, "", client}
 
         [{_, 1}] ->
-          Registry.unregister(ClientMock, "/disposition")
+          Registry.unregister(ClientMock, url)
           :done
       end
     end)
@@ -328,6 +328,40 @@ defmodule Pleroma.ReverseProxyTest do
       conn = ReverseProxy.call(conn, "/disposition")
 
       assert {"content-type", "image/gif"} in conn.resp_headers
+      assert {"content-disposition", "inline; filename=\"inline.gif\""} in conn.resp_headers
+    end
+
+    test "forces inline for inline content types overriding upstream attachment", %{
+      conn: conn
+    } do
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-disposition", "attachment; filename=\"filename.png\""},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition")
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert String.starts_with?(disposition, "inline")
+      refute String.starts_with?(disposition, "attachment")
+    end
+
+    test "forces inline based on content type even without a file extension in the url", %{
+      conn: conn
+    } do
+      disposition_headers_mock(
+        [
+          {"content-type", "image/jpeg"},
+          {"content-length", "0"}
+        ],
+        "/original"
+      )
+
+      conn = ReverseProxy.call(conn, "/original")
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert disposition == "inline; filename=\"inline.jpg\""
     end
 
     test "with content-disposition header", %{conn: conn} do
@@ -340,6 +374,132 @@ defmodule Pleroma.ReverseProxyTest do
 
       assert {"content-disposition", "attachment; filename=\"filename.jpg\""} in conn.resp_headers
     end
+
+    test "with inline_content_types: true leaves upstream headers untouched", %{
+      conn: conn
+    } do
+      # opt == true: the proxy must not synthesise or rewrite content-disposition.
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-disposition", "attachment; filename=\"upstream.png\""},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: true)
+
+      assert {"content-disposition", "attachment; filename=\"upstream.png\""} in conn.resp_headers
+    end
+
+    test "with inline_content_types: true does not synthesise inline when upstream is absent", %{
+      conn: conn
+    } do
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: true)
+
+      assert Conn.get_resp_header(conn, "content-disposition") == []
+    end
+
+    test "with inline_content_types: false forces attachment for everything", %{
+      conn: conn
+    } do
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-disposition", "inline; filename=\"pic.png\""},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: false)
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert String.starts_with?(disposition, "attachment")
+    end
+
+    test "with inline_content_types: false derives attachment filename from the URL basename when no upstream filename", %{
+      conn: conn
+    } do
+      # No content-disposition header: the attachment branch falls back to
+      # attachment_name, which by default comes from MediaProxy.filename/1
+      # (the URL basename).
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: false)
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert disposition == "attachment; filename=\"disposition\""
+    end
+
+    test "with inline_content_types: false honours an explicit attachment_name opt", %{
+      conn: conn
+    } do
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-length", "0"}
+      ])
+
+      conn =
+        ReverseProxy.call(conn, "/disposition",
+          inline_content_types: false,
+          attachment_name: "custom.bin"
+        )
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert disposition == "attachment; filename=\"custom.bin\""
+    end
+
+    test "forces bare inline for a whitelisted type with no MIME extension", %{
+      conn: conn
+    } do
+      # image/x-foo-bar has no entry in MIME's database, so inline_filename/1
+      # returns nil and the disposition should be the bare token "inline".
+      disposition_headers_mock([
+        {"content-type", "image/x-foo-bar"},
+        {"content-length", "0"}
+      ])
+
+      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: ["image/x-foo-bar"])
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert disposition == "inline"
+    end
+
+    test "honours a custom inline_content_types whitelist", %{conn: conn} do
+      # image/bmp is NOT in the default whitelist; with a custom whitelist
+      # that includes it, the proxy should force inline.
+      disposition_headers_mock([
+        {"content-type", "image/bmp"},
+        {"content-disposition", "attachment; filename=\"upstream.bmp\""},
+        {"content-length", "0"}
+      ])
+
+      conn =
+        ReverseProxy.call(conn, "/disposition", inline_content_types: ["image/bmp"])
+
+      [disposition] = Conn.get_resp_header(conn, "content-disposition")
+      assert String.starts_with?(disposition, "inline")
+      assert String.ends_with?(disposition, "inline.bmp\"")
+    end
+
+    test "treats a type outside the whitelist as attachment even on custom whitelist", %{
+      conn: conn
+    } do
+      disposition_headers_mock([
+        {"content-type", "image/png"},
+        {"content-disposition", "attachment; filename=\"filename.png\""},
+        {"content-length", "0"}
+      ])
+
+      conn =
+        ReverseProxy.call(conn, "/disposition", inline_content_types: ["image/bmp"])
+
+      assert {"content-disposition", "attachment; filename=\"filename.png\""} in conn.resp_headers
+    end
   end
 
   describe "content-type sanitisation" do
diff --git a/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs b/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs
new file mode 100644
index 000000000..52b1b67a1
--- /dev/null
+++ b/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs
@@ -0,0 +1,178 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSnifferTest do
+  use Pleroma.DataCase, async: true
+
+  alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer
+
+  # @sniff_bytes must mirror the value in the module under test; we assert the
+  # Range header that the sniffer sends, so the test should fail loudly if the
+  # constant drifts.
+  @sniff_bytes 8 * 1024
+  @range_header "bytes=0-#{@sniff_bytes - 1}"
+
+  describe "sniff_image_type/1 with a real image body" do
+    test "returns image/jpeg for a JPEG body" do
+      url = "https://example.com/media/image.jpg"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: jpeg}
+      end)
+
+      assert {:ok, "image/jpeg"} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns image/png for a PNG body" do
+      url = "https://example.com/media/image.png"
+      png = File.read!("test/fixtures/image.png")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: png}
+      end)
+
+      assert {:ok, "image/png"} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns image/gif for a GIF body" do
+      url = "https://example.com/media/image.gif"
+      gif = File.read!("test/fixtures/image.gif")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: gif}
+      end)
+
+      assert {:ok, "image/gif"} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+  end
+
+  describe "sniff_image_type/1 sends a ranged request" do
+    test "sends a Range header asking for the first chunk" do
+      url = "https://example.com/media/ranged"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn
+        %{method: :get, url: ^url, headers: headers} ->
+          headers_map = Enum.into(headers, %{})
+          assert headers_map["range"] == @range_header
+
+          %Tesla.Env{status: 200, body: jpeg}
+
+        %{method: :get, url: ^url} ->
+          # If the sniffer did not send the Range header, fail explicitly.
+          flunk("expected Range header to be sent with the request")
+      end)
+
+      assert {:ok, "image/jpeg"} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+  end
+
+  describe "sniff_image_type/1 with a non-image body" do
+    test "returns nil for plain text" do
+      url = "https://example.com/media/note.txt"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: "just some plain text, not an image at all"}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil for an HTML body" do
+      url = "https://example.com/page"
+      html = File.read!("test/fixtures/rel_me_anchor.html")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: html}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil for an empty body" do
+      url = "https://example.com/media/empty"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: ""}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil for a nil body" do
+      url = "https://example.com/media/nil-body"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: nil}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+  end
+
+  describe "sniff_image_type/1 on HTTP failure" do
+    test "returns nil on a 404" do
+      url = "https://example.com/media/missing"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 404, body: ""}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil on a 500" do
+      url = "https://example.com/media/oops"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 500, body: "server error"}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil on a 3xx (not in 200..299)" do
+      url = "https://example.com/media/redirect"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 302, body: ""}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil on a transport-level error" do
+      url = "https://example.com/media/econnrefused"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        {:error, :econnrefused}
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+
+    test "returns nil when the HTTP adapter raises" do
+      url = "https://example.com/media/raises"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        raise "boom"
+      end)
+
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
+    end
+  end
+
+  describe "sniff_image_type/1 guard clauses" do
+    test "returns nil for nil input without making a request" do
+      # No Tesla mock is configured; if a request were made, Tesla.Mock would
+      # raise and fail the test.
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(nil)
+    end
+
+    test "returns nil for an empty-string URL without making a request" do
+      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type("")
+    end
+  end
+end
diff --git a/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
index 744ae8704..870ad90cc 100644
--- a/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
+++ b/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
@@ -215,5 +215,226 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidatorTest do
         AttachmentValidator.cast_and_validate(attachment)
         |> Ecto.Changeset.apply_action(:insert)
     end
+
+    test "sniffs image/jpeg for octet-stream attachments whose body is an image" do
+      url = "https://example.com/media/no-extension/original"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: jpeg}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "application/octet-stream",
+        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{href: ^url, mediaType: "image/jpeg"}] = attachment.url
+    end
+
+    test "sniffs image/jpeg for attachments with a missing mediaType" do
+      url = "https://example.com/media/missing-type/original"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: jpeg}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "url" => [%{"type" => "Link", "href" => url}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{href: ^url, mediaType: "image/jpeg"}] = attachment.url
+    end
+
+    test "leaves non-image octet-stream attachments as octet-stream" do
+      url = "https://example.com/media/some-document"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: "just some plain text, not an image at all"}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "application/octet-stream",
+        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{mediaType: "application/octet-stream"}] = attachment.url
+    end
+
+    test "does not sniff when the remote already provided a real mediaType" do
+      # No Tesla mock is set up: if the validator tried to fetch, Tesla.Mock
+      # would raise and fail the test. A real image type must be kept as-is.
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "image/png",
+        "url" => [
+          %{"type" => "Link", "href" => "https://example.com/x", "mediaType" => "image/png"}
+        ]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{mediaType: "image/png"}] = attachment.url
+    end
+  end
+
+  describe "fix_media_type fallbacks and sniffing" do
+    test "uses mimeType as a fallback when mediaType is absent (real type, not sniffed)" do
+      # No Tesla mock: if the validator tried to fetch, the test would fail.
+      # A real image type coming from mimeType must be preserved as-is on the
+      # outer attachment and on the synthesised url entry (string url form).
+      attachment = %{
+        "type" => "Document",
+        "mimeType" => "image/png",
+        "url" => "https://example.com/x.png"
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert attachment.mediaType == "image/png"
+      assert [%{mediaType: "image/png"}] = attachment.url
+    end
+
+    test "prefers mediaType over mimeType when both are present" do
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "image/gif",
+        "mimeType" => "image/png",
+        "url" => "https://example.com/x.gif"
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert attachment.mediaType == "image/gif"
+      assert [%{mediaType: "image/gif"}] = attachment.url
+    end
+
+    test "sniffs when the url entry's mediaType is application/octet-stream and the body is an image" do
+      # The outer attachment mediaType is not sniffed (no top-level href); only
+      # the url entry is. We assert only on the url entry.
+      url = "https://example.com/media/mime-type-octet"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: jpeg}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "application/octet-stream",
+        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{mediaType: "image/jpeg"}] = attachment.url
+    end
+
+    test "sniffs when mediaType is the empty string and the body is an image" do
+      url = "https://example.com/media/empty-mediatype"
+      png = File.read!("test/fixtures/image.png")
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 200, body: png}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "",
+        "url" => [%{"type" => "Link", "href" => url, "mediaType" => ""}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{mediaType: "image/png"}] = attachment.url
+    end
+
+    test "falls back to the declared type when the sniffer HTTP request fails" do
+      url = "https://example.com/media/sniff-404"
+
+      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
+        %Tesla.Env{status: 404, body: ""}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "application/octet-stream",
+        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [%{mediaType: "application/octet-stream"}] = attachment.url
+    end
+
+    test "sniffs each url entry independently" do
+      jpeg_url = "https://example.com/media/a"
+      octet_url = "https://example.com/media/b"
+      jpeg = File.read!("test/fixtures/image.jpg")
+
+      Tesla.Mock.mock(fn
+        %{method: :get, url: ^jpeg_url} ->
+          %Tesla.Env{status: 200, body: jpeg}
+
+        %{method: :get, url: ^octet_url} ->
+          %Tesla.Env{status: 200, body: "definitely not an image"}
+      end)
+
+      attachment = %{
+        "type" => "Document",
+        "mediaType" => "application/octet-stream",
+        "url" => [
+          %{"type" => "Link", "href" => jpeg_url, "mediaType" => "application/octet-stream"},
+          %{"type" => "Link", "href" => octet_url, "mediaType" => "application/octet-stream"}
+        ]
+      }
+
+      {:ok, attachment} =
+        attachment
+        |> AttachmentValidator.cast_and_validate()
+        |> Ecto.Changeset.apply_action(:insert)
+
+      assert [
+               %{href: ^jpeg_url, mediaType: "image/jpeg"},
+               %{href: ^octet_url, mediaType: "application/octet-stream"}
+             ] = attachment.url
+    end
   end
 end

From f11ffca7f554bdb72edb4414eeaaec1fc73625ac Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 17 Jul 2026 20:35:17 +0400
Subject: [PATCH 098/163] feat(http): rework Gun connection pooling

---
 config/description.exs                        |   9 +-
 lib/pleroma/gun.ex                            |   9 +-
 lib/pleroma/gun/api.ex                        |  25 +
 lib/pleroma/gun/conn.ex                       | 124 +++-
 lib/pleroma/gun/connection_pool.ex            | 225 +++++-
 lib/pleroma/gun/connection_pool/reclaimer.ex  |  51 +-
 lib/pleroma/gun/connection_pool/worker.ex     | 268 +++++--
 .../gun/connection_pool/worker_supervisor.ex  |   9 +-
 lib/pleroma/http/adapter/gun.ex               | 207 ++++++
 lib/pleroma/http/adapter_helper/gun.ex        |   4 +-
 lib/pleroma/reverse_proxy.ex                  |  33 +-
 lib/pleroma/reverse_proxy/client/tesla.ex     |   8 +-
 lib/pleroma/telemetry/logger.ex               |   2 +-
 .../tesla/middleware/connection_pool.ex       |  60 +-
 lib/pleroma/web/rich_media/helpers.ex         |  63 +-
 test/pleroma/gun/conn_test.exs                | 144 ++++
 test/pleroma/gun/connection_pool_test.exs     | 261 ++++++-
 test/pleroma/http/adapter_helper/gun_test.exs |   6 +
 test/pleroma/http/gun_integration_test.exs    | 671 ++++++++++++++++++
 .../reverse_proxy/client/tesla_test.exs       |  22 +
 test/pleroma/reverse_proxy_test.exs           |  25 +-
 .../tesla/middleware/connection_pool_test.exs |  99 +++
 22 files changed, 2133 insertions(+), 192 deletions(-)
 create mode 100644 lib/pleroma/http/adapter/gun.ex
 create mode 100644 test/pleroma/gun/conn_test.exs
 create mode 100644 test/pleroma/http/gun_integration_test.exs
 create mode 100644 test/pleroma/reverse_proxy/client/tesla_test.exs
 create mode 100644 test/pleroma/tesla/middleware/connection_pool_test.exs

diff --git a/config/description.exs b/config/description.exs
index 7c377588c..4f62d3b72 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3085,9 +3085,16 @@ config :pleroma, :config_description, [
       %{
         key: :max_connections,
         type: :integer,
-        description: "Maximum number of connections in the pool. Default: 250 connections.",
+        description:
+          "Maximum total number of connections in the pool. HTTP/1 origins may use multiple connections within this limit, while HTTP/2 connections are multiplexed. Default: 250 connections.",
         suggestions: [250]
       },
+      %{
+        key: :max_idle_time,
+        type: :integer,
+        description: "Time before an unused connection is closed. Default: 30000ms.",
+        suggestions: [30_000]
+      },
       %{
         key: :connect_timeout,
         type: :integer,
diff --git a/lib/pleroma/gun.ex b/lib/pleroma/gun.ex
index c2d6b4bf2..764eb4b72 100644
--- a/lib/pleroma/gun.ex
+++ b/lib/pleroma/gun.ex
@@ -6,9 +6,12 @@ defmodule Pleroma.Gun do
   @callback open(charlist(), pos_integer(), map()) :: {:ok, pid()}
   @callback info(pid()) :: map()
   @callback close(pid()) :: :ok
+  @callback cancel(pid(), reference() | [reference()]) :: :ok
   @callback await_up(pid, pos_integer()) :: {:ok, atom()} | {:error, atom()}
   @callback connect(pid(), map()) :: reference()
-  @callback await(pid(), reference()) :: {:response, :fin, 200, []}
+  @callback await(pid(), reference()) :: tuple()
+  @callback await_tunnel_up(pid(), reference() | :undefined, timeout()) ::
+              {:ok, atom()} | {:error, term()}
   @callback set_owner(pid(), pid()) :: :ok
 
   defp api, do: Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
@@ -19,11 +22,15 @@ defmodule Pleroma.Gun do
 
   def close(pid), do: api().close(pid)
 
+  def cancel(pid, stream), do: api().cancel(pid, stream)
+
   def await_up(pid, timeout \\ 5_000), do: api().await_up(pid, timeout)
 
   def connect(pid, opts), do: api().connect(pid, opts)
 
   def await(pid, ref), do: api().await(pid, ref)
 
+  def await_tunnel_up(pid, ref, timeout), do: api().await_tunnel_up(pid, ref, timeout)
+
   def set_owner(pid, owner), do: api().set_owner(pid, owner)
 end
diff --git a/lib/pleroma/gun/api.ex b/lib/pleroma/gun/api.ex
index ff2100623..8f6387069 100644
--- a/lib/pleroma/gun/api.ex
+++ b/lib/pleroma/gun/api.ex
@@ -32,6 +32,9 @@ defmodule Pleroma.Gun.API do
   @impl Gun
   defdelegate close(pid), to: :gun
 
+  @impl Gun
+  defdelegate cancel(pid, stream), to: :gun
+
   @impl Gun
   defdelegate await_up(pid, timeout \\ 5_000), to: :gun
 
@@ -41,6 +44,28 @@ defmodule Pleroma.Gun.API do
   @impl Gun
   defdelegate await(pid, ref), to: :gun
 
+  @impl Gun
+  def await_tunnel_up(pid, stream_ref, timeout) do
+    monitor_ref = Process.monitor(pid)
+
+    result =
+      receive do
+        {:gun_tunnel_up, ^pid, ^stream_ref, protocol} ->
+          {:ok, protocol}
+
+        {:gun_down, ^pid, _protocol, reason, _killed_streams} ->
+          {:error, {:down, reason}}
+
+        {:DOWN, ^monitor_ref, :process, ^pid, reason} ->
+          {:error, {:down, reason}}
+      after
+        timeout -> {:error, :timeout}
+      end
+
+    Process.demonitor(monitor_ref, [:flush])
+    result
+  end
+
   @impl Gun
   defdelegate set_owner(pid, owner), to: :gun
 end
diff --git a/lib/pleroma/gun/conn.ex b/lib/pleroma/gun/conn.ex
index 804cd11c7..f56a1af2f 100644
--- a/lib/pleroma/gun/conn.ex
+++ b/lib/pleroma/gun/conn.ex
@@ -47,13 +47,14 @@ defmodule Pleroma.Gun.Conn do
       uri
       |> destination_opts()
       |> add_http2_opts(uri.scheme, Map.get(opts, :tls_opts, []))
+      |> add_proxy_auth(opts)
 
-    with open_opts <- Map.delete(opts, :tls_opts),
+    with open_opts <- proxy_open_opts(opts),
          {:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]),
-         stream <- Gun.connect(conn, connect_opts),
-         {:response, :fin, 200, _} <- Gun.await(conn, stream) do
-      {:ok, conn, protocol}
+         {:ok, _proxy_protocol} <- await_up(conn, opts[:connect_timeout]) do
+      conn
+      |> Gun.connect(connect_opts)
+      |> await_proxy_connect(conn, opts[:connect_timeout])
     else
       error ->
         Logger.warning(
@@ -64,30 +65,29 @@ defmodule Pleroma.Gun.Conn do
     end
   end
 
-  defp do_open(uri, %{proxy: {proxy_type, proxy_host, proxy_port}} = opts) do
-    version =
-      proxy_type
-      |> to_string()
-      |> String.last()
-      |> case do
-        "4" -> 4
-        _ -> 5
-      end
+  defp do_open(_uri, %{proxy: {:socks4, _proxy_host, _proxy_port}}) do
+    {:error, :socks4_unsupported}
+  end
 
+  defp do_open(uri, %{proxy: {proxy_type, proxy_host, proxy_port}} = opts)
+       when proxy_type in [:socks, :socks5] do
     socks_opts =
       uri
       |> destination_opts()
       |> add_http2_opts(uri.scheme, Map.get(opts, :tls_opts, []))
-      |> Map.put(:version, version)
+      |> Map.put(:version, 5)
+      |> add_socks_proxy_auth(opts)
 
-    opts =
+    open_opts =
       opts
+      |> proxy_open_opts()
       |> Map.put(:protocols, [:socks])
       |> Map.put(:socks_opts, socks_opts)
 
-    with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]) do
-      {:ok, conn, protocol}
+    with {:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
+         {:ok, :socks} <- await_up(conn, opts[:connect_timeout]),
+         {:ok, protocol} <- await_tunnel_up(conn, :undefined, opts[:connect_timeout]) do
+      {:ok, conn, protocol, nil}
     else
       error ->
         Logger.warning(
@@ -100,10 +100,11 @@ defmodule Pleroma.Gun.Conn do
 
   defp do_open(%URI{host: host, port: port} = uri, opts) do
     host = Pleroma.HTTP.AdapterHelper.parse_host(host)
+    opts = Map.put(opts, :transport, transport(uri.scheme))
 
     with {:ok, conn} <- Gun.open(host, port, opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]) do
-      {:ok, conn, protocol}
+         {:ok, protocol} <- await_up(conn, opts[:connect_timeout]) do
+      {:ok, conn, protocol, nil}
     else
       error ->
         Logger.warning(
@@ -120,11 +121,90 @@ defmodule Pleroma.Gun.Conn do
   end
 
   defp add_http2_opts(opts, "https", tls_opts) do
-    Map.merge(opts, %{protocols: [:http2], transport: :tls, tls_opts: tls_opts})
+    Map.merge(opts, %{protocols: [:http2, :http], transport: :tls, tls_opts: tls_opts})
   end
 
   defp add_http2_opts(opts, _, _), do: opts
 
+  defp add_proxy_auth(connect_opts, %{proxy_auth: {username, password}})
+       when is_binary(username) and is_binary(password) do
+    Map.merge(connect_opts, %{username: username, password: password})
+  end
+
+  defp add_proxy_auth(connect_opts, _), do: connect_opts
+
+  defp add_socks_proxy_auth(socks_opts, %{proxy_auth: {username, password}})
+       when is_binary(username) and is_binary(password) do
+    Map.put(socks_opts, :auth, [{:username_password, username, password}])
+  end
+
+  defp add_socks_proxy_auth(socks_opts, _), do: socks_opts
+
+  defp proxy_open_opts(opts) do
+    proxy_tls_opts = Map.get(opts, :proxy_tls_opts, [])
+
+    opts =
+      opts
+      |> Map.drop([:proxy, :proxy_auth, :proxy_tls_opts, :tls_opts])
+      |> Map.put_new(:transport, :tcp)
+
+    if opts.transport == :tls do
+      Map.put(opts, :tls_opts, proxy_tls_opts)
+    else
+      opts
+    end
+  end
+
+  defp await_up(conn, timeout) do
+    case Gun.await_up(conn, timeout) do
+      {:ok, protocol} ->
+        {:ok, protocol}
+
+      error ->
+        Gun.close(conn)
+        error
+    end
+  end
+
+  defp await_proxy_connect(stream, conn, timeout) do
+    case Gun.await(conn, stream) do
+      {:response, :fin, 200, _headers} ->
+        case await_tunnel_up(conn, stream, timeout) do
+          {:ok, protocol} -> {:ok, conn, protocol, stream}
+          error -> error
+        end
+
+      {:response, _fin, 403, _headers} ->
+        close_with_error(conn, :unauthorized)
+
+      {:response, _fin, 407, _headers} ->
+        close_with_error(conn, :proxy_auth_failed)
+
+      error ->
+        Gun.close(conn)
+        error
+    end
+  end
+
+  defp close_with_error(conn, reason) do
+    Gun.close(conn)
+    {:error, reason}
+  end
+
+  defp transport("https"), do: :tls
+  defp transport(_), do: :tcp
+
+  defp await_tunnel_up(conn, stream_ref, timeout) do
+    case Gun.await_tunnel_up(conn, stream_ref, timeout) do
+      {:ok, protocol} ->
+        {:ok, protocol}
+
+      error ->
+        Gun.close(conn)
+        error
+    end
+  end
+
   def compose_uri_log(%URI{scheme: scheme, host: host, path: path}) do
     "#{scheme}://#{host}#{path}"
   end
diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
index 2e851de19..f2620836e 100644
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@@ -4,53 +4,132 @@
 
 defmodule Pleroma.Gun.ConnectionPool do
   @registry __MODULE__
+  @locks Module.concat(__MODULE__, Locks)
 
   alias Pleroma.Gun.ConnectionPool.WorkerSupervisor
 
+  @connection_option_keys [
+    :http_opts,
+    :http2_opts,
+    :protocols,
+    :proxy,
+    :proxy_auth,
+    :proxy_tls_opts,
+    :retry,
+    :retry_timeout,
+    :socks_opts,
+    :tcp_opts,
+    :tls_opts,
+    :transport,
+    :ws_opts
+  ]
+
   def children do
     [
-      {Registry, keys: :unique, name: @registry},
+      {Registry, keys: :duplicate, name: @registry},
+      {Registry, keys: :unique, name: @locks},
       Pleroma.Gun.ConnectionPool.WorkerSupervisor
     ]
   end
 
   @spec get_conn(URI.t(), keyword()) :: {:ok, pid()} | {:error, term()}
   def get_conn(uri, opts) do
-    key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
+    key = connection_key(uri, opts)
 
-    case Registry.lookup(@registry, key) do
-      # The key has already been registered, but connection is not up yet
-      [{worker_pid, nil}] ->
-        get_gun_pid_from_worker(worker_pid, true)
-
-      [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
-        GenServer.call(worker_pid, :add_client)
+    case checkout_existing(Registry.lookup(@registry, key)) do
+      {:ok, gun_pid} ->
         {:ok, gun_pid}
 
-      [] ->
-        # :gun.set_owner fails in :connected state for whatevever reason,
-        # so we open the connection in the process directly and send it's pid back
-        # We trust gun to handle timeouts by itself
-        case WorkerSupervisor.start_worker([key, uri, opts, self()]) do
-          {:ok, worker_pid} ->
-            get_gun_pid_from_worker(worker_pid, false)
+      :not_available ->
+        provision_or_wait(key, uri, opts)
+    end
+  end
 
-          {:error, {:already_started, worker_pid}} ->
-            get_gun_pid_from_worker(worker_pid, true)
+  defp checkout_existing([]), do: :not_available
 
-          err ->
-            err
+  defp checkout_existing([{_worker_pid, nil} | workers]), do: checkout_existing(workers)
+
+  defp checkout_existing([{worker_pid, _value} | workers]) do
+    case checkout_worker(worker_pid) do
+      {:ok, gun_pid} -> {:ok, gun_pid}
+      _ -> checkout_existing(workers)
+    end
+  end
+
+  defp provision_or_wait(key, uri, opts) do
+    result = with_route_lock(key, fn -> provision(key, uri, opts) end)
+
+    case result do
+      {:ok, gun_pid} ->
+        {:ok, gun_pid}
+
+      {:new, worker_pid} ->
+        get_gun_pid_from_worker(worker_pid)
+
+      {:wait, worker_pid} ->
+        case checkout_worker(worker_pid, :infinity) do
+          {:ok, gun_pid} -> {:ok, gun_pid}
+          :busy -> get_conn(uri, opts)
+          error -> error
+        end
+
+      error ->
+        error
+    end
+  end
+
+  defp provision(key, uri, opts) do
+    workers = Registry.lookup(@registry, key)
+
+    case checkout_existing(workers) do
+      {:ok, gun_pid} ->
+        {:ok, gun_pid}
+
+      :not_available ->
+        case Enum.find(workers, fn {_worker_pid, value} -> is_nil(value) end) do
+          {worker_pid, nil} -> {:wait, worker_pid}
+          nil -> start_worker(key, uri, opts)
         end
     end
   end
 
-  defp get_gun_pid_from_worker(worker_pid, register) do
+  defp with_route_lock(key, function) do
+    case Registry.register(@locks, key, nil) do
+      {:ok, _} ->
+        try do
+          function.()
+        after
+          Registry.unregister(@locks, key)
+        end
+
+      {:error, {:already_registered, _owner}} ->
+        Process.sleep(1)
+        with_route_lock(key, function)
+    end
+  end
+
+  defp start_worker(key, uri, opts) do
+    # :gun.set_owner fails in :connected state, so the worker opens the connection itself.
+    case WorkerSupervisor.start_worker([key, uri, opts, self()]) do
+      {:ok, worker_pid} -> {:new, worker_pid}
+      error -> error
+    end
+  end
+
+  defp checkout_worker(worker_pid, timeout \\ 5_000) do
+    try do
+      GenServer.call(worker_pid, :checkout, timeout)
+    catch
+      :exit, reason -> {:error, {:connection_worker_exit, reason}}
+    end
+  end
+
+  defp get_gun_pid_from_worker(worker_pid) do
     # GenServer.call will block the process for timeout length if
     # the server crashes on startup (which will happen if gun fails to connect)
     # so instead we use cast + monitor
 
     ref = Process.monitor(worker_pid)
-    if register, do: GenServer.cast(worker_pid, {:add_client, self()})
 
     receive do
       {:conn_pid, pid} ->
@@ -68,19 +147,115 @@ defmodule Pleroma.Gun.ConnectionPool do
 
   @spec release_conn(pid()) :: :ok
   def release_conn(conn_pid) do
-    # :ets.fun2ms(fn {_, {worker_pid, {gun_pid, _, _, _}}} when gun_pid == conn_pid ->
+    # :ets.fun2ms(fn {_, {worker_pid, {gun_pid, _tunnel}}} when gun_pid == conn_pid ->
     #    worker_pid end)
     query_result =
       Registry.select(@registry, [
-        {{:_, :"$1", {:"$2", :_, :_, :_}}, [{:==, :"$2", conn_pid}], [:"$1"]}
+        {{:_, :"$1", {:"$2", :_}}, [{:==, :"$2", conn_pid}], [:"$1"]}
       ])
 
     case query_result do
       [worker_pid] ->
-        GenServer.call(worker_pid, :remove_client)
+        try do
+          GenServer.call(worker_pid, :remove_client)
+        catch
+          :exit, _ -> :ok
+        end
 
       [] ->
         :ok
     end
   end
+
+  @spec discard_conn(pid()) :: :ok
+  def discard_conn(conn_pid) do
+    case worker_for_conn(conn_pid) do
+      nil ->
+        :ok
+
+      worker_pid ->
+        DynamicSupervisor.terminate_child(WorkerSupervisor, worker_pid)
+    end
+  end
+
+  @spec cancel_stream(pid(), reference() | [reference()]) :: :ok
+  def cancel_stream(conn_pid, stream) do
+    case worker_for_conn(conn_pid) do
+      nil ->
+        Pleroma.Gun.cancel(conn_pid, stream)
+
+      worker_pid ->
+        try do
+          GenServer.call(worker_pid, {:cancel_stream, stream})
+        catch
+          :exit, _ -> :ok
+        end
+    end
+  end
+
+  @spec register_stream(pid(), reference() | [reference()]) :: :ok
+  def register_stream(conn_pid, stream) do
+    call_worker(conn_pid, {:register_stream, stream})
+  end
+
+  @spec finish_stream(pid(), reference() | [reference()]) :: :ok
+  def finish_stream(conn_pid, stream) do
+    call_worker(conn_pid, {:finish_stream, stream})
+  end
+
+  @spec release_stream(pid(), reference() | [reference()]) :: :ok
+  def release_stream(conn_pid, stream) do
+    call_worker(conn_pid, {:release_stream, stream})
+  end
+
+  @spec tunnel_ref(pid()) :: reference() | nil
+  def tunnel_ref(conn_pid) do
+    case Registry.select(@registry, [
+           {{:_, :_, {:"$1", :"$2"}}, [{:==, :"$1", conn_pid}], [:"$2"]}
+         ]) do
+      [tunnel] -> tunnel
+      [] -> nil
+    end
+  end
+
+  defp worker_for_conn(conn_pid) do
+    case Registry.select(@registry, [
+           {{:_, :"$1", {:"$2", :_}}, [{:==, :"$2", conn_pid}], [:"$1"]}
+         ]) do
+      [worker_pid] -> worker_pid
+      [] -> nil
+    end
+  end
+
+  defp call_worker(conn_pid, message) do
+    case worker_for_conn(conn_pid) do
+      nil ->
+        :ok
+
+      worker_pid ->
+        try do
+          GenServer.call(worker_pid, message)
+        catch
+          :exit, _ -> :ok
+        end
+    end
+  end
+
+  defp connection_key(uri, opts) do
+    origin = {
+      String.downcase(uri.scheme),
+      String.downcase(uri.host),
+      uri.port
+    }
+
+    profile =
+      opts
+      |> Map.new()
+      |> Map.take(@connection_option_keys)
+      |> :erlang.term_to_binary()
+      |> then(&:crypto.hash(:sha256, &1))
+
+    fingerprint = Base.encode16(profile, case: :lower)
+    Enum.join(Tuple.to_list(origin) ++ [fingerprint], ":")
+  end
 end
diff --git a/lib/pleroma/gun/connection_pool/reclaimer.ex b/lib/pleroma/gun/connection_pool/reclaimer.ex
index 3580d38f5..bd7de7e31 100644
--- a/lib/pleroma/gun/connection_pool/reclaimer.ex
+++ b/lib/pleroma/gun/connection_pool/reclaimer.ex
@@ -9,11 +9,11 @@ defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
 
   def start_monitor do
     pid =
-      case GenServer.start(__MODULE__, [], name: {:via, Registry, {registry(), "reclaimer"}}) do
+      case GenServer.start(__MODULE__, [], name: __MODULE__) do
         {:ok, pid} ->
           pid
 
-        {:error, {:already_registered, pid}} ->
+        {:error, {:already_started, pid}} ->
           pid
       end
 
@@ -41,17 +41,16 @@ defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
       reclaim_max: reclaim_max
     })
 
-    # :ets.fun2ms(
-    # fn {_, {worker_pid, {_, used_by, crf, last_reference}}} when used_by == [] ->
-    #   {worker_pid, crf, last_reference} end)
-    unused_conns =
+    workers =
       Registry.select(
         registry(),
         [
-          {{:_, :"$1", {:_, :"$2", :"$3", :"$4"}}, [{:==, :"$2", []}], [{{:"$1", :"$3", :"$4"}}]}
+          {{:_, :"$1", {:_, :_}}, [], [:"$1"]}
         ]
       )
 
+    unused_conns = Enum.flat_map(workers, &reclaim_info/1)
+
     case unused_conns do
       [] ->
         :telemetry.execute(
@@ -65,25 +64,43 @@ defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
         {:stop, :no_unused_conns, nil}
 
       unused_conns ->
-        reclaimed =
+        reclaimed_count =
           unused_conns
-          |> Enum.sort(fn {_pid1, crf1, last_reference1}, {_pid2, crf2, last_reference2} ->
-            crf1 <= crf2 and last_reference1 <= last_reference2
-          end)
-          |> Enum.take(reclaim_max)
+          |> Enum.sort_by(fn {_pid, crf, last_reference} -> {crf, last_reference} end)
+          |> Enum.reduce_while(0, fn
+            _worker, count when count == reclaim_max ->
+              {:halt, count}
 
-        reclaimed
-        |> Enum.each(fn {pid, _, _} ->
-          DynamicSupervisor.terminate_child(Pleroma.Gun.ConnectionPool.WorkerSupervisor, pid)
-        end)
+            {worker_pid, _crf, _last_reference}, count ->
+              if reclaim(worker_pid), do: {:cont, count + 1}, else: {:cont, count}
+          end)
 
         :telemetry.execute(
           [:pleroma, :connection_pool, :reclaim, :stop],
-          %{reclaimed_count: Enum.count(reclaimed)},
+          %{reclaimed_count: reclaimed_count},
           %{max_connections: max_connections}
         )
 
         {:stop, :normal, nil}
     end
   end
+
+  defp reclaim_info(worker_pid) do
+    try do
+      case GenServer.call(worker_pid, :reclaim_info) do
+        {:idle, crf, last_reference} -> [{worker_pid, crf, last_reference}]
+        :in_use -> []
+      end
+    catch
+      :exit, _ -> []
+    end
+  end
+
+  defp reclaim(worker_pid) do
+    try do
+      GenServer.call(worker_pid, :reclaim) == :reclaimed
+    catch
+      :exit, _ -> false
+    end
+  end
 end
diff --git a/lib/pleroma/gun/connection_pool/worker.ex b/lib/pleroma/gun/connection_pool/worker.ex
index 38527ec1d..24e067e87 100644
--- a/lib/pleroma/gun/connection_pool/worker.ex
+++ b/lib/pleroma/gun/connection_pool/worker.ex
@@ -8,25 +8,22 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
 
   defp registry, do: Pleroma.Gun.ConnectionPool
 
-  def start_link([key | _] = opts) do
-    GenServer.start_link(__MODULE__, opts, name: {:via, Registry, {registry(), key}})
-  end
+  def start_link(opts), do: GenServer.start_link(__MODULE__, opts)
 
   @impl true
-  def init([_key, _uri, _opts, _client_pid] = opts) do
+  def init([key, _uri, _opts, _client_pid] = opts) do
+    {:ok, _} = Registry.register(registry(), key, nil)
     {:ok, nil, {:continue, {:connect, opts}}}
   end
 
   @impl true
   def handle_continue({:connect, [key, uri, opts, client_pid]}, _) do
-    with {:ok, conn_pid, protocol} <- Gun.Conn.open(uri, opts),
+    with {:ok, conn_pid, protocol, tunnel} <- Gun.Conn.open(uri, opts),
          Process.link(conn_pid) do
       time = :erlang.monotonic_time(:millisecond)
 
-      {_, _} =
-        Registry.update_value(registry(), key, fn _ ->
-          {conn_pid, [client_pid], 1, time}
-        end)
+      Registry.unregister(registry(), key)
+      {:ok, _} = Registry.register(registry(), key, {conn_pid, tunnel})
 
       send(client_pid, {:conn_pid, conn_pid})
 
@@ -34,8 +31,14 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
        %{
          key: key,
          timer: nil,
-         client_monitors: %{client_pid => Process.monitor(client_pid)},
-         protocol: protocol
+         clients: %{
+           client_pid => %{count: 1, monitor: Process.monitor(client_pid), streams: MapSet.new()}
+         },
+         conn_pid: conn_pid,
+         protocol: protocol,
+         proxied: Keyword.has_key?(opts, :proxy),
+         crf: 1,
+         last_reference: time
        }, :hibernate}
     else
       err ->
@@ -44,106 +47,225 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
   end
 
   @impl true
-  def handle_cast({:add_client, client_pid}, state) do
-    case handle_call(:add_client, {client_pid, nil}, state) do
-      {:reply, conn_pid, state, :hibernate} ->
-        send(client_pid, {:conn_pid, conn_pid})
-        {:noreply, state, :hibernate}
-    end
+  def handle_call(:checkout, _from, %{protocol: protocol, clients: clients} = state)
+      when protocol != :http2 and map_size(clients) > 0 do
+    {:reply, :busy, state, :hibernate}
   end
 
-  @impl true
-  def handle_cast({:remove_client, client_pid}, state) do
-    case handle_call(:remove_client, {client_pid, nil}, state) do
-      {:reply, _, state, :hibernate} ->
-        {:noreply, state, :hibernate}
-    end
-  end
-
-  @impl true
-  def handle_call(:add_client, {client_pid, _}, %{key: key, protocol: protocol} = state) do
+  def handle_call(:checkout, {client_pid, _}, %{key: key, protocol: protocol} = state) do
     time = :erlang.monotonic_time(:millisecond)
 
-    {{conn_pid, used_by, _, _}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
-        {conn_pid, [client_pid | used_by], crf(time - last_reference, crf), time}
-      end)
+    [{_, {conn_pid, _tunnel}}] =
+      Registry.lookup(registry(), key) |> Enum.filter(&(elem(&1, 0) == self()))
+
+    state =
+      state
+      |> cancel_idle_timer()
+      |> add_client(client_pid)
+      |> Map.put(:crf, crf(time - state.last_reference, state.crf))
+      |> Map.put(:last_reference, time)
 
     :telemetry.execute(
       [:pleroma, :connection_pool, :client, :add],
-      %{client_pid: client_pid, clients: used_by},
+      %{client_pid: client_pid, clients: Map.keys(state.clients)},
       %{key: state.key, protocol: protocol}
     )
 
-    state =
-      if state.timer != nil do
-        Process.cancel_timer(state[:timer])
-        %{state | timer: nil}
-      else
-        state
-      end
-
-    ref = Process.monitor(client_pid)
-
-    state = put_in(state.client_monitors[client_pid], ref)
-    {:reply, conn_pid, state, :hibernate}
+    {:reply, {:ok, conn_pid}, state, :hibernate}
   end
 
   @impl true
-  def handle_call(:remove_client, {client_pid, _}, %{key: key} = state) do
-    {{_conn_pid, used_by, _crf, _last_reference}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
-        {conn_pid, List.delete(used_by, client_pid), crf, last_reference}
-      end)
+  def handle_call(:remove_client, {client_pid, _}, state) do
+    case active_streams(state, client_pid) do
+      [] ->
+        {:reply, :ok, remove_client(state, client_pid, true), :hibernate}
 
-    {ref, state} = pop_in(state.client_monitors[client_pid])
+      streams when state.protocol == :http2 ->
+        Enum.each(streams, &(:ok = Gun.cancel(state.conn_pid, &1)))
+        {:reply, :ok, remove_client(state, client_pid, true), :hibernate}
 
-    Process.demonitor(ref, [:flush])
+      _streams ->
+        {:stop, :normal, :ok, state}
+    end
+  end
 
-    timer =
-      if used_by == [] do
-        max_idle = Pleroma.Config.get([:connections_pool, :max_idle_time], 30_000)
-        Process.send_after(self(), :idle_close, max_idle)
-      else
-        nil
-      end
+  def handle_call({:register_stream, stream}, {client_pid, _}, state) do
+    {:reply, :ok, update_stream(state, client_pid, &MapSet.put(&1, stream)), :hibernate}
+  end
 
-    {:reply, :ok, %{state | timer: timer}, :hibernate}
+  def handle_call({:finish_stream, stream}, {client_pid, _}, state) do
+    {:reply, :ok, update_stream(state, client_pid, &MapSet.delete(&1, stream)), :hibernate}
+  end
+
+  def handle_call({:release_stream, stream}, {client_pid, _}, state) do
+    state = update_stream(state, client_pid, &MapSet.delete(&1, stream))
+    {:reply, :ok, remove_client(state, client_pid, true), :hibernate}
+  end
+
+  def handle_call({:cancel_stream, stream}, {client_pid, _}, %{protocol: :http2} = state) do
+    :ok = Gun.cancel(state.conn_pid, stream)
+    state = update_stream(state, client_pid, &MapSet.delete(&1, stream))
+    {:reply, :ok, remove_client(state, client_pid, true), :hibernate}
+  end
+
+  def handle_call({:cancel_stream, _stream}, _from, state) do
+    {:stop, :normal, :ok, state}
+  end
+
+  def handle_call(:reclaim_info, _from, %{clients: clients} = state)
+      when map_size(clients) == 0 do
+    {:reply, {:idle, state.crf, state.last_reference}, state, :hibernate}
+  end
+
+  def handle_call(:reclaim_info, _from, state) do
+    {:reply, :in_use, state, :hibernate}
+  end
+
+  def handle_call(:reclaim, _from, %{clients: clients} = state) when map_size(clients) == 0 do
+    {:stop, :normal, :reclaimed, state}
+  end
+
+  def handle_call(:reclaim, _from, state) do
+    {:reply, :in_use, state, :hibernate}
   end
 
   @impl true
-  def handle_info(:idle_close, state) do
-    # Gun monitors the owner process, and will close the connection automatically
-    # when it's terminated
+  def handle_info({:idle_close, token}, %{timer: {_timer_ref, token}, clients: clients} = state)
+      when map_size(clients) == 0 do
+    # Gun monitors the owner process, and will close the connection automatically.
     {:stop, :normal, state}
   end
 
+  def handle_info({:idle_close, _token}, state), do: {:noreply, state, :hibernate}
+
   @impl true
-  def handle_info({:gun_up, _pid, _protocol}, state) do
-    {:noreply, state, :hibernate}
+  def handle_info({:gun_up, _pid, protocol}, state) do
+    {:noreply, %{state | protocol: protocol}, :hibernate}
   end
 
-  # Gracefully shutdown if the connection got closed without any streams left
+  @impl true
+  def handle_info({:gun_error, conn_pid, stream, _reason}, %{conn_pid: conn_pid} = state) do
+    {:noreply, delete_stream(state, stream), :hibernate}
+  end
+
+  @impl true
+  def handle_info({:gun_down, _pid, _protocol, _reason, _streams}, %{proxied: true} = state) do
+    {:stop, :normal, state}
+  end
+
+  # Gracefully shutdown if the connection got closed without any streams left.
   @impl true
   def handle_info({:gun_down, _pid, _protocol, _reason, []}, state) do
     {:stop, :normal, state}
   end
 
-  # Otherwise, wait for retry
+  # Otherwise, wait for retry.
   @impl true
   def handle_info({:gun_down, _pid, _protocol, _reason, _killed_streams}, state) do
     {:noreply, state, :hibernate}
   end
 
   @impl true
-  def handle_info({:DOWN, _ref, :process, pid, reason}, state) do
-    :telemetry.execute(
-      [:pleroma, :connection_pool, :client, :dead],
-      %{client_pid: pid, reason: reason},
-      %{key: state.key}
-    )
+  def handle_info({:DOWN, ref, :process, pid, reason}, state) do
+    case state.clients[pid] do
+      %{monitor: ^ref} ->
+        :telemetry.execute(
+          [:pleroma, :connection_pool, :client, :dead],
+          %{client_pid: pid, reason: reason},
+          %{key: state.key}
+        )
 
-    handle_cast({:remove_client, pid}, state)
+        handle_dead_client(state, pid)
+
+      _ ->
+        {:noreply, state, :hibernate}
+    end
+  end
+
+  defp add_client(state, client_pid) do
+    update_in(state.clients, fn clients ->
+      case clients[client_pid] do
+        nil ->
+          Map.put(clients, client_pid, %{
+            count: 1,
+            monitor: Process.monitor(client_pid),
+            streams: MapSet.new()
+          })
+
+        client ->
+          Map.put(clients, client_pid, %{client | count: client.count + 1})
+      end
+    end)
+  end
+
+  defp handle_dead_client(state, client_pid) do
+    streams = active_streams(state, client_pid)
+
+    cond do
+      streams == [] ->
+        {:noreply, remove_client(state, client_pid, false, true), :hibernate}
+
+      state.protocol == :http2 ->
+        Enum.each(streams, &(:ok = Gun.cancel(state.conn_pid, &1)))
+        {:noreply, remove_client(state, client_pid, false, true), :hibernate}
+
+      true ->
+        {:stop, :normal, state}
+    end
+  end
+
+  defp active_streams(state, client_pid) do
+    case state.clients[client_pid] do
+      %{streams: streams} -> MapSet.to_list(streams)
+      nil -> []
+    end
+  end
+
+  defp update_stream(state, client_pid, update) do
+    update_in(state.clients, fn clients ->
+      case clients[client_pid] do
+        nil -> clients
+        client -> Map.put(clients, client_pid, %{client | streams: update.(client.streams)})
+      end
+    end)
+  end
+
+  defp delete_stream(state, stream) do
+    update_in(state.clients, fn clients ->
+      Map.new(clients, fn {pid, client} ->
+        {pid, %{client | streams: MapSet.delete(client.streams, stream)}}
+      end)
+    end)
+  end
+
+  defp remove_client(state, client_pid, demonitor, all \\ false) do
+    case state.clients[client_pid] do
+      nil ->
+        state
+
+      %{count: count} = client when count > 1 and not all ->
+        put_in(state.clients[client_pid], %{client | count: count - 1})
+
+      client ->
+        if demonitor, do: Process.demonitor(client.monitor, [:flush])
+        state = update_in(state.clients, &Map.delete(&1, client_pid))
+
+        if map_size(state.clients) == 0, do: schedule_idle_close(state), else: state
+    end
+  end
+
+  defp cancel_idle_timer(%{timer: nil} = state), do: state
+
+  defp cancel_idle_timer(%{timer: {timer_ref, _token}} = state) do
+    Process.cancel_timer(timer_ref)
+    %{state | timer: nil}
+  end
+
+  defp schedule_idle_close(state) do
+    max_idle = Pleroma.Config.get([:connections_pool, :max_idle_time], 30_000)
+    token = make_ref()
+    timer_ref = Process.send_after(self(), {:idle_close, token}, max_idle)
+    %{state | timer: {timer_ref, token}}
   end
 
   # LRFU policy: https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.1478
diff --git a/lib/pleroma/gun/connection_pool/worker_supervisor.ex b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
index b9dedf61e..2c60bea8f 100644
--- a/lib/pleroma/gun/connection_pool/worker_supervisor.ex
+++ b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
@@ -26,7 +26,14 @@ defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do
   def start_worker(opts, true) do
     case DynamicSupervisor.start_child(__MODULE__, {Worker, opts}) do
       {:error, :max_children} ->
-        :telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts})
+        [key | _] = opts
+
+        :telemetry.execute(
+          [:pleroma, :connection_pool, :provision_failure],
+          %{},
+          %{key: key}
+        )
+
         {:error, :pool_full}
 
       res ->
diff --git a/lib/pleroma/http/adapter/gun.ex b/lib/pleroma/http/adapter/gun.ex
new file mode 100644
index 000000000..400692790
--- /dev/null
+++ b/lib/pleroma/http/adapter/gun.ex
@@ -0,0 +1,207 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.HTTP.Adapter.Gun do
+  @behaviour Tesla.Adapter
+
+  alias Pleroma.Gun.ConnectionPool
+  alias Tesla.Multipart
+
+  @default_timeout 1_000
+
+  @impl Tesla.Adapter
+  def call(env, opts) do
+    adapter_opts =
+      Tesla.Adapter.opts(
+        [close_conn: true, body_as: :plain, send_body: :at_once, receive: true],
+        env,
+        opts
+      )
+      |> Map.new()
+
+    with {:ok, status, headers, body} <- request(env, adapter_opts) do
+      env = %{env | status: status, headers: format_headers(headers), body: body}
+      {:ok, put_stream_ref(env, body)}
+    end
+  end
+
+  defp put_stream_ref(env, %{stream: stream}) do
+    put_in(env.opts[:adapter][:stream], stream)
+  end
+
+  defp put_stream_ref(env, _body), do: env
+
+  defp request(env, %{conn: conn, tunnel: tunnel} = opts) do
+    uri = URI.parse(Tesla.build_url(env))
+    path = Tesla.Adapter.Shared.prepare_path(uri.path, uri.query)
+    method = Tesla.Adapter.Shared.format_method(env.method)
+    {headers, body, send_body} = prepare_body(env.headers, env.body, opts[:send_body])
+    request_opts = request_opts(opts[:reply_to], tunnel)
+    stream = open_stream(conn, method, path, headers, body, request_opts, send_body)
+    :ok = ConnectionPool.register_stream(conn, stream)
+    :ok = send_stream_body(conn, stream, body, send_body)
+    response = read_response(conn, stream, opts)
+
+    case response do
+      {:error, reason} ->
+        ConnectionPool.cancel_stream(conn, stream)
+        {:error, {:gun_stream_error, reason}}
+
+      response ->
+        unless opts[:body_as] in [:chunks, :stream] and stream_body?(response) do
+          :ok = ConnectionPool.finish_stream(conn, stream)
+        end
+
+        if opts[:close_conn] and opts[:body_as] not in [:stream, :chunks] do
+          :gun.close(conn)
+        end
+
+        response
+    end
+  end
+
+  defp stream_body?({:ok, _status, _headers, %{stream: _stream}}), do: true
+  defp stream_body?({:ok, _status, _headers, %Stream{}}), do: true
+  defp stream_body?(_response), do: false
+
+  defp request_opts(reply_to, nil), do: %{reply_to: reply_to || self()}
+
+  defp request_opts(reply_to, tunnel) do
+    %{reply_to: reply_to || self(), tunnel: tunnel}
+  end
+
+  defp prepare_body(headers, %Multipart{} = multipart, _send_body) do
+    {format_headers(headers ++ Multipart.headers(multipart)), Multipart.body(multipart), :stream}
+  end
+
+  defp prepare_body(headers, body, _send_body)
+       when is_struct(body, Stream) or is_function(body) do
+    {format_headers(headers), body, :stream}
+  end
+
+  defp prepare_body(headers, body, send_body) do
+    {format_headers(headers), body || "", send_body}
+  end
+
+  defp open_stream(conn, method, path, headers, _body, request_opts, :stream) do
+    :gun.headers(conn, method, path, headers, request_opts)
+  end
+
+  defp open_stream(conn, method, path, headers, body, request_opts, :at_once) do
+    :gun.request(conn, method, path, headers, body, request_opts)
+  end
+
+  defp send_stream_body(conn, stream, body, :stream) do
+    try do
+      for data <- body, do: :ok = :gun.data(conn, stream, :nofin, data)
+      :gun.data(conn, stream, :fin, "")
+    catch
+      kind, reason ->
+        ConnectionPool.cancel_stream(conn, stream)
+        :erlang.raise(kind, reason, __STACKTRACE__)
+    end
+  end
+
+  defp send_stream_body(_conn, _stream, _body, :at_once), do: :ok
+
+  defp read_response(conn, stream, opts) do
+    receive? = opts[:receive]
+
+    receive do
+      {:gun_response, ^conn, ^stream, :fin, status, headers} ->
+        {:ok, status, headers, ""}
+
+      {:gun_response, ^conn, ^stream, :nofin, status, headers} ->
+        format_response(conn, stream, opts, status, headers, opts[:body_as])
+
+      {:gun_up, ^conn, _protocol} when receive? ->
+        read_response(conn, stream, opts)
+
+      {:gun_error, ^conn, reason} ->
+        {:error, reason}
+
+      {:gun_error, ^conn, ^stream, reason} ->
+        {:error, reason}
+
+      {:gun_down, ^conn, _protocol, _reason, _killed_streams} when receive? ->
+        read_response(conn, stream, opts)
+
+      {:DOWN, _ref, :process, ^conn, reason} ->
+        {:error, reason}
+    after
+      opts[:timeout] || @default_timeout -> {:error, :recv_response_timeout}
+    end
+  end
+
+  defp format_response(conn, stream, opts, status, headers, :plain) do
+    case read_body(conn, stream, opts) do
+      {:ok, body} ->
+        {:ok, status, headers, body}
+
+      {:error, error} ->
+        :ok = :gun.flush(stream)
+        {:error, error}
+    end
+  end
+
+  defp format_response(conn, stream, opts, status, headers, :stream) do
+    body =
+      Stream.resource(
+        fn -> :reading end,
+        fn
+          :reading ->
+            case Tesla.Adapter.Gun.read_chunk(conn, stream, opts) do
+              {:nofin, part} -> {[part], :reading}
+              {:fin, part} -> {[part], :done}
+              {:error, reason} -> raise "Gun stream failed: #{inspect(reason)}"
+            end
+
+          :done ->
+            {:halt, :done}
+        end,
+        fn _state ->
+          if opts[:close_conn], do: :gun.close(conn)
+        end
+      )
+
+    {:ok, status, headers, body}
+  end
+
+  defp format_response(conn, stream, opts, status, headers, :chunks) do
+    {:ok, status, headers, %{pid: conn, stream: stream, opts: Map.to_list(opts)}}
+  end
+
+  defp read_body(conn, stream, opts, acc \\ "") do
+    receive do
+      {:gun_data, ^conn, ^stream, :fin, body} ->
+        append_body(acc, body, opts[:max_body])
+
+      {:gun_data, ^conn, ^stream, :nofin, body} ->
+        with {:ok, acc} <- append_body(acc, body, opts[:max_body]) do
+          read_body(conn, stream, opts, acc)
+        end
+
+      {:gun_error, ^conn, ^stream, reason} ->
+        {:error, reason}
+
+      {:DOWN, _ref, :process, ^conn, reason} ->
+        {:error, reason}
+    after
+      opts[:timeout] || @default_timeout -> {:error, :recv_body_timeout}
+    end
+  end
+
+  defp append_body(acc, part, nil), do: {:ok, acc <> part}
+
+  defp append_body(acc, part, limit) do
+    body = acc <> part
+    if byte_size(body) <= limit, do: {:ok, body}, else: {:error, :body_too_large}
+  end
+
+  defp format_headers(headers) do
+    Enum.map(headers, fn {key, value} ->
+      {String.downcase(to_string(key)), to_string(value)}
+    end)
+  end
+end
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index 30ba26765..9ac87adb5 100644
--- a/lib/pleroma/http/adapter_helper/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -48,10 +48,10 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
     Keyword.put(opts, :timeout, recv_timeout)
   end
 
-  # Gun uses [body_as: :stream]
+  # Keep the pool lease until the caller consumes or cancels the body.
   defp maybe_stream(opts) do
     case Keyword.pop(opts, :stream, nil) do
-      {true, opts} -> Keyword.put(opts, :body_as, :stream)
+      {true, opts} -> Keyword.put(opts, :body_as, :chunks)
       {_, opts} -> opts
     end
   end
diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index c7ee47c6e..3ff1e9d08 100644
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -110,12 +110,8 @@ defmodule Pleroma.ReverseProxy do
       end
 
     with {:ok, nil} <- @cachex.get(:failed_proxy_url_cache, url),
-         {:ok, code, headers, client} <- request(method, url, req_headers, client_opts),
-         :ok <-
-           header_length_constraint(
-             headers,
-             Keyword.get(opts, :max_body_length, @max_body_length)
-           ) do
+         {:ok, code, headers, client} <-
+           request_with_constraints(method, url, req_headers, client_opts, opts) do
       response(conn, client, url, code, headers, opts)
     else
       {:ok, true} ->
@@ -170,7 +166,8 @@ defmodule Pleroma.ReverseProxy do
       {:ok, code, headers} when code in @valid_resp_codes ->
         {:ok, code, downcase_headers(headers)}
 
-      {:ok, code, _, _} ->
+      {:ok, code, _, client} ->
+        client().close(client)
         {:error, {:invalid_http_response, code}}
 
       {:ok, code, _} ->
@@ -181,6 +178,26 @@ defmodule Pleroma.ReverseProxy do
     end
   end
 
+  defp request_with_constraints(method, url, headers, client_opts, opts) do
+    case request(method, url, headers, client_opts) do
+      {:ok, _code, headers, client} = response ->
+        case header_length_constraint(
+               headers,
+               Keyword.get(opts, :max_body_length, @max_body_length)
+             ) do
+          :ok ->
+            response
+
+          error ->
+            client().close(client)
+            error
+        end
+
+      response ->
+        response
+    end
+  end
+
   defp response(conn, client, url, status, headers, opts) do
     Logger.debug("#{__MODULE__} #{status} #{url} #{inspect(headers)}")
 
@@ -406,7 +423,7 @@ defmodule Pleroma.ReverseProxy do
 
   defp header_length_constraint(_, _), do: :ok
 
-  defp body_size_constraint(size, limit) when is_integer(limit) and limit > 0 and size >= limit do
+  defp body_size_constraint(size, limit) when is_integer(limit) and limit > 0 and size > limit do
     {:error, :body_too_large}
   end
 
diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex
index 4596d7a7f..24168e367 100644
--- a/lib/pleroma/reverse_proxy/client/tesla.ex
+++ b/lib/pleroma/reverse_proxy/client/tesla.ex
@@ -45,8 +45,8 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do
   @impl true
   @spec stream_body(map()) ::
           {:ok, binary(), map()} | {:error, atom() | String.t()} | :done | no_return()
-  def stream_body(%{pid: pid, fin: true}) do
-    ConnectionPool.release_conn(pid)
+  def stream_body(%{pid: pid, stream: stream, fin: true}) do
+    ConnectionPool.release_stream(pid, stream)
     :done
   end
 
@@ -70,6 +70,10 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do
 
   @impl true
   @spec close(map) :: :ok | no_return()
+  def close(%{pid: pid, stream: stream}) do
+    ConnectionPool.cancel_stream(pid, stream)
+  end
+
   def close(%{pid: pid}) do
     ConnectionPool.release_conn(pid)
   end
diff --git a/lib/pleroma/telemetry/logger.ex b/lib/pleroma/telemetry/logger.ex
index 31ce3cc20..e0522e869 100644
--- a/lib/pleroma/telemetry/logger.ex
+++ b/lib/pleroma/telemetry/logger.ex
@@ -55,8 +55,8 @@ defmodule Pleroma.Telemetry.Logger do
 
   def handle_event(
         [:pleroma, :connection_pool, :provision_failure],
-        %{opts: [key | _]},
         _,
+        %{key: key},
         _
       ) do
     Logger.debug(fn ->
diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/tesla/middleware/connection_pool.ex
index de74270f8..c2d8c5bb8 100644
--- a/lib/pleroma/tesla/middleware/connection_pool.ex
+++ b/lib/pleroma/tesla/middleware/connection_pool.ex
@@ -12,25 +12,38 @@ defmodule Pleroma.Tesla.Middleware.ConnectionPool do
   alias Pleroma.Gun.ConnectionPool
 
   @impl Tesla.Middleware
-  def call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
+  def call(%Tesla.Env{opts: opts} = env, next, middleware_opts) do
+    if opts[:adapter][:body_as] == :stream do
+      {:error, :pooled_streaming_requires_chunks}
+    else
+      do_call(env, next, middleware_opts)
+    end
+  end
+
+  defp do_call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
     uri = URI.parse(url)
 
     # Avoid leaking connections when the middleware is called twice
     # with body_as: :chunks. We assume only the middleware can set
     # opts[:adapter][:conn]
-    if opts[:adapter][:conn] do
-      ConnectionPool.release_conn(opts[:adapter][:conn])
-    end
+    cleanup_previous_request(env)
 
     case ConnectionPool.get_conn(uri, opts[:adapter]) do
       {:ok, conn_pid} ->
-        adapter_opts = Keyword.merge(opts[:adapter], conn: conn_pid, close_conn: false)
+        tunnel = ConnectionPool.tunnel_ref(conn_pid)
+
+        adapter_opts =
+          opts[:adapter]
+          |> Keyword.drop([:conn, :stream, :tunnel])
+          |> Keyword.merge(conn: conn_pid, close_conn: false, tunnel: tunnel)
+
         opts = Keyword.put(opts, :adapter, adapter_opts)
         env = %{env | opts: opts}
+        next = use_pool_adapter(next)
 
         case Tesla.run(env, next) do
           {:ok, env} ->
-            unless opts[:adapter][:body_as] == :chunks do
+            unless opts[:adapter][:body_as] == :chunks and chunk_client?(env.body) do
               ConnectionPool.release_conn(conn_pid)
               {_, res} = pop_in(env.opts[:adapter][:conn])
               {:ok, res}
@@ -38,8 +51,11 @@ defmodule Pleroma.Tesla.Middleware.ConnectionPool do
               {:ok, env}
             end
 
+          {:error, {:gun_stream_error, reason}} ->
+            {:error, reason}
+
           err ->
-            ConnectionPool.release_conn(conn_pid)
+            ConnectionPool.discard_conn(conn_pid)
             err
         end
 
@@ -47,4 +63,34 @@ defmodule Pleroma.Tesla.Middleware.ConnectionPool do
         err
     end
   end
+
+  defp cleanup_previous_request(%Tesla.Env{
+         body: %{pid: pid, stream: stream},
+         opts: opts
+       }) do
+    if opts[:adapter][:conn], do: ConnectionPool.cancel_stream(pid, stream)
+  end
+
+  defp cleanup_previous_request(%Tesla.Env{opts: opts}) do
+    conn = opts[:adapter][:conn]
+    stream = opts[:adapter][:stream]
+
+    cond do
+      conn && stream -> ConnectionPool.cancel_stream(conn, stream)
+      conn -> ConnectionPool.release_conn(conn)
+      true -> :ok
+    end
+  end
+
+  defp chunk_client?(%{pid: pid, stream: stream}) when is_pid(pid) and not is_nil(stream),
+    do: true
+
+  defp chunk_client?(_body), do: false
+
+  defp use_pool_adapter(next) do
+    List.update_at(next, -1, fn
+      {Tesla.Adapter.Gun, function, args} -> {Pleroma.HTTP.Adapter.Gun, function, args}
+      adapter -> adapter
+    end)
+  end
 end
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 963076510..7b4ca677f 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -4,6 +4,8 @@
 
 defmodule Pleroma.Web.RichMedia.Helpers do
   alias Pleroma.Config
+  alias Pleroma.Gun.ConnectionPool
+  alias Pleroma.ReverseProxy.Client.Tesla, as: TeslaClient
 
   require Logger
 
@@ -19,12 +21,30 @@ defmodule Pleroma.Web.RichMedia.Helpers do
   end
 
   defp stream(url) do
-    with {_, {:ok, %Tesla.Env{status: 200, body: stream_body, headers: headers}}} <-
-           {:get, Pleroma.HTTP.get(url, req_headers(), http_options())},
-         {_, :ok} <- {:content_type, check_content_type(headers)},
-         {_, :ok} <- {:content_length, check_content_length(headers)},
-         {:read_stream, {:ok, body}} <- {:read_stream, read_stream(stream_body)} do
-      {:ok, body}
+    case Pleroma.HTTP.get(url, req_headers(), http_options()) do
+      {:ok, %Tesla.Env{status: 200, body: stream_body, headers: headers}} ->
+        result =
+          try do
+            with {_, :ok} <- {:content_type, check_content_type(headers)},
+                 {_, :ok} <- {:content_length, check_content_length(headers)},
+                 {:read_stream, {:ok, body}} <- {:read_stream, read_stream(stream_body)} do
+              {:ok, body}
+            end
+          rescue
+            exception ->
+              cleanup_stream(stream_body, :error)
+              reraise exception, __STACKTRACE__
+          end
+
+        cleanup_stream(stream_body, result)
+        result
+
+      {:ok, %Tesla.Env{body: stream_body}} = response ->
+        cleanup_stream(stream_body, :rejected)
+        {:get, response}
+
+      response ->
+        {:get, response}
     end
   end
 
@@ -95,6 +115,10 @@ defmodule Pleroma.Web.RichMedia.Helpers do
     end
   end
 
+  defp read_stream(%{pid: pid, stream: stream, opts: opts}) do
+    read_chunks(pid, stream, opts, "", 0, Keyword.get(http_options(), :max_body))
+  end
+
   defp read_stream(stream) do
     max_body = Keyword.get(http_options(), :max_body)
 
@@ -117,6 +141,33 @@ defmodule Pleroma.Web.RichMedia.Helpers do
     end
   end
 
+  defp read_chunks(pid, stream, opts, acc, total_bytes, max_body) do
+    case Tesla.Adapter.Gun.read_chunk(pid, stream, opts) do
+      {fin, chunk} when fin in [:fin, :nofin] ->
+        total_bytes = total_bytes + byte_size(chunk)
+
+        cond do
+          total_bytes > max_body ->
+            :error
+
+          fin == :fin ->
+            {:ok, acc <> chunk}
+
+          true ->
+            read_chunks(pid, stream, opts, acc <> chunk, total_bytes, max_body)
+        end
+
+      {:error, _reason} ->
+        :error
+    end
+  end
+
+  defp cleanup_stream(%{pid: pid, stream: stream}, {:ok, _body}),
+    do: ConnectionPool.release_stream(pid, stream)
+
+  defp cleanup_stream(%{pid: _pid} = client, _result), do: TeslaClient.close(client)
+  defp cleanup_stream(_stream, _result), do: :ok
+
   defp http_options do
     [
       pool: :rich_media,
diff --git a/test/pleroma/gun/conn_test.exs b/test/pleroma/gun/conn_test.exs
new file mode 100644
index 000000000..79ea7b33f
--- /dev/null
+++ b/test/pleroma/gun/conn_test.exs
@@ -0,0 +1,144 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Gun.ConnTest do
+  use ExUnit.Case
+
+  import Mox
+
+  alias Pleroma.Gun.Conn
+
+  setup :verify_on_exit!
+
+  setup do
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http} end)
+    stub(Pleroma.GunMock, :await_tunnel_up, fn _, _, _ -> {:ok, :http2} end)
+    stub(Pleroma.GunMock, :close, fn _ -> :ok end)
+
+    :ok
+  end
+
+  test "selects the direct transport from the URI scheme" do
+    expect(Pleroma.GunMock, :open, 2, fn
+      ~c"example.com", 8443, %{transport: :tls, tls_opts: tls_opts} ->
+        assert tls_opts[:verify] == :verify_peer
+        {:ok, spawn_link(fn -> Process.sleep(:infinity) end)}
+
+      ~c"example.com", 443, %{transport: :tcp} ->
+        {:ok, spawn_link(fn -> Process.sleep(:infinity) end)}
+    end)
+
+    assert {:ok, https_conn, :http, nil} = Conn.open(URI.parse("https://example.com:8443"), [])
+    assert {:ok, http_conn, :http, nil} = Conn.open(URI.parse("http://example.com:443"), [])
+
+    stop_conn(https_conn)
+    stop_conn(http_conn)
+  end
+
+  test "passes authentication to an HTTP CONNECT proxy" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :open, fn ~c"proxy.example", 8080, opts ->
+      assert opts.transport == :tcp
+      refute Map.has_key?(opts, :tls_opts)
+      {:ok, conn}
+    end)
+
+    expect(Pleroma.GunMock, :connect, fn ^conn, connect_opts ->
+      assert connect_opts.username == "alice"
+      assert connect_opts.password == "secret"
+      assert connect_opts.transport == :tls
+      assert connect_opts.protocols == [:http2, :http]
+      stream
+    end)
+
+    expect(Pleroma.GunMock, :await, fn ^conn, ^stream -> {:response, :fin, 200, []} end)
+
+    assert {:ok, ^conn, :http2, ^stream} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {~c"proxy.example", 8080},
+               proxy_auth: {"alice", "secret"}
+             )
+
+    stop_conn(conn)
+  end
+
+  test "uses separate TLS options for a TLS CONNECT proxy" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :open, fn ~c"proxy.example", 8443, opts ->
+      assert opts.transport == :tls
+      assert opts.tls_opts == [verify: :verify_none]
+      {:ok, conn}
+    end)
+
+    expect(Pleroma.GunMock, :connect, fn ^conn, _connect_opts -> stream end)
+    expect(Pleroma.GunMock, :await, fn ^conn, ^stream -> {:response, :fin, 200, []} end)
+
+    assert {:ok, ^conn, :http2, ^stream} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {~c"proxy.example", 8443},
+               transport: :tls,
+               proxy_tls_opts: [verify: :verify_none]
+             )
+
+    stop_conn(conn)
+  end
+
+  test "passes authentication and remote DNS destination to a SOCKS5 proxy" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+
+    expect(Pleroma.GunMock, :open, fn ~c"proxy.example", 1080, opts ->
+      assert opts.protocols == [:socks]
+      assert opts.transport == :tcp
+      assert opts.socks_opts.host == ~c"origin.example"
+      assert opts.socks_opts.port == 443
+      assert opts.socks_opts.auth == [{:username_password, "alice", "secret"}]
+      assert opts.socks_opts.transport == :tls
+      assert opts.socks_opts.protocols == [:http2, :http]
+      refute Map.has_key?(opts, :tls_opts)
+      {:ok, conn}
+    end)
+
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :socks} end)
+
+    assert {:ok, ^conn, :http2, nil} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {:socks5, ~c"proxy.example", 1080},
+               proxy_auth: {"alice", "secret"}
+             )
+
+    stop_conn(conn)
+  end
+
+  test "closes a CONNECT socket when proxy authentication fails" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :open, fn _, _, _ -> {:ok, conn} end)
+    expect(Pleroma.GunMock, :connect, fn ^conn, _ -> stream end)
+    expect(Pleroma.GunMock, :await, fn ^conn, ^stream -> {:response, :nofin, 407, []} end)
+    expect(Pleroma.GunMock, :close, fn ^conn -> Process.exit(conn, :normal) end)
+
+    assert {:error, :proxy_auth_failed} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {~c"proxy.example", 8080},
+               proxy_auth: {"alice", "wrong"}
+             )
+  end
+
+  test "rejects SOCKS4 before opening a socket" do
+    assert {:error, :socks4_unsupported} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {:socks4, ~c"proxy.example", 1080}
+             )
+  end
+
+  defp stop_conn(conn) do
+    Process.unlink(conn)
+    Process.exit(conn, :kill)
+  end
+end
diff --git a/test/pleroma/gun/connection_pool_test.exs b/test/pleroma/gun/connection_pool_test.exs
index f3670760d..d9ebba2a8 100644
--- a/test/pleroma/gun/connection_pool_test.exs
+++ b/test/pleroma/gun/connection_pool_test.exs
@@ -11,8 +11,11 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
 
   defp gun_mock(_) do
     Pleroma.GunMock
-    |> stub(:open, fn _, _, _ -> Task.start_link(fn -> Process.sleep(100) end) end)
+    |> stub(:open, fn _, _, _ -> Task.start_link(fn -> Process.sleep(:infinity) end) end)
     |> stub(:await_up, fn _, _ -> {:ok, :http} end)
+    |> stub(:connect, fn _, _ -> make_ref() end)
+    |> stub(:await, fn _, _ -> {:response, :fin, 200, []} end)
+    |> stub(:await_tunnel_up, fn _, _, _ -> {:ok, :http2} end)
     |> stub(:set_owner, fn _, _ -> :ok end)
 
     :ok
@@ -20,40 +23,213 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
 
   setup :gun_mock
 
-  test "gives the same connection to 2 concurrent requests" do
-    Enum.map(
-      [
-        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200530163914.pdf",
-        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200528183427.pdf"
-      ],
-      fn uri ->
-        uri = URI.parse(uri)
-        task_parent = self()
+  test "opens sibling HTTP/1 connections while an existing connection is in use" do
+    uri = URI.parse("http://www.korean-books.com.kp/document.pdf")
 
-        Task.start_link(fn ->
-          {:ok, conn} = ConnectionPool.get_conn(uri, [])
-          ConnectionPool.release_conn(conn)
-          send(task_parent, conn)
-        end)
-      end
-    )
+    assert {:ok, first} = ConnectionPool.get_conn(uri, [])
+    assert {:ok, second} = ConnectionPool.get_conn(uri, [])
+    assert first != second
 
-    [pid, pid] =
-      for _ <- 1..2 do
-        receive do
-          pid -> pid
-        end
+    assert :ok = ConnectionPool.release_conn(first)
+    assert :ok = ConnectionPool.release_conn(second)
+  end
+
+  test "multiplexes concurrent HTTP/2 leases on one connection" do
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http2} end)
+    uri = URI.parse("https://h2.example/inbox")
+
+    assert {:ok, conn} = ConnectionPool.get_conn(uri, [])
+    assert {:ok, ^conn} = ConnectionPool.get_conn(uri, [])
+
+    assert :ok = ConnectionPool.release_conn(conn)
+    assert :ok = ConnectionPool.release_conn(conn)
+    assert Process.alive?(conn)
+  end
+
+  test "does not share connections across direct and authenticated proxy routes" do
+    uri = URI.parse("https://routes.example/inbox")
+
+    assert {:ok, direct} = ConnectionPool.get_conn(uri, [])
+
+    assert {:ok, proxied} =
+             ConnectionPool.get_conn(uri,
+               proxy: {~c"proxy.example", 8080},
+               proxy_auth: {"alice", "secret"}
+             )
+
+    assert {:ok, other_credentials} =
+             ConnectionPool.get_conn(uri,
+               proxy: {~c"proxy.example", 8080},
+               proxy_auth: {"bob", "different-secret"}
+             )
+
+    assert Enum.uniq([direct, proxied, other_credentials]) ==
+             [direct, proxied, other_credentials]
+
+    registry_dump = inspect(Registry.select(ConnectionPool, [{{:"$1", :_, :_}, [], [:"$1"]}]))
+    refute registry_dump =~ "secret"
+
+    Enum.each([direct, proxied, other_credentials], &ConnectionPool.release_conn/1)
+  end
+
+  test "coalesces concurrent cold HTTP/2 checkouts behind one connection" do
+    test_pid = self()
+
+    stub(Pleroma.GunMock, :await_up, fn _, _ ->
+      send(test_pid, {:awaiting_connection, self()})
+
+      receive do
+        :continue -> {:ok, :http2}
       end
+    end)
+
+    uri = URI.parse("https://cold-h2.example/inbox")
+
+    tasks =
+      for _ <- 1..10 do
+        Task.async(fn -> ConnectionPool.get_conn(uri, []) end)
+      end
+
+    assert_receive {:awaiting_connection, worker_pid}
+    refute_receive {:awaiting_connection, _other_worker}, 50
+    send(worker_pid, :continue)
+
+    assert [{:ok, conn}] = tasks |> Enum.map(&Task.await/1) |> Enum.uniq()
+    assert Process.alive?(conn)
+  end
+
+  test "shares a cold connection failure with concurrent waiters" do
+    test_pid = self()
+
+    stub(Pleroma.GunMock, :open, fn _, _, _ ->
+      send(test_pid, {:opening_connection, self()})
+
+      receive do
+        :fail -> {:error, :econnrefused}
+      end
+    end)
+
+    uri = URI.parse("https://unreachable.example/inbox")
+
+    tasks =
+      for _ <- 1..10 do
+        Task.async(fn -> ConnectionPool.get_conn(uri, []) end)
+      end
+
+    assert_receive {:opening_connection, worker_pid}
+    refute_receive {:opening_connection, _other_worker}, 50
+    send(worker_pid, :fail)
+
+    assert Enum.all?(tasks, fn task -> match?({:error, _reason}, Task.await(task)) end)
+    refute_receive {:opening_connection, _other_worker}, 50
+  end
+
+  test "bounds many-host workloads and closes released idle workers" do
+    clear_config([:connections_pool, :max_connections]) do
+      clear_config([:connections_pool, :max_connections], 25)
+      clear_config([:connections_pool, :max_idle_time], 5)
+      restart_worker_supervisor()
+
+      on_exit(&restart_worker_supervisor/0)
+    end
+
+    connections =
+      Enum.map(1..25, fn host_number ->
+        uri = URI.parse("https://host-#{host_number}.example/inbox")
+        assert {:ok, conn} = ConnectionPool.get_conn(uri, [])
+        conn
+      end)
+
+    assert DynamicSupervisor.count_children(Pleroma.Gun.ConnectionPool.WorkerSupervisor).active ==
+             25
+
+    assert {:error, :pool_full} =
+             ConnectionPool.get_conn(URI.parse("https://overflow.example/inbox"), [])
+
+    Enum.each(connections, &ConnectionPool.release_conn/1)
+
+    assert eventually(fn ->
+             DynamicSupervisor.count_children(Pleroma.Gun.ConnectionPool.WorkerSupervisor).active ==
+               0
+           end)
+  end
+
+  test "does not reclaim a worker that became active after idle selection" do
+    uri = URI.parse("https://reclaim-race.example/inbox")
+
+    assert {:ok, conn} = ConnectionPool.get_conn(uri, [])
+    assert :ok = ConnectionPool.release_conn(conn)
+    worker = worker_for_conn(conn)
+
+    assert {:idle, _crf, _last_reference} = GenServer.call(worker, :reclaim_info)
+    assert {:ok, ^conn} = ConnectionPool.get_conn(uri, [])
+    assert :in_use = GenServer.call(worker, :reclaim)
+    assert Process.alive?(worker)
+
+    assert :ok = ConnectionPool.release_conn(conn)
+  end
+
+  test "cancels one HTTP/2 stream without discarding the connection" do
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http2} end)
+    uri = URI.parse("https://cancel-h2.example/inbox")
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :cancel, fn conn, ^stream when is_pid(conn) -> :ok end)
+
+    assert {:ok, conn} = ConnectionPool.get_conn(uri, [])
+    assert :ok = ConnectionPool.register_stream(conn, stream)
+    assert :ok = ConnectionPool.cancel_stream(conn, stream)
+    assert {:ok, ^conn} = ConnectionPool.get_conn(uri, [])
+    assert :ok = ConnectionPool.release_conn(conn)
+  end
+
+  test "ignores a stale Gun error after cancelling an HTTP/2 stream" do
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http2} end)
+    uri = URI.parse("https://stale-cancel-h2.example/inbox")
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :cancel, fn conn, ^stream when is_pid(conn) -> :ok end)
+
+    assert {:ok, conn} = ConnectionPool.get_conn(uri, [])
+    worker = worker_for_conn(conn)
+    assert :ok = ConnectionPool.register_stream(conn, stream)
+    assert :ok = ConnectionPool.cancel_stream(conn, stream)
+
+    send(worker, {:gun_error, conn, stream, {:badstate, "The stream cannot be found."}})
+    assert %{clients: %{}} = :sys.get_state(worker)
+    assert Process.alive?(worker)
+
+    assert {:ok, ^conn} = ConnectionPool.get_conn(uri, [])
+    assert :ok = ConnectionPool.release_conn(conn)
+  end
+
+  test "stops an HTTP/1 worker when a client dies with an active stream" do
+    uri = URI.parse("http://dead-stream.example/media")
+    parent = self()
+
+    client =
+      spawn(fn ->
+        {:ok, conn} = ConnectionPool.get_conn(uri, [])
+        :ok = ConnectionPool.register_stream(conn, make_ref())
+        send(parent, {:active_stream, conn})
+        Process.sleep(:infinity)
+      end)
+
+    assert_receive {:active_stream, conn}
+    worker = worker_for_conn(conn)
+    Process.exit(client, :kill)
+
+    assert eventually(fn -> not Process.alive?(worker) end)
   end
 
   test "connection limit is respected with concurrent requests" do
     clear_config([:connections_pool, :max_connections]) do
       clear_config([:connections_pool, :max_connections], 1)
       # The supervisor needs a reboot to apply the new config setting
-      Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
+      restart_worker_supervisor()
 
       on_exit(fn ->
-        Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
+        restart_worker_supervisor()
       end)
     end
 
@@ -96,4 +272,41 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
         |> Enum.sort()
     end)
   end
+
+  defp restart_worker_supervisor do
+    supervisor = Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor)
+    monitor = Process.monitor(supervisor)
+    Process.exit(supervisor, :kill)
+
+    assert_receive {:DOWN, ^monitor, :process, ^supervisor, :killed}
+
+    assert eventually(fn ->
+             case Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor) do
+               pid when is_pid(pid) -> pid != supervisor and Process.alive?(pid)
+               nil -> false
+             end
+           end)
+  end
+
+  defp worker_for_conn(conn) do
+    [worker] =
+      Registry.select(ConnectionPool, [
+        {{:_, :"$1", {:"$2", :_}}, [{:==, :"$2", conn}], [:"$1"]}
+      ])
+
+    worker
+  end
+
+  defp eventually(predicate, attempts \\ 50)
+
+  defp eventually(_predicate, 0), do: false
+
+  defp eventually(predicate, attempts) do
+    if predicate.() do
+      true
+    else
+      Process.sleep(10)
+      eventually(predicate, attempts - 1)
+    end
+  end
 end
diff --git a/test/pleroma/http/adapter_helper/gun_test.exs b/test/pleroma/http/adapter_helper/gun_test.exs
index 568fd6fb3..1c97daf99 100644
--- a/test/pleroma/http/adapter_helper/gun_test.exs
+++ b/test/pleroma/http/adapter_helper/gun_test.exs
@@ -73,5 +73,11 @@ defmodule Pleroma.HTTP.AdapterHelper.GunTest do
 
       assert opts[:proxy] == {~c"example.com", 4321}
     end
+
+    test "uses managed chunks for streamed responses" do
+      opts = Gun.options([stream: true], URI.parse("https://example.com"))
+
+      assert opts[:body_as] == :chunks
+    end
   end
 end
diff --git a/test/pleroma/http/gun_integration_test.exs b/test/pleroma/http/gun_integration_test.exs
new file mode 100644
index 000000000..ca6f7bbc1
--- /dev/null
+++ b/test/pleroma/http/gun_integration_test.exs
@@ -0,0 +1,671 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.HTTP.GunIntegrationTest do
+  use ExUnit.Case, async: false
+  use Pleroma.Tests.Helpers
+
+  alias Pleroma.Tesla.Middleware.ConnectionPool
+
+  setup do
+    clear_config([Pleroma.Gun], Pleroma.Gun.API)
+    clear_config([:connections_pool, :max_idle_time], 1_000)
+
+    origin = start_tls_origin(self())
+    connect_proxy = start_connect_proxy(self())
+    socks_proxy = start_socks5_proxy(self())
+
+    on_exit(fn ->
+      Process.sleep(20)
+      stop_server(socks_proxy)
+      stop_server(connect_proxy)
+      stop_server(origin)
+    end)
+
+    {:ok, origin: origin, connect_proxy: connect_proxy, socks_proxy: socks_proxy}
+  end
+
+  test "requests HTTPS directly on a non-standard port", %{origin: origin} do
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(origin.base_url <> "/final")
+  end
+
+  test "follows redirects through an authenticated CONNECT proxy", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} =
+             request(origin.base_url <> "/redirect", proxy_opts, true)
+
+    expected = "Basic " <> Base.encode64("alice:secret")
+    assert_receive {:connect_proxy, ^expected, "127.0.0.1", origin_port}
+    assert origin_port == origin.port
+  end
+
+  test "requests through an authenticated CONNECT proxy", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    result = request(origin.base_url <> "/final", proxy_opts)
+
+    expected = "Basic " <> Base.encode64("alice:secret")
+    assert_receive {:connect_proxy, ^expected, "127.0.0.1", origin_port}
+    assert origin_port == origin.port
+    assert worker_protocol(origin.port) == :http
+    assert_receive {:origin_request, "/final"}
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = result
+  end
+
+  test "opens a request-ready authenticated CONNECT tunnel", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    uri = URI.parse(origin.base_url <> "/final")
+
+    opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"},
+      tls_opts: [verify: :verify_none],
+      connect_timeout: 2_000
+    ]
+
+    assert {:ok, conn, :http, tunnel} = Pleroma.Gun.Conn.open(uri, opts)
+    stream = :gun.get(conn, "/final", [], %{tunnel: tunnel})
+    assert {:response, :nofin, 200, _headers} = :gun.await(conn, stream, 2_000)
+    assert {:ok, "ok"} = :gun.await_body(conn, stream, 2_000)
+    :gun.close(conn)
+  end
+
+  test "streams chunks through an authenticated CONNECT tunnel", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    assert {:ok, %Tesla.Env{status: 200, body: client}} =
+             request_chunks(origin.base_url <> "/chunks", proxy_opts)
+
+    assert collect_chunks(client) == "hello"
+    assert :ok = Pleroma.Gun.ConnectionPool.release_conn(client.pid)
+  end
+
+  test "discards an unfinished HTTP/1 redirect stream before following it", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    assert {:ok, %Tesla.Env{status: 200, body: client}} =
+             request_chunks(origin.base_url <> "/redirect_chunks", proxy_opts, true)
+
+    assert collect_chunks(client) == "hello"
+    assert :ok = Pleroma.Gun.ConnectionPool.release_conn(client.pid)
+
+    expected = "Basic " <> Base.encode64("alice:secret")
+    assert_receive {:connect_proxy, ^expected, "127.0.0.1", _port}
+    assert_receive {:connect_proxy, ^expected, "127.0.0.1", _port}
+  end
+
+  test "uploads multipart bodies through an authenticated CONNECT tunnel", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    multipart = Tesla.Multipart.new() |> Tesla.Multipart.add_field("name", "value")
+
+    assert {:ok, %Tesla.Env{status: 200}} =
+             request_multipart(origin.base_url <> "/upload", multipart, proxy_opts)
+
+    assert_receive {:origin_headers, "/upload", headers}
+    assert String.downcase(headers) =~ "content-type: multipart/form-data;"
+    assert_receive {:origin_body, "/upload", body}
+    assert body =~ "name=\"name\""
+    assert body =~ "value"
+  end
+
+  test "uploads streamed bodies through an authenticated CONNECT tunnel", %{
+    origin: origin,
+    connect_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    body = Stream.map(["streamed", "-body"], & &1)
+
+    assert {:ok, %Tesla.Env{status: 200}} =
+             request_stream(origin.base_url <> "/upload", body, proxy_opts)
+
+    assert_receive {:origin_body, "/upload", "streamed-body"}
+  end
+
+  test "discards a partial HTTP/1 upload when body enumeration raises", %{origin: origin} do
+    body =
+      Stream.map(["partial", "raise"], fn
+        "raise" -> raise "upload failed"
+        part -> part
+      end)
+
+    assert_raise RuntimeError, "upload failed", fn ->
+      request_stream(origin.base_url <> "/upload", body, [])
+    end
+
+    assert_receive {:origin_headers, "/upload", _headers}
+    assert worker_protocol(origin.port) == nil
+
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(origin.base_url <> "/final")
+  end
+
+  test "requests through authenticated SOCKS5 with proxy-side DNS", %{
+    origin: origin,
+    socks_proxy: proxy
+  } do
+    proxy_opts = [
+      proxy: {:socks5, ~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    url = "https://localhost:#{origin.port}/final"
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(url, proxy_opts)
+
+    assert_receive {:socks5_proxy, "alice", "secret", "localhost", origin_port}
+    assert origin_port == origin.port
+  end
+
+  defp request(url, proxy_opts \\ [], follow_redirects \\ false) do
+    middleware =
+      if follow_redirects do
+        [Tesla.Middleware.FollowRedirects, ConnectionPool]
+      else
+        [ConnectionPool]
+      end
+
+    adapter_opts =
+      Keyword.merge(
+        [tls_opts: [verify: :verify_none], connect_timeout: 2_000, timeout: 2_000],
+        proxy_opts
+      )
+
+    middleware
+    |> Tesla.client(Tesla.Adapter.Gun)
+    |> Tesla.get(url, opts: [adapter: adapter_opts])
+  end
+
+  defp request_chunks(url, proxy_opts, follow_redirects \\ false) do
+    adapter_opts =
+      Keyword.merge(
+        [
+          body_as: :chunks,
+          tls_opts: [verify: :verify_none],
+          connect_timeout: 2_000,
+          timeout: 2_000
+        ],
+        proxy_opts
+      )
+
+    middleware =
+      if follow_redirects do
+        [Tesla.Middleware.FollowRedirects, ConnectionPool]
+      else
+        [ConnectionPool]
+      end
+
+    middleware
+    |> Tesla.client(Tesla.Adapter.Gun)
+    |> Tesla.get(url, opts: [adapter: adapter_opts])
+  end
+
+  defp request_multipart(url, multipart, proxy_opts) do
+    adapter_opts =
+      Keyword.merge(
+        [tls_opts: [verify: :verify_none], connect_timeout: 2_000, timeout: 2_000],
+        proxy_opts
+      )
+
+    [ConnectionPool]
+    |> Tesla.client(Tesla.Adapter.Gun)
+    |> Tesla.post(url, multipart, opts: [adapter: adapter_opts])
+  end
+
+  defp request_stream(url, body, proxy_opts) do
+    adapter_opts =
+      Keyword.merge(
+        [tls_opts: [verify: :verify_none], connect_timeout: 2_000, timeout: 2_000],
+        proxy_opts
+      )
+
+    [ConnectionPool]
+    |> Tesla.client(Tesla.Adapter.Gun)
+    |> Tesla.post(url, body, opts: [adapter: adapter_opts])
+  end
+
+  defp collect_chunks(client, acc \\ "") do
+    case Tesla.Adapter.Gun.read_chunk(client.pid, client.stream, client.opts) do
+      {:nofin, chunk} -> collect_chunks(client, acc <> chunk)
+      {:fin, chunk} -> acc <> chunk
+    end
+  end
+
+  defp start_tls_origin(parent) do
+    certfile = Path.expand("../../fixtures/server.pem", __DIR__)
+    keyfile = Path.expand("../../fixtures/private_key.pem", __DIR__)
+
+    {:ok, listener} =
+      :ssl.listen(0, [
+        :binary,
+        certfile: certfile,
+        keyfile: keyfile,
+        reuseaddr: true,
+        active: false,
+        packet: :raw,
+        ip: {127, 0, 0, 1}
+      ])
+
+    {:ok, {{127, 0, 0, 1}, port}} = :ssl.sockname(listener)
+    {:ok, acceptor} = Task.start_link(fn -> accept_tls_loop(listener, parent) end)
+
+    %{
+      listener: listener,
+      acceptor: acceptor,
+      transport: :ssl,
+      port: port,
+      base_url: "https://127.0.0.1:#{port}"
+    }
+  end
+
+  defp accept_tls_loop(listener, parent) do
+    case :ssl.transport_accept(listener) do
+      {:ok, tcp_socket} ->
+        case :ssl.handshake(tcp_socket, 2_000) do
+          {:ok, socket} ->
+            pid = spawn(fn -> receive_and_serve_tls(socket, parent) end)
+            :ok = :ssl.controlling_process(socket, pid)
+            send(pid, :serve)
+
+          {:error, _reason} ->
+            :gen_tcp.close(tcp_socket)
+        end
+
+        accept_tls_loop(listener, parent)
+
+      {:error, _reason} ->
+        :ok
+    end
+  end
+
+  defp receive_and_serve_tls(socket, parent) do
+    receive do
+      :serve -> serve_tls(socket, parent)
+    end
+  end
+
+  defp serve_tls(socket, parent) do
+    case recv_headers(:ssl, socket) do
+      {:ok, request} ->
+        {headers, buffered_body} = split_headers(request)
+        path = request_path(headers)
+        send(parent, {:origin_request, path})
+        send(parent, {:origin_headers, path, headers})
+
+        case path do
+          "/redirect" ->
+            send_tls_response(socket, 302, "Found", [{"Location", "/final"}], "")
+
+          "/redirect_chunks" ->
+            send_tls_response(socket, 302, "Found", [{"Location", "/chunks"}], "discard-me")
+
+          "/final" ->
+            send_tls_response(socket, 200, "OK", [], "ok")
+
+          "/chunks" ->
+            send_tls_chunks(socket, ["hel", "lo"])
+
+          "/upload" ->
+            {:ok, body} = recv_request_body(socket, headers, buffered_body)
+            send(parent, {:origin_body, path, body})
+            send_tls_response(socket, 200, "OK", [], "uploaded")
+
+          _ ->
+            send_tls_response(socket, 404, "Not Found", [], "not found")
+        end
+
+        serve_tls(socket, parent)
+
+      {:error, _reason} ->
+        :ssl.close(socket)
+    end
+  end
+
+  defp send_tls_response(socket, status, reason, headers, body) do
+    headers =
+      [
+        {"Content-Length", Integer.to_string(byte_size(body))},
+        {"Connection", "keep-alive"}
+      ] ++ headers
+
+    :ssl.send(socket, [
+      "HTTP/1.1 ",
+      Integer.to_string(status),
+      " ",
+      reason,
+      "\r\n",
+      Enum.map(headers, fn {key, value} -> [key, ": ", value, "\r\n"] end),
+      "\r\n",
+      body
+    ])
+  end
+
+  defp send_tls_chunks(socket, chunks) do
+    :ssl.send(socket, [
+      "HTTP/1.1 200 OK\r\n",
+      "Transfer-Encoding: chunked\r\n",
+      "Connection: keep-alive\r\n\r\n",
+      Enum.map(chunks, fn chunk ->
+        [Integer.to_string(byte_size(chunk), 16), "\r\n", chunk, "\r\n"]
+      end),
+      "0\r\n\r\n"
+    ])
+  end
+
+  defp start_connect_proxy(parent) do
+    start_tcp_server(fn socket -> serve_connect_proxy(socket, parent) end)
+  end
+
+  defp serve_connect_proxy(socket, parent) do
+    with {:ok, headers} <- recv_headers(:gen_tcp, socket),
+         {:ok, host, port} <- parse_connect(headers),
+         auth when is_binary(auth) <- header(headers, "proxy-authorization"),
+         {:ok, upstream} <- tcp_connect(host, port) do
+      send(parent, {:connect_proxy, auth, host, port})
+      :ok = :gen_tcp.send(socket, "HTTP/1.1 200 Connection established\r\n\r\n")
+      tunnel(socket, upstream)
+    else
+      _ ->
+        :gen_tcp.send(
+          socket,
+          "HTTP/1.1 407 Proxy Authentication Required\r\nContent-Length: 0\r\n\r\n"
+        )
+
+        :gen_tcp.close(socket)
+    end
+  end
+
+  defp start_socks5_proxy(parent) do
+    start_tcp_server(fn socket -> serve_socks5_proxy(socket, parent) end)
+  end
+
+  defp serve_socks5_proxy(socket, parent) do
+    with {:ok, <<5, method_count>>} <- :gen_tcp.recv(socket, 2, 2_000),
+         {:ok, methods} <- :gen_tcp.recv(socket, method_count, 2_000),
+         true <- :binary.match(methods, <<2>>) != :nomatch,
+         :ok <- :gen_tcp.send(socket, <<5, 2>>),
+         {:ok, username, password} <- recv_socks5_auth(socket),
+         :ok <- :gen_tcp.send(socket, <<1, 0>>),
+         {:ok, host, port} <- recv_socks5_destination(socket),
+         {:ok, upstream} <- tcp_connect(host, port),
+         :ok <- :gen_tcp.send(socket, <<5, 0, 0, 1, 0, 0, 0, 0, 0, 0>>) do
+      send(parent, {:socks5_proxy, username, password, host, port})
+      tunnel(socket, upstream)
+    else
+      _ ->
+        :gen_tcp.close(socket)
+    end
+  end
+
+  defp recv_socks5_auth(socket) do
+    with {:ok, <<1, username_length>>} <- :gen_tcp.recv(socket, 2, 2_000),
+         {:ok, username} <- :gen_tcp.recv(socket, username_length, 2_000),
+         {:ok, <<password_length>>} <- :gen_tcp.recv(socket, 1, 2_000),
+         {:ok, password} <- :gen_tcp.recv(socket, password_length, 2_000) do
+      {:ok, username, password}
+    end
+  end
+
+  defp recv_socks5_destination(socket) do
+    with {:ok, <<5, 1, 0, address_type>>} <- :gen_tcp.recv(socket, 4, 2_000),
+         {:ok, host} <- recv_socks5_host(socket, address_type),
+         {:ok, <<port::16>>} <- :gen_tcp.recv(socket, 2, 2_000) do
+      {:ok, host, port}
+    end
+  end
+
+  defp recv_socks5_host(socket, 1) do
+    with {:ok, <<a, b, c, d>>} <- :gen_tcp.recv(socket, 4, 2_000) do
+      {:ok, Enum.join([a, b, c, d], ".")}
+    end
+  end
+
+  defp recv_socks5_host(socket, 3) do
+    with {:ok, <<length>>} <- :gen_tcp.recv(socket, 1, 2_000),
+         {:ok, host} <- :gen_tcp.recv(socket, length, 2_000) do
+      {:ok, host}
+    end
+  end
+
+  defp start_tcp_server(handler) do
+    {:ok, listener} =
+      :gen_tcp.listen(0, [
+        :binary,
+        active: false,
+        packet: :raw,
+        reuseaddr: true,
+        ip: {127, 0, 0, 1}
+      ])
+
+    {:ok, {{127, 0, 0, 1}, port}} = :inet.sockname(listener)
+    {:ok, acceptor} = Task.start_link(fn -> accept_tcp_loop(listener, handler) end)
+    %{listener: listener, acceptor: acceptor, transport: :gen_tcp, port: port}
+  end
+
+  defp accept_tcp_loop(listener, handler) do
+    case :gen_tcp.accept(listener) do
+      {:ok, socket} ->
+        pid = spawn(fn -> receive_and_serve_tcp(socket, handler) end)
+        :ok = :gen_tcp.controlling_process(socket, pid)
+        send(pid, :serve)
+        accept_tcp_loop(listener, handler)
+
+      {:error, _reason} ->
+        :ok
+    end
+  end
+
+  defp receive_and_serve_tcp(socket, handler) do
+    receive do
+      :serve -> handler.(socket)
+    end
+  end
+
+  defp recv_headers(transport, socket, acc \\ <<>>) do
+    case transport.recv(socket, 0, 2_000) do
+      {:ok, data} ->
+        acc = acc <> data
+
+        if :binary.match(acc, "\r\n\r\n") == :nomatch do
+          recv_headers(transport, socket, acc)
+        else
+          {:ok, acc}
+        end
+
+      {:error, _reason} = error ->
+        error
+    end
+  end
+
+  defp request_path(headers) do
+    headers
+    |> String.split("\r\n", parts: 2)
+    |> hd()
+    |> String.split(" ")
+    |> Enum.at(1)
+  end
+
+  defp split_headers(request) do
+    {index, 4} = :binary.match(request, "\r\n\r\n")
+    split_at = index + 4
+    <<headers::binary-size(split_at), body::binary>> = request
+    {headers, body}
+  end
+
+  defp recv_request_body(socket, headers, buffered_body) do
+    cond do
+      String.contains?(String.downcase(headers), "transfer-encoding: chunked") ->
+        recv_chunked_body(socket, buffered_body, "")
+
+      content_length = header(headers, "content-length") ->
+        recv_exact(socket, buffered_body, String.to_integer(content_length))
+
+      true ->
+        {:ok, buffered_body}
+    end
+  end
+
+  defp recv_chunked_body(socket, buffer, acc) do
+    with {:ok, line, buffer} <- recv_line(socket, buffer),
+         {size, ""} <- Integer.parse(line, 16) do
+      if size == 0 do
+        {:ok, acc}
+      else
+        with {:ok, chunk_and_crlf, buffer} <- take_bytes(socket, buffer, size + 2),
+             <<chunk::binary-size(size), "\r\n">> <- chunk_and_crlf do
+          recv_chunked_body(socket, buffer, acc <> chunk)
+        end
+      end
+    end
+  end
+
+  defp recv_line(socket, buffer) do
+    case :binary.match(buffer, "\r\n") do
+      {index, 2} ->
+        <<line::binary-size(index), "\r\n", rest::binary>> = buffer
+        {:ok, line, rest}
+
+      :nomatch ->
+        with {:ok, data} <- :ssl.recv(socket, 0, 2_000) do
+          recv_line(socket, buffer <> data)
+        end
+    end
+  end
+
+  defp take_bytes(_socket, buffer, size) when byte_size(buffer) >= size do
+    <<bytes::binary-size(size), rest::binary>> = buffer
+    {:ok, bytes, rest}
+  end
+
+  defp take_bytes(socket, buffer, size) do
+    with {:ok, data} <- :ssl.recv(socket, 0, 2_000) do
+      take_bytes(socket, buffer <> data, size)
+    end
+  end
+
+  defp recv_exact(socket, buffer, size) do
+    with {:ok, body, _rest} <- take_bytes(socket, buffer, size) do
+      {:ok, body}
+    end
+  end
+
+  defp parse_connect(headers) do
+    case headers |> String.split("\r\n", parts: 2) |> hd() |> String.split(" ") do
+      ["CONNECT", authority, _protocol] ->
+        case String.split(authority, ":", parts: 2) do
+          [host, port] -> {:ok, host, String.to_integer(port)}
+          _ -> {:error, :invalid_authority}
+        end
+
+      _ ->
+        {:error, :invalid_connect}
+    end
+  end
+
+  defp header(headers, wanted_name) do
+    headers
+    |> String.split("\r\n")
+    |> Enum.find_value(fn line ->
+      case String.split(line, ":", parts: 2) do
+        [name, value] ->
+          if String.downcase(name) == wanted_name, do: String.trim(value)
+
+        _ ->
+          nil
+      end
+    end)
+  end
+
+  defp tcp_connect(host, port) do
+    :gen_tcp.connect(
+      String.to_charlist(host),
+      port,
+      [:binary, active: false, packet: :raw],
+      2_000
+    )
+  end
+
+  defp worker_protocol(port) do
+    prefix = "https:127.0.0.1:#{port}:"
+
+    Pleroma.Gun.ConnectionPool
+    |> Registry.select([{{:"$1", :"$2", :_}, [], [{{:"$1", :"$2"}}]}])
+    |> Enum.find_value(fn {key, worker} ->
+      if String.starts_with?(key, prefix), do: :sys.get_state(worker).protocol
+    end)
+  end
+
+  defp tunnel(client, upstream) do
+    :ok = :inet.setopts(client, active: :once)
+    :ok = :inet.setopts(upstream, active: :once)
+    tunnel_loop(client, upstream)
+  end
+
+  defp tunnel_loop(client, upstream) do
+    receive do
+      {:tcp, ^client, data} ->
+        :ok = :gen_tcp.send(upstream, data)
+        :ok = :inet.setopts(client, active: :once)
+        tunnel_loop(client, upstream)
+
+      {:tcp, ^upstream, data} ->
+        :ok = :gen_tcp.send(client, data)
+        :ok = :inet.setopts(upstream, active: :once)
+        tunnel_loop(client, upstream)
+
+      {:tcp_closed, _socket} ->
+        :gen_tcp.close(client)
+        :gen_tcp.close(upstream)
+
+      {:tcp_error, _socket, _reason} ->
+        :gen_tcp.close(client)
+        :gen_tcp.close(upstream)
+    after
+      10_000 ->
+        :gen_tcp.close(client)
+        :gen_tcp.close(upstream)
+    end
+  end
+
+  defp stop_server(%{listener: listener, acceptor: acceptor, transport: transport}) do
+    transport.close(listener)
+
+    if Process.alive?(acceptor), do: Process.exit(acceptor, :normal)
+  end
+end
diff --git a/test/pleroma/reverse_proxy/client/tesla_test.exs b/test/pleroma/reverse_proxy/client/tesla_test.exs
new file mode 100644
index 000000000..833e5bda2
--- /dev/null
+++ b/test/pleroma/reverse_proxy/client/tesla_test.exs
@@ -0,0 +1,22 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.ReverseProxy.Client.TeslaTest do
+  use ExUnit.Case
+
+  import Mox
+
+  alias Pleroma.ReverseProxy.Client.Tesla
+
+  setup :verify_on_exit!
+
+  test "cancels an unfinished stream before releasing its connection" do
+    conn = self()
+    stream = [make_ref(), make_ref()]
+
+    expect(Pleroma.GunMock, :cancel, fn ^conn, ^stream -> :ok end)
+
+    assert :ok = Tesla.close(%{pid: conn, stream: stream})
+  end
+end
diff --git a/test/pleroma/reverse_proxy_test.exs b/test/pleroma/reverse_proxy_test.exs
index ec4470379..7fd0fed6d 100644
--- a/test/pleroma/reverse_proxy_test.exs
+++ b/test/pleroma/reverse_proxy_test.exs
@@ -115,6 +115,7 @@ defmodule Pleroma.ReverseProxyTest do
   describe "max_body" do
     test "length returns error if content-length more than option", %{conn: conn} do
       request_mock(0)
+      expect(ClientMock, :close, fn _ -> :ok end)
 
       assert capture_log(fn ->
                ReverseProxy.call(conn, "/huge-file", max_body_length: 4)
@@ -128,14 +129,31 @@ defmodule Pleroma.ReverseProxyTest do
              end) == ""
     end
 
+    test "closes streamed responses with invalid status", %{conn: conn} do
+      ClientMock
+      |> expect(:request, fn :get, "/invalid-status", _, _, _ ->
+        {:ok, 404, [], %{url: "/invalid-status"}}
+      end)
+      |> expect(:close, fn %{url: "/invalid-status"} -> :ok end)
+
+      ReverseProxy.call(conn, "/invalid-status")
+    end
+
     test "max_body_length returns error if streaming body more than that option", %{conn: conn} do
       stream_mock(3, true)
 
       assert capture_log(fn ->
-               ReverseProxy.call(conn, "/stream-bytes/50", max_body_length: 30)
+               ReverseProxy.call(conn, "/stream-bytes/50", max_body_length: 29)
              end) =~
                "Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
     end
+
+    test "max_body_length accepts a body exactly at the limit", %{conn: conn} do
+      stream_mock(4)
+
+      conn = ReverseProxy.call(conn, "/stream-bytes/30", max_body_length: 30)
+      assert byte_size(conn.resp_body) == 30
+    end
   end
 
   describe "HEAD requests" do
@@ -200,7 +218,10 @@ defmodule Pleroma.ReverseProxyTest do
 
     test "204", %{conn: conn} do
       url = "/status/204"
-      expect(ClientMock, :request, fn :get, _url, _, _, _ -> {:ok, 204, [], %{}} end)
+
+      ClientMock
+      |> expect(:request, fn :get, _url, _, _, _ -> {:ok, 204, [], %{}} end)
+      |> expect(:close, fn %{} -> :ok end)
 
       capture_log(fn ->
         conn = ReverseProxy.call(conn, url)
diff --git a/test/pleroma/tesla/middleware/connection_pool_test.exs b/test/pleroma/tesla/middleware/connection_pool_test.exs
new file mode 100644
index 000000000..46ee83f09
--- /dev/null
+++ b/test/pleroma/tesla/middleware/connection_pool_test.exs
@@ -0,0 +1,99 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Tesla.Middleware.ConnectionPoolTest do
+  use Pleroma.DataCase
+
+  import Mox
+
+  alias Pleroma.Tesla.Middleware.ConnectionPool
+
+  defmodule FailingAdapter do
+    @behaviour Tesla.Adapter
+
+    @impl Tesla.Adapter
+    def call(_env, _opts), do: {:error, :request_failed}
+  end
+
+  defmodule EmptyAdapter do
+    @behaviour Tesla.Adapter
+
+    @impl Tesla.Adapter
+    def call(env, _opts), do: {:ok, %{env | status: 204, body: ""}}
+  end
+
+  test "discards the connection when the adapter cannot finish a request" do
+    test_pid = self()
+
+    stub(Pleroma.GunMock, :open, fn _, _, _ ->
+      {:ok, conn} = Task.start_link(fn -> Process.sleep(:infinity) end)
+      send(test_pid, {:gun_conn, conn})
+      {:ok, conn}
+    end)
+
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http} end)
+
+    client = Tesla.client([ConnectionPool], FailingAdapter)
+
+    assert {:error, :request_failed} =
+             Tesla.get(client, "http://discard.example/", opts: [adapter: []])
+
+    assert_receive {:gun_conn, conn}
+
+    assert eventually(fn -> not Process.alive?(conn) end)
+  end
+
+  test "releases a chunks lease when the response has no stream" do
+    clear_config([:connections_pool, :max_idle_time], 5)
+    test_pid = self()
+
+    stub(Pleroma.GunMock, :open, fn _, _, _ ->
+      {:ok, conn} = Task.start_link(fn -> Process.sleep(:infinity) end)
+      send(test_pid, {:gun_conn, conn})
+      {:ok, conn}
+    end)
+
+    stub(Pleroma.GunMock, :await_up, fn _, _ -> {:ok, :http} end)
+
+    client = Tesla.client([ConnectionPool], EmptyAdapter)
+
+    assert {:ok, %Tesla.Env{status: 204, body: ""}} =
+             Tesla.get(client, "http://empty-chunks.example/",
+               opts: [adapter: [body_as: :chunks]]
+             )
+
+    assert_receive {:gun_conn, conn}
+    worker = worker_for_conn(conn)
+    assert eventually(fn -> not Process.alive?(worker) end)
+  end
+
+  test "rejects unmanaged pooled streams" do
+    client = Tesla.client([ConnectionPool], EmptyAdapter)
+
+    assert {:error, :pooled_streaming_requires_chunks} =
+             Tesla.get(client, "http://stream.example/", opts: [adapter: [body_as: :stream]])
+  end
+
+  defp worker_for_conn(conn) do
+    [worker] =
+      Registry.select(Pleroma.Gun.ConnectionPool, [
+        {{:_, :"$1", {:"$2", :_}}, [{:==, :"$2", conn}], [:"$1"]}
+      ])
+
+    worker
+  end
+
+  defp eventually(predicate, attempts \\ 50)
+
+  defp eventually(_predicate, 0), do: false
+
+  defp eventually(predicate, attempts) do
+    if predicate.() do
+      true
+    else
+      Process.sleep(10)
+      eventually(predicate, attempts - 1)
+    end
+  end
+end

From d0d6c986f409165786a2dee78f0c51c0e4534241 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 17 Jul 2026 20:35:40 +0400
Subject: [PATCH 099/163] docs(http): document Gun pool behavior

---
 DEVLOG.md                         | 12 ++++++++++++
 changelog.d/gun-pool-rework.fix   |  1 +
 docs/configuration/cheatsheet.md  |  3 ++-
 docs/configuration/howto_proxy.md |  2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 DEVLOG.md
 create mode 100644 changelog.d/gun-pool-rework.fix

diff --git a/DEVLOG.md b/DEVLOG.md
new file mode 100644
index 000000000..4c2151807
--- /dev/null
+++ b/DEVLOG.md
@@ -0,0 +1,12 @@
+# Development Log
+
+## Gun pool validation
+
+- The previous unique origin registry forced concurrent HTTP/1 requests onto one connection.
+- Pool identity omitted proxy routes and credentials, allowing incompatible routes to reuse a connection.
+- Gun 2.2 CONNECT requests require their tunnel stream reference on subsequent requests; Tesla's bundled Gun adapter does not preserve it.
+- CONNECT and SOCKS5 setup returned before the destination tunnel was ready and did not pass authentication credentials.
+- The existing global `max_connections` limit and idle reclaimer bound HTTP/1 sibling and many-host connection growth.
+- SOCKS4 is not supported by Gun 2.2 and is now rejected explicitly by the Gun adapter.
+- Gun reports a stale stream error to the process that calls `cancel/2`; pool workers must consume that reply so one HTTP/2 cancellation cannot terminate other multiplexed requests.
+- Streamed uploads must be registered before body enumeration and cancelled if enumeration exits, throws, or raises, otherwise a partial HTTP/1 request can remain reusable.
diff --git a/changelog.d/gun-pool-rework.fix b/changelog.d/gun-pool-rework.fix
new file mode 100644
index 000000000..309bcab7e
--- /dev/null
+++ b/changelog.d/gun-pool-rework.fix
@@ -0,0 +1 @@
+Fixed Gun HTTP/1 concurrency, authenticated proxy handling, tunnel requests, and streamed connection cleanup.
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 9efa1c8b3..fee190b4a 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -573,7 +573,8 @@ Settings for HTTP connection pool.
 
 * `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries.
 * `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart.
-* `:max_connections` - Maximum number of connections in the pool.
+* `:max_connections` - Maximum total number of connections in the pool. HTTP/1 origins may use multiple connections within this limit, while HTTP/2 connections are multiplexed.
+* `:max_idle_time` - Time before an unused connection is closed.
 * `:connect_timeout` - Timeout to connect to the host.
 * `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded.
 
diff --git a/docs/configuration/howto_proxy.md b/docs/configuration/howto_proxy.md
index 10a635266..9e571d6fc 100644
--- a/docs/configuration/howto_proxy.md
+++ b/docs/configuration/howto_proxy.md
@@ -10,3 +10,5 @@ The other way to do it, for example, with Tor you would most likely add somethin
 ```
 config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}
 ```
+
+The Gun HTTP adapter supports SOCKS5. SOCKS4 proxies require another HTTP adapter.

From b862254889ac767fa98b7c989d91f6f97b6cfb27 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 17 Jul 2026 21:09:13 +0400
Subject: [PATCH 100/163] fix(deps): update Gun to 2.4.1

---
 DEVLOG.md                                  |  1 +
 changelog.d/gun-pool-rework.fix            |  2 +-
 lib/pleroma/http/adapter/gun.ex            | 11 ++++++-
 mix.exs                                    |  4 +--
 mix.lock                                   |  4 +--
 test/pleroma/http/gun_integration_test.exs | 38 +++++++++++++++++++++-
 6 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/DEVLOG.md b/DEVLOG.md
index 4c2151807..25f07171f 100644
--- a/DEVLOG.md
+++ b/DEVLOG.md
@@ -10,3 +10,4 @@
 - SOCKS4 is not supported by Gun 2.2 and is now rejected explicitly by the Gun adapter.
 - Gun reports a stale stream error to the process that calls `cancel/2`; pool workers must consume that reply so one HTTP/2 cancellation cannot terminate other multiplexed requests.
 - Streamed uploads must be registered before body enumeration and cancelled if enumeration exits, throws, or raises, otherwise a partial HTTP/1 request can remain reusable.
+- Gun 2.4 bounds HTTP/1 response header and trailer buffers, rejects invalid request headers by default, and fixes cross-origin HTTP/2 push handling; Gun 2.4.1 includes Cowlib 2.17.1 to repair HTTP/2 HPACK decoding.
diff --git a/changelog.d/gun-pool-rework.fix b/changelog.d/gun-pool-rework.fix
index 309bcab7e..b7d9adccf 100644
--- a/changelog.d/gun-pool-rework.fix
+++ b/changelog.d/gun-pool-rework.fix
@@ -1 +1 @@
-Fixed Gun HTTP/1 concurrency, authenticated proxy handling, tunnel requests, and streamed connection cleanup.
+Fixed Gun HTTP/1 concurrency, authenticated proxy handling, tunnel requests, and streamed connection cleanup. Updated Gun and Cowlib for HTTP client security fixes.
diff --git a/lib/pleroma/http/adapter/gun.ex b/lib/pleroma/http/adapter/gun.ex
index 400692790..61d297101 100644
--- a/lib/pleroma/http/adapter/gun.ex
+++ b/lib/pleroma/http/adapter/gun.ex
@@ -38,7 +38,16 @@ defmodule Pleroma.HTTP.Adapter.Gun do
     method = Tesla.Adapter.Shared.format_method(env.method)
     {headers, body, send_body} = prepare_body(env.headers, env.body, opts[:send_body])
     request_opts = request_opts(opts[:reply_to], tunnel)
-    stream = open_stream(conn, method, path, headers, body, request_opts, send_body)
+
+    stream =
+      try do
+        open_stream(conn, method, path, headers, body, request_opts, send_body)
+      catch
+        kind, reason ->
+          ConnectionPool.release_conn(conn)
+          :erlang.raise(kind, reason, __STACKTRACE__)
+      end
+
     :ok = ConnectionPool.register_stream(conn, stream)
     :ok = send_stream_body(conn, stream, body, send_body)
     response = read_response(conn, stream, opts)
diff --git a/mix.exs b/mix.exs
index 3d525b321..f2a48588d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -147,8 +147,8 @@ defmodule Pleroma.Mixfile do
       {:cachex, "~> 3.6"},
       {:tesla, "~> 1.15"},
       {:castore, "~> 1.0"},
-      {:cowlib, "~> 2.15"},
-      {:gun, "~> 2.2"},
+      {:cowlib, "~> 2.17.1"},
+      {:gun, "~> 2.4.1"},
       {:finch, "~> 0.20"},
       {:jason, "~> 1.4"},
       {:mogrify, "~> 0.9.3", override: true},
diff --git a/mix.lock b/mix.lock
index cde864084..a4db3f68d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -22,7 +22,7 @@
   "covertool": {:hex, :covertool, "2.0.7", "398be995c4cf1a2861174389b3577ca97beee43b60c8f1afcf510f1b07d32408", [:rebar3], [], "hexpm", "46158ed6e1a0df7c0a912e314c7b8e053bd74daa5fc6b790614922a155b5720c"},
   "cowboy": {:hex, :cowboy, "2.13.0", "09d770dd5f6a22cc60c071f432cd7cb87776164527f205c5a6b0f24ff6b38990", [:make, :rebar3], [{:cowlib, ">= 2.14.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "e724d3a70995025d654c1992c7b11dbfea95205c047d86ff9bf1cda92ddc5614"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
-  "cowlib": {:hex, :cowlib, "2.15.0", "3c97a318a933962d1c12b96ab7c1d728267d2c523c25a5b57b0f93392b6e9e25", [:make, :rebar3], [], "hexpm", "4f00c879a64b4fe7c8fcb42a4281925e9ffdb928820b03c3ad325a617e857532"},
+  "cowlib": {:hex, :cowlib, "2.17.1", "3e6053016d1ab245730f0af688755476dcedb1c25ed8fb5751f59a2bfdc0c9af", [:make, :rebar3], [], "hexpm", "ff08bd17e6dd931445b18af77315b9b5fe052407110964ad2588c686b57b5e3f"},
   "credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
   "crontab": {:hex, :crontab, "1.1.8", "2ce0e74777dfcadb28a1debbea707e58b879e6aa0ffbf9c9bb540887bce43617", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
   "custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
@@ -58,7 +58,7 @@
   "floki": {:hex, :floki, "0.38.0", "62b642386fa3f2f90713f6e231da0fa3256e41ef1089f83b6ceac7a3fd3abf33", [:mix], [], "hexpm", "a5943ee91e93fb2d635b612caf5508e36d37548e84928463ef9dd986f0d1abd9"},
   "gen_smtp": {:hex, :gen_smtp, "0.15.0", "9f51960c17769b26833b50df0b96123605a8024738b62db747fece14eb2fbfcc", [:rebar3], [], "hexpm", "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"},
   "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
-  "gun": {:hex, :gun, "2.2.0", "b8f6b7d417e277d4c2b0dc3c07dfdf892447b087f1cc1caff9c0f556b884e33d", [:make, :rebar3], [{:cowlib, ">= 2.15.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "76022700c64287feb4df93a1795cff6741b83fb37415c40c34c38d2a4645261a"},
+  "gun": {:hex, :gun, "2.4.1", "c3a8bff8e155e1fc8e499216599bb7effbd27bc1985662a8b25016090dc18428", [:make, :rebar3], [{:cowlib, ">= 2.15.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "1450575b4d393aa0811322727b90ad1dd94b5c10026f54a1641785bcbd250384"},
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
   "hpax": {:hex, :hpax, "1.0.3", "ed67ef51ad4df91e75cc6a1494f851850c0bd98ebc0be6e81b026e765ee535aa", [:mix], [], "hexpm", "8eab6e1cfa8d5918c2ce4ba43588e894af35dbd8e91e6e55c817bca5847df34a"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
diff --git a/test/pleroma/http/gun_integration_test.exs b/test/pleroma/http/gun_integration_test.exs
index ca6f7bbc1..f50f8105e 100644
--- a/test/pleroma/http/gun_integration_test.exs
+++ b/test/pleroma/http/gun_integration_test.exs
@@ -177,6 +177,28 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
     assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(origin.base_url <> "/final")
   end
 
+  test "releases the lease when Gun rejects an invalid request header", %{origin: origin} do
+    adapter_opts = [
+      tls_opts: [verify: :verify_none],
+      connect_timeout: 2_000,
+      timeout: 2_000
+    ]
+
+    client = Tesla.client([ConnectionPool], Tesla.Adapter.Gun)
+
+    assert {:invalid_request_header, "x-test", _message} =
+             catch_error(
+               Tesla.get(client, origin.base_url <> "/final",
+                 headers: [{"x-test", "value\r\nx-injected: true"}],
+                 opts: [adapter: adapter_opts]
+               )
+             )
+
+    assert worker_clients(origin.port) == %{}
+    refute_receive {:origin_request, "/final"}
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(origin.base_url <> "/final")
+  end
+
   test "requests through authenticated SOCKS5 with proxy-side DNS", %{
     origin: origin,
     socks_proxy: proxy
@@ -622,12 +644,26 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
   end
 
   defp worker_protocol(port) do
+    case worker_state(port) do
+      nil -> nil
+      state -> state.protocol
+    end
+  end
+
+  defp worker_clients(port) do
+    case worker_state(port) do
+      nil -> nil
+      state -> state.clients
+    end
+  end
+
+  defp worker_state(port) do
     prefix = "https:127.0.0.1:#{port}:"
 
     Pleroma.Gun.ConnectionPool
     |> Registry.select([{{:"$1", :"$2", :_}, [], [{{:"$1", :"$2"}}]}])
     |> Enum.find_value(fn {key, worker} ->
-      if String.starts_with?(key, prefix), do: :sys.get_state(worker).protocol
+      if String.starts_with?(key, prefix), do: :sys.get_state(worker)
     end)
   end
 

From 1d758dbbf58fceb966ac541dabef4e1f4fb0ce45 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 17 Jul 2026 22:39:43 +0200
Subject: [PATCH 101/163] Elixir 1.19: Do not restart :logger in ConfigDB
 TransferTask

---
 lib/pleroma/config/transfer_task.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex
index 140dd7711..3e59dc4e0 100644
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@ -51,7 +51,7 @@ defmodule Pleroma.Config.TransferTask do
 
       started_applications = Application.started_applications()
 
-      reject = [nil, :postgrex]
+      reject = [nil, :postgrex, :logger]
 
       reject =
         if restart_pleroma? do

From ebd5596ba7e298d47382c3a49304c35c9ef59859 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 17 Jul 2026 23:32:43 +0200
Subject: [PATCH 102/163] Elixir 1.19: Create ConfigDB blacklist and task for
 :pleroma, :logger

This option was never configurable with ConfigDB when it lived under
:logger, :backends; no need to be configurable now.
---
 config/config.exs                      |  4 +++
 lib/mix/tasks/pleroma/config.ex        | 50 ++++++++++++++++++++++++++
 test/mix/tasks/pleroma/config_test.exs | 35 ++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/config/config.exs b/config/config.exs
index 80183a3d9..e6a4eb3e6 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -966,6 +966,10 @@ config :pleroma, Pleroma.Search.QdrantSearch,
     vectors: %{size: 384, distance: "Cosine"}
   }
 
+config :pleroma, :database_config_blacklist, [
+  {:pleroma, :logger}
+]
+
 config :pleroma, :database_config_whitelist, [
   {:pleroma},
   {:cors_plug},
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index c5f2e9b0a..a389252ac 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -289,6 +289,52 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
+  # Removes blacklisted configuration sections
+  def run(["filter_blacklisted" | rest]) do
+    {options, [], []} =
+      OptionParser.parse(
+        rest,
+        strict: [force: :boolean],
+        aliases: [f: :force]
+      )
+
+    force = Keyword.get(options, :force, false)
+
+    start_pleroma()
+
+    blacklisted_configs = Pleroma.Config.get(:database_config_blacklist)
+
+    if blacklisted_configs in [nil, false] do
+      shell_error("No unwanted settings in ConfigDB. No changes made.")
+    else
+      blacklisted_keys =
+        blacklisted_configs
+        |> Enum.filter(fn
+          {_group, _key} -> true
+          _ -> false
+        end)
+
+      filtered =
+        from(c in ConfigDB)
+        |> Repo.all()
+        |> Enum.filter(&blacklisted?(&1, blacklisted_keys))
+
+      if not Enum.empty?(filtered) do
+        shell_info("The following settings will be removed from ConfigDB:\n")
+        Enum.each(filtered, &dump(&1))
+
+        if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+          filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
+
+          Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
+        else
+          shell_error("No changes made.")
+        end
+      else
+        shell_error("No unwanted settings in ConfigDB. No changes made.")
+      end
+    end
+  end
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
     with :ok <- Pleroma.Config.DeprecationWarnings.warn() do
@@ -494,4 +540,8 @@ defmodule Mix.Tasks.Pleroma.Config do
     not Enum.member?(whitelisted_groups, group) and
       not Enum.member?(whitelisted_keys, {group, key})
   end
+
+  defp blacklisted?(%{group: group, key: key}, blacklisted_keys) do
+    Enum.member?(blacklisted_keys, {group, key})
+  end
 end
diff --git a/test/mix/tasks/pleroma/config_test.exs b/test/mix/tasks/pleroma/config_test.exs
index f672d8c13..3ae6e7f16 100644
--- a/test/mix/tasks/pleroma/config_test.exs
+++ b/test/mix/tasks/pleroma/config_test.exs
@@ -369,5 +369,40 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
       MixTask.run(["filter_whitelisted", "--force"])
       assert config_records() == existing
     end
+
+    test "filters blacklisted settings" do
+      clear_config(:database_config_whitelist, [{:pleroma}])
+      clear_config(:database_config_blacklist, [
+        {:pleroma, :logger}
+      ])
+
+      insert_config_record(:pleroma, :logger, backends: :console)
+      insert_config_record(:web_push_encryption, :vapid_details, a: 1)
+
+      MixTask.run(["filter_blacklisted", "--force"])
+
+      assert [
+               %ConfigDB{group: :pleroma, key: :instance},
+               %ConfigDB{group: :pleroma, key: Pleroma.Captcha},
+               %ConfigDB{group: :pleroma2, key: :key2},
+               %ConfigDB{group: :web_push_encryption, key: :vapid_details},
+             ] = config_records()
+    end
+
+    test "filter_blacklisted doesn't crash when blacklist is unset" do
+      clear_config(:database_config_blacklist, nil)
+
+      existing = config_records()
+      MixTask.run(["filter_blacklisted", "--force"])
+      assert config_records() == existing
+    end
+
+    test "filter_blacklisted doesn't crash when blacklist is disabled" do
+      clear_config(:database_config_blacklist, false)
+
+      existing = config_records()
+      MixTask.run(["filter_blacklisted", "--force"])
+      assert config_records() == existing
+    end
   end
 end

From 7de1affda89596ec7daf6bc81ba22d878831b0ba Mon Sep 17 00:00:00 2001
From: eal <ealvar@iki.fi>
Date: Fri, 3 Jul 2026 12:46:03 +0300
Subject: [PATCH 103/163] Dockerfile: update base images to fix problems with
 SSL handshakes

My instance has been having problems with push federation since
updating to v2.10.2, using the docker image. Posts are not reaching
their destination instance until some other interaction initiates a
fetch from source.

The logs contain lots of errors such as:

```
pleroma    | 09:34:40.885 [notice] TLS :client: In state :wait_cert_cr at ssl_handshake.erl:2158 generated CLIENT ALERT: Fatal - Unsupported Certificate
pleroma    |  - {:key_usage_mismatch,
pleroma    |  {{:Extension, {2, 5, 29, 15}, true, [:keyCertSign, :cRLSign]},
pleroma    |   {:Extension, {2, 5, 29, 37}, false, [{1, 3, 6, 1, 5, 5, 7, 3, 1}]}}}
```

This erlang/OTP issue seems to be the same problem:
https://github.com/erlang/otp/issues/9208

The erlang version committed here was selected after discussion in the
merge request.

I have not noticed any federation problems with an image built from
this dockerfile.
---
 Dockerfile                           | 4 ++--
 changelog.d/docker-baseimage-ssl.fix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/docker-baseimage-ssl.fix

diff --git a/Dockerfile b/Dockerfile
index 5fd1cc0a1..87c698f93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # https://hub.docker.com/r/hexpm/elixir/tags
 ARG ELIXIR_IMG=hexpm/elixir
 ARG ELIXIR_VER=1.17.3
-ARG ERLANG_VER=26.2.5.6
-ARG ALPINE_VER=3.17.9
+ARG ERLANG_VER=27.3.4.14
+ARG ALPINE_VER=3.23.5
 ARG ELIXIR_TAG=${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER}
 ARG ALPINE_IMG=alpine
 
diff --git a/changelog.d/docker-baseimage-ssl.fix b/changelog.d/docker-baseimage-ssl.fix
new file mode 100644
index 000000000..441423f49
--- /dev/null
+++ b/changelog.d/docker-baseimage-ssl.fix
@@ -0,0 +1 @@
+Dockerfile: update base images to fix problems with SSL handshakes
\ No newline at end of file

From 2d307c1487de02129e897fe7abd05a03cb06889b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 16:05:14 +0200
Subject: [PATCH 104/163] ConfigDB: Support blacklisting whole config groups

---
 lib/mix/tasks/pleroma/config.ex        | 14 +++++++++++---
 test/mix/tasks/pleroma/config_test.exs |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a389252ac..d160ce533 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -307,6 +307,13 @@ defmodule Mix.Tasks.Pleroma.Config do
     if blacklisted_configs in [nil, false] do
       shell_error("No unwanted settings in ConfigDB. No changes made.")
     else
+      blacklisted_groups =
+        blacklisted_configs
+        |> Enum.filter(fn
+          {_group} -> true
+          _ -> false
+        end)
+
       blacklisted_keys =
         blacklisted_configs
         |> Enum.filter(fn
@@ -317,7 +324,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       filtered =
         from(c in ConfigDB)
         |> Repo.all()
-        |> Enum.filter(&blacklisted?(&1, blacklisted_keys))
+        |> Enum.filter(&blacklisted?(&1, blacklisted_groups, blacklisted_keys))
 
       if not Enum.empty?(filtered) do
         shell_info("The following settings will be removed from ConfigDB:\n")
@@ -541,7 +548,8 @@ defmodule Mix.Tasks.Pleroma.Config do
       not Enum.member?(whitelisted_keys, {group, key})
   end
 
-  defp blacklisted?(%{group: group, key: key}, blacklisted_keys) do
-    Enum.member?(blacklisted_keys, {group, key})
+  defp blacklisted?(%{group: group, key: key}, blacklisted_groups, blacklisted_keys) do
+    Enum.member?(blacklisted_groups, {group}) or
+      Enum.member?(blacklisted_keys, {group, key})
   end
 end
diff --git a/test/mix/tasks/pleroma/config_test.exs b/test/mix/tasks/pleroma/config_test.exs
index 3ae6e7f16..b35e0aed8 100644
--- a/test/mix/tasks/pleroma/config_test.exs
+++ b/test/mix/tasks/pleroma/config_test.exs
@@ -373,11 +373,13 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
     test "filters blacklisted settings" do
       clear_config(:database_config_whitelist, [{:pleroma}])
       clear_config(:database_config_blacklist, [
-        {:pleroma, :logger}
+        {:pleroma, :logger},
+        {:blacklisted_group}
       ])
 
       insert_config_record(:pleroma, :logger, backends: :console)
       insert_config_record(:web_push_encryption, :vapid_details, a: 1)
+      insert_config_record(:blacklisted_group, :anything, a: 1)
 
       MixTask.run(["filter_blacklisted", "--force"])
 

From c688d09478d7569fa047665ea21532816a78002f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 16:06:11 +0200
Subject: [PATCH 105/163] ConfigDB: Implement config update blacklist in
 AdminAPI

---
 .../controllers/config_controller.ex          | 30 +++++++-
 .../controllers/config_controller_test.exs    | 71 +++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 3eba03525..503fbc14d 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -71,7 +71,10 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
   end
 
   def descriptions(conn, _params) do
-    descriptions = Enum.filter(Pleroma.Docs.JSON.compiled_descriptions(), &whitelisted_config?/1)
+    descriptions =
+      Pleroma.Docs.JSON.compiled_descriptions()
+      |> Enum.filter(&whitelisted_config?/1)
+      |> Enum.reject(&blacklisted_config?/1)
 
     json(conn, translate_descriptions(descriptions))
   end
@@ -133,6 +136,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
       results =
         configs
         |> Enum.filter(&whitelisted_config?/1)
+        |> Enum.reject(&blacklisted_config?/1)
         |> Enum.map(fn
           %{group: group, key: key, delete: true} = params ->
             ConfigDB.delete(%{group: group, key: key, subkeys: params[:subkeys]})
@@ -197,4 +201,28 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
   defp whitelisted_config?(%{group: group} = config) do
     whitelisted_config?(group, config[:key])
   end
+
+  defp blacklisted_config?(":pleroma", ":database_config_blacklist"), do: true
+
+  defp blacklisted_config?(group, key) do
+    if blacklisted_configs = Config.get(:database_config_blacklist) do
+      Enum.any?(blacklisted_configs, fn
+        {blacklisted_group} ->
+          group == inspect(blacklisted_group)
+
+        {blacklisted_group, blacklisted_key} ->
+          group == inspect(blacklisted_group) and key == inspect(blacklisted_key)
+        end)
+    else
+      true
+    end
+  end
+
+  defp blacklisted_config?(%{group: group, key: key}) do
+    blacklisted_config?(group, key)
+  end
+
+  defp blacklisted_config?(%{group: group} = config) do
+    blacklisted_config?(group, config[:key])
+  end
 end
diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
index e62d95fad..047662d39 100644
--- a/test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@ -1245,6 +1245,52 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
       refute ConfigDB.get_by_group_and_key(:pleroma, :database_config_whitelist)
     end
 
+    test "doesn't set keys in the blacklist", %{conn: conn} do
+      clear_config(:database_config_blacklist, [{:pleroma, :logger}, {:pleroma, :key2}, {:pleroma, Pleroma.Captcha.NotReal}, {:blacklisted_group}])
+
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/pleroma/admin/config", %{
+        configs: [
+          %{group: ":pleroma", key: ":logger", value: "logconf"},
+          %{group: ":pleroma", key: ":key1", value: "value1"},
+          %{group: ":pleroma", key: ":key2", value: "value2"},
+          %{group: ":not_real", key: ":anything", value: "value3"},
+          %{group: ":blacklisted_group", key: ":anything", value: "value4"}
+        ]
+      })
+
+      assert Application.get_env(:pleroma, :logger) == nil
+      assert Application.get_env(:pleroma, :key1) == "value1"
+      assert Application.get_env(:pleroma, :key2) == nil
+      assert Application.get_env(:pleroma, Pleroma.Captcha.NotReal) == nil
+      assert Application.get_env(:blacklisted_group, :anything) == nil
+    end
+
+    test "doesn't allow updating the database_config_blacklist itself", %{conn: conn} do
+      original_blacklist = Pleroma.Config.get(:database_config_blacklist)
+
+      refute ConfigDB.get_by_group_and_key(:pleroma, :database_config_blacklist)
+
+      %{"configs" => configs} =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post("/api/pleroma/admin/config", %{
+          configs: [
+            %{
+              group: ":pleroma",
+              key: ":database_config_blacklist",
+              value: [%{"tuple" => [":pleroma", ":key1"]}]
+            }
+          ]
+        })
+        |> json_response_and_validate_schema(200)
+
+      assert configs == []
+      assert Pleroma.Config.get(:database_config_blacklist) == original_blacklist
+      refute ConfigDB.get_by_group_and_key(:pleroma, :database_config_blacklist)
+    end
+
     test "args for Pleroma.Upload.Filter.Mogrify with custom tuples", %{conn: conn} do
       assert conn
              |> put_req_header("content-type", "application/json")
@@ -1515,5 +1561,30 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
 
       assert length(response) == length(Pleroma.Docs.JSON.compiled_descriptions())
     end
+
+    test "filters by database configuration blacklist and whitelist", %{conn: conn} do
+      clear_config(:database_config_whitelist, [{:pleroma, :instance}, {:pleroma, :activitypub}, {:pleroma, Pleroma.Upload}])
+      clear_config(:database_config_blacklist, [
+        {:pleroma, Pleroma.Upload},
+      ])
+
+      children =
+        conn
+        |> get("/api/pleroma/admin/config/descriptions")
+        |> json_response_and_validate_schema(200)
+
+      assert length(children) == 2
+
+      assert Enum.count(children, fn c -> c["group"] == ":pleroma" end) == 2
+
+      instance = Enum.find(children, fn c -> c["key"] == ":instance" end)
+      assert instance["children"]
+
+      activitypub = Enum.find(children, fn c -> c["key"] == ":activitypub" end)
+      assert activitypub["children"]
+
+      web_endpoint = Enum.find(children, fn c -> c["key"] == "Pleroma.Upload" end)
+      refute web_endpoint["children"]
+    end
   end
 end

From d383c453a1a068297c27704a89629dcac3abd923 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 16:10:22 +0200
Subject: [PATCH 106/163] Elixir 1.19: Added features changelog (ConfigDB
 blacklist)

---
 changelog.d/elixir-1-19.add | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/elixir-1-19.add

diff --git a/changelog.d/elixir-1-19.add b/changelog.d/elixir-1-19.add
new file mode 100644
index 000000000..b010b2dfa
--- /dev/null
+++ b/changelog.d/elixir-1-19.add
@@ -0,0 +1 @@
+Implemented ConfigDB configuration blacklist and accompanying Mix task

From 41ab34757113338ec59b56fe4e57b733f002a976 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 16:13:39 +0200
Subject: [PATCH 107/163] Lint

---
 lib/mix/tasks/pleroma/config.ex                  |  1 +
 .../admin_api/controllers/config_controller.ex   |  2 +-
 test/mix/tasks/pleroma/config_test.exs           |  7 ++-----
 .../controllers/config_controller_test.exs       | 16 +++++++++++++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index d160ce533..bfdd01c70 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -342,6 +342,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       end
     end
   end
+
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
     with :ok <- Pleroma.Config.DeprecationWarnings.warn() do
diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 503fbc14d..78c798a3b 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -212,7 +212,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
 
         {blacklisted_group, blacklisted_key} ->
           group == inspect(blacklisted_group) and key == inspect(blacklisted_key)
-        end)
+      end)
     else
       true
     end
diff --git a/test/mix/tasks/pleroma/config_test.exs b/test/mix/tasks/pleroma/config_test.exs
index b35e0aed8..7513e958e 100644
--- a/test/mix/tasks/pleroma/config_test.exs
+++ b/test/mix/tasks/pleroma/config_test.exs
@@ -372,10 +372,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
 
     test "filters blacklisted settings" do
       clear_config(:database_config_whitelist, [{:pleroma}])
-      clear_config(:database_config_blacklist, [
-        {:pleroma, :logger},
-        {:blacklisted_group}
-      ])
+      clear_config(:database_config_blacklist, [{:pleroma, :logger}, {:blacklisted_group}])
 
       insert_config_record(:pleroma, :logger, backends: :console)
       insert_config_record(:web_push_encryption, :vapid_details, a: 1)
@@ -387,7 +384,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
                %ConfigDB{group: :pleroma, key: :instance},
                %ConfigDB{group: :pleroma, key: Pleroma.Captcha},
                %ConfigDB{group: :pleroma2, key: :key2},
-               %ConfigDB{group: :web_push_encryption, key: :vapid_details},
+               %ConfigDB{group: :web_push_encryption, key: :vapid_details}
              ] = config_records()
     end
 
diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
index 047662d39..902b30cdd 100644
--- a/test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@ -1246,7 +1246,12 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
     end
 
     test "doesn't set keys in the blacklist", %{conn: conn} do
-      clear_config(:database_config_blacklist, [{:pleroma, :logger}, {:pleroma, :key2}, {:pleroma, Pleroma.Captcha.NotReal}, {:blacklisted_group}])
+      clear_config(:database_config_blacklist, [
+        {:pleroma, :logger},
+        {:pleroma, :key2},
+        {:pleroma, Pleroma.Captcha.NotReal},
+        {:blacklisted_group}
+      ])
 
       conn
       |> put_req_header("content-type", "application/json")
@@ -1563,9 +1568,14 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
     end
 
     test "filters by database configuration blacklist and whitelist", %{conn: conn} do
-      clear_config(:database_config_whitelist, [{:pleroma, :instance}, {:pleroma, :activitypub}, {:pleroma, Pleroma.Upload}])
+      clear_config(:database_config_whitelist, [
+        {:pleroma, :instance},
+        {:pleroma, :activitypub},
+        {:pleroma, Pleroma.Upload}
+      ])
+
       clear_config(:database_config_blacklist, [
-        {:pleroma, Pleroma.Upload},
+        {:pleroma, Pleroma.Upload}
       ])
 
       children =

From a89fe828d3f221a9670736556caf6e02972dd66d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 20:43:33 +0200
Subject: [PATCH 108/163] ConfigDB: Don't use a different config whitelist
 globally in tests

---
 .../controllers/config_controller_test.exs    | 131 +++++++++---------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
index 902b30cdd..c11ece10d 100644
--- a/test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@ -194,19 +194,9 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
 
     setup do: clear_config(:configurable_from_database, true)
 
-    setup do:
-            clear_config(:database_config_whitelist, [
-              {:pleroma},
-              {:http},
-              {:idna},
-              {:oban},
-              {:tesla},
-              {:ueberauth}
-            ])
-
     test "create new config setting in db", %{conn: conn} do
-      ueberauth = Application.get_env(:ueberauth, Ueberauth)
-      on_exit(fn -> Application.put_env(:ueberauth, Ueberauth, ueberauth) end)
+      aws = Application.get_env(:ex_aws, :s3)
+      on_exit(fn -> Application.put_env(:ex_aws, :s3, aws) end)
 
       conn =
         conn
@@ -215,9 +205,9 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
           configs: [
             %{group: ":pleroma", key: ":key1", value: "value1"},
             %{
-              group: ":ueberauth",
-              key: "Ueberauth",
-              value: [%{"tuple" => [":consumer_secret", "aaaa"]}]
+              group: ":cors_plug",
+              key: ":key1",
+              value: [%{"tuple" => [":key", "value"]}]
             },
             %{
               group: ":pleroma",
@@ -244,9 +234,9 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
               value: %{":nested_5" => ":upload", "endpoint" => "https://example.com"}
             },
             %{
-              group: ":idna",
-              key: ":key5",
-              value: %{"tuple" => ["string", "Pleroma.Captcha.NotReal", []]}
+              group: ":ex_aws",
+              key: ":s3",
+              value: %{"tuple" => ["access_key_id", "aaaa", []]}
             }
           ]
         })
@@ -260,10 +250,10 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
                    "db" => [":key1"]
                  },
                  %{
-                   "group" => ":ueberauth",
-                   "key" => "Ueberauth",
-                   "value" => [%{"tuple" => [":consumer_secret", "aaaa"]}],
-                   "db" => [":consumer_secret"]
+                   "group" => ":cors_plug",
+                   "key" => ":key1",
+                   "value" => [%{"tuple" => [":key", "value"]}],
+                   "db" => [":key"]
                  },
                  %{
                    "group" => ":pleroma",
@@ -293,10 +283,10 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
                    "db" => [":key4"]
                  },
                  %{
-                   "group" => ":idna",
-                   "key" => ":key5",
-                   "value" => %{"tuple" => ["string", "Pleroma.Captcha.NotReal", []]},
-                   "db" => [":key5"]
+                   "group" => ":ex_aws",
+                   "key" => ":s3",
+                   "value" => %{"tuple" => ["access_key_id", "aaaa", []]},
+                   "db" => [":s3"]
                  }
                ],
                "need_reboot" => false
@@ -322,18 +312,19 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
                nested_5: :upload
              }
 
-      assert Application.get_env(:idna, :key5) == {"string", Pleroma.Captcha.NotReal, []}
+      assert Application.get_env(:cors_plug, :key1) == [key: "value"]
+      assert Application.get_env(:ex_aws, :s3) == {"access_key_id", "aaaa", []}
     end
 
     test "save configs setting without explicit key", %{conn: conn} do
-      adapter = Application.get_env(:http, :adapter)
-      send_user_agent = Application.get_env(:http, :send_user_agent)
-      user_agent = Application.get_env(:http, :user_agent)
+      mime = Application.get_env(:mime, :library)
+      prometheus = Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter)
+      web_push = Application.get_env(:web_push_encryption, :vapid_details)
 
       on_exit(fn ->
-        Application.put_env(:http, :adapter, adapter)
-        Application.put_env(:http, :send_user_agent, send_user_agent)
-        Application.put_env(:http, :user_agent, user_agent)
+        Application.put_env(:mime, :library, mime)
+        Application.put_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter, prometheus)
+        Application.put_env(:web_push_encryption, :vapid_details, web_push)
       end)
 
       conn =
@@ -342,19 +333,19 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
         |> post("/api/pleroma/admin/config", %{
           configs: [
             %{
-              group: ":http",
-              key: ":adapter",
+              group: ":mime",
+              key: ":library",
               value: [":someval"]
             },
             %{
-              group: ":http",
-              key: ":send_user_agent",
+              group: ":prometheus",
+              key: "Pleroma.Web.Endpoint.MetricsExporter",
               value: true
             },
             %{
-              group: ":http",
-              key: ":user_agent",
-              value: [":default"]
+              group: ":web_push_encryption",
+              key: ":vapid_details",
+              value: [":nope"]
             }
           ]
         })
@@ -362,30 +353,30 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
       assert json_response_and_validate_schema(conn, 200) == %{
                "configs" => [
                  %{
-                   "group" => ":http",
-                   "key" => ":adapter",
+                   "group" => ":mime",
+                   "key" => ":library",
                    "value" => [":someval"],
-                   "db" => [":adapter"]
+                   "db" => [":library"]
                  },
                  %{
-                   "group" => ":http",
-                   "key" => ":send_user_agent",
+                   "group" => ":prometheus",
+                   "key" => "Pleroma.Web.Endpoint.MetricsExporter",
                    "value" => true,
-                   "db" => [":send_user_agent"]
+                   "db" => ["Pleroma.Web.Endpoint.MetricsExporter"]
                  },
                  %{
-                   "group" => ":http",
-                   "key" => ":user_agent",
-                   "value" => [":default"],
-                   "db" => [":user_agent"]
+                   "group" => ":web_push_encryption",
+                   "key" => ":vapid_details",
+                   "value" => [":nope"],
+                   "db" => [":vapid_details"]
                  }
                ],
                "need_reboot" => false
              }
 
-      assert Application.get_env(:http, :adapter) == [:someval]
-      assert Application.get_env(:http, :send_user_agent) == true
-      assert Application.get_env(:http, :user_agent) == [:default]
+      assert Application.get_env(:mime, :library) == [:someval]
+      assert Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter) == true
+      assert Application.get_env(:web_push_encryption, :vapid_details) == [:nope]
     end
 
     test "saving config with partial update", %{conn: conn} do
@@ -631,17 +622,17 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
         |> put_req_header("content-type", "application/json")
         |> post("/api/pleroma/admin/config", %{
           configs: [
-            %{group: ":tesla", key: ":adapter", value: "Tesla.Adapter.Httpc"}
+            %{group: ":pleroma", key: ":key1", value: "Pleroma.Web.Endpoint"}
           ]
         })
 
       assert json_response_and_validate_schema(conn, 200) == %{
                "configs" => [
                  %{
-                   "group" => ":tesla",
-                   "key" => ":adapter",
-                   "value" => "Tesla.Adapter.Httpc",
-                   "db" => [":adapter"]
+                   "group" => ":pleroma",
+                   "key" => ":key1",
+                   "value" => "Pleroma.Web.Endpoint",
+                   "db" => [":key1"]
                  }
                ],
                "need_reboot" => false
@@ -653,14 +644,14 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
       admin: admin,
       token: token
     } do
-      ueberauth = Application.get_env(:ueberauth, Ueberauth)
+      prometheus = Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter)
       insert(:config, key: :keyaa1)
       insert(:config, key: :keyaa2)
 
       config3 =
         insert(:config,
-          group: :ueberauth,
-          key: Ueberauth
+          group: :prometheus,
+          key: Pleroma.Web.Endpoint.MetricsExporter
         )
 
       conn =
@@ -693,7 +684,9 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
 
       assert Application.get_env(:pleroma, :keyaa1) == "another_value"
       assert Application.get_env(:pleroma, :keyaa2) == "another_value"
-      assert Application.get_env(:ueberauth, Ueberauth) == config3.value
+
+      assert Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter) ==
+               config3.value
 
       conn =
         build_conn()
@@ -704,8 +697,8 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
           configs: [
             %{group: ":pleroma", key: ":keyaa2", delete: true},
             %{
-              group: ":ueberauth",
-              key: "Ueberauth",
+              group: ":prometheus",
+              key: "Pleroma.Web.Endpoint.MetricsExporter",
               delete: true
             }
           ]
@@ -716,7 +709,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
                "need_reboot" => false
              }
 
-      assert Application.get_env(:ueberauth, Ueberauth) == ueberauth
+      assert Application.get_env(:prometheus, Pleroma.Web.Endpoint.MetricsExporter) == prometheus
       refute Keyword.has_key?(Application.get_all_env(:pleroma), :keyaa2)
     end
 
@@ -1021,8 +1014,8 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
         |> post("/api/pleroma/admin/config", %{
           configs: [
             %{
-              "group" => ":oban",
-              "key" => ":queues",
+              "group" => ":pleroma",
+              "key" => ":nonexist_oban_queues",
               "value" => [
                 %{"tuple" => [":federator_incoming", 50]},
                 %{"tuple" => [":federator_outgoing", 50]},
@@ -1039,8 +1032,8 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
       assert json_response_and_validate_schema(conn, 200) == %{
                "configs" => [
                  %{
-                   "group" => ":oban",
-                   "key" => ":queues",
+                   "group" => ":pleroma",
+                   "key" => ":nonexist_oban_queues",
                    "value" => [
                      %{"tuple" => [":federator_incoming", 50]},
                      %{"tuple" => [":federator_outgoing", 50]},

From a9aa19585b4d1fb28ded5c7b717e5e6d8b7b610f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 23:02:38 +0200
Subject: [PATCH 109/163] Elixir 1.19: Emit debug logger reconfiguration logs
 in test env as well

---
 lib/pleroma/config/deprecation_warnings.ex | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 8f8786ee7..934a4a02e 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -424,16 +424,16 @@ defmodule Pleroma.Config.DeprecationWarnings do
     formatter = Logger.default_formatter(formatter_config)
     log_level = Keyword.get(config, :level, nil)
 
+    Logger.debug("""
+    Reconfiguring console Logger with deprecated configuration syntax.
+      Handler configuration:
+        log_level: #{inspect(log_level)}
+
+      Formatter:
+        #{inspect(formatter)}
+    """)
+
     if Config.get(:env) != :test do
-      Logger.debug("""
-      Reconfiguring console Logger with deprecated configuration syntax.
-        Handler configuration:
-          log_level: #{inspect(log_level)}
-
-        Formatter:
-          #{inspect(formatter)}
-      """)
-
       if log_level, do: :logger.update_handler_config(:default, :level, log_level)
       :logger.set_handler_config(:default, :formatter, formatter)
     end

From 70cb241173bad3d682c6c889db24171fc69a2550 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 18 Jul 2026 23:07:52 +0200
Subject: [PATCH 110/163] Elixir 1.19: Fixup unit testing CI name

---
 .woodpecker/unit-testing-elixir-1.19.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/unit-testing-elixir-1.19.yaml b/.woodpecker/unit-testing-elixir-1.19.yaml
index efab97223..06dc6758e 100644
--- a/.woodpecker/unit-testing-elixir-1.19.yaml
+++ b/.woodpecker/unit-testing-elixir-1.19.yaml
@@ -19,7 +19,7 @@ variables:
     - 'printf "%s" "$CI_SCRIPT" | base64 -d > /tmp/ci-script.sh && /bin/sh -xe /tmp/ci-script.sh'
 
 steps:
-  unit-testing-elixir-1.18:
+  unit-testing-elixir-1.19:
     image: elixir:1.19-otp-28-alpine
     entrypoint: *script_file_entrypoint
     environment:

From 3ab8cc1eb9afa893eaf3cc6bd1487dc5a72ffddc Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 01:29:53 +0200
Subject: [PATCH 111/163] ApplicationTest: make clear_config delete the whole
 env tree

clear_config([:logger, :backends], [value]) leaves the :logger env key
behind which breaks a ConfigDB test where the :logger key shouldn't be
stored and set.
---
 test/pleroma/application_test.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
index b4a29fc9b..79fc18d8a 100644
--- a/test/pleroma/application_test.exs
+++ b/test/pleroma/application_test.exs
@@ -9,7 +9,7 @@ defmodule Pleroma.ApplicationTest do
 
   describe "config :pleroma, :logger, backends: [{:ex_syslogger, :ex_syslogger}]" do
     setup do
-      clear_config([:logger, :backends], [{:ex_syslogger, :ex_syslogger}])
+      clear_config([:logger], backends: [{:ex_syslogger, :ex_syslogger}])
     end
 
     test "is handled" do
@@ -24,7 +24,7 @@ defmodule Pleroma.ApplicationTest do
 
   describe "config :pleroma, :logger, :backends: [:console]" do
     setup do
-      clear_config([:logger, :backends], [:console])
+      clear_config([:logger], backends: [:console])
     end
 
     test "emits a warning" do

From 232cdab753b34baa7d8e573e97706a9bce41ae6d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 21:37:20 +0200
Subject: [PATCH 112/163] ConfigDB: Refactor and simplify whitelist/blacklist
 filter tasks

---
 lib/mix/tasks/pleroma/config.ex | 97 ++++++++++++++-------------------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index bfdd01c70..f49af1ef8 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -252,40 +252,14 @@ defmodule Mix.Tasks.Pleroma.Config do
     if whitelisted_configs in [nil, false] do
       shell_error("No unwanted settings in ConfigDB. No changes made.")
     else
-      whitelisted_groups =
-        whitelisted_configs
-        |> Enum.filter(fn
-          {_group} -> true
-          _ -> false
-        end)
-        |> Enum.map(fn {group} -> group end)
-
-      whitelisted_keys =
-        whitelisted_configs
-        |> Enum.filter(fn
-          {_group, _key} -> true
-          _ -> false
-        end)
+      {whitelisted_groups, whitelisted_keys} = get_filters(whitelisted_configs)
 
       filtered =
         from(c in ConfigDB)
         |> Repo.all()
         |> Enum.filter(&not_whitelisted?(&1, whitelisted_groups, whitelisted_keys))
 
-      if not Enum.empty?(filtered) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-        Enum.each(filtered, &dump(&1))
-
-        if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-          filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
-
-          Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
-        else
-          shell_error("No changes made.")
-        end
-      else
-        shell_error("No unwanted settings in ConfigDB. No changes made.")
-      end
+      do_config_filter(filtered, force)
     end
   end
 
@@ -307,39 +281,14 @@ defmodule Mix.Tasks.Pleroma.Config do
     if blacklisted_configs in [nil, false] do
       shell_error("No unwanted settings in ConfigDB. No changes made.")
     else
-      blacklisted_groups =
-        blacklisted_configs
-        |> Enum.filter(fn
-          {_group} -> true
-          _ -> false
-        end)
-
-      blacklisted_keys =
-        blacklisted_configs
-        |> Enum.filter(fn
-          {_group, _key} -> true
-          _ -> false
-        end)
+      {blacklisted_groups, blacklisted_keys} = get_filters(blacklisted_configs)
 
       filtered =
         from(c in ConfigDB)
         |> Repo.all()
         |> Enum.filter(&blacklisted?(&1, blacklisted_groups, blacklisted_keys))
 
-      if not Enum.empty?(filtered) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-        Enum.each(filtered, &dump(&1))
-
-        if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-          filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
-
-          Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
-        else
-          shell_error("No changes made.")
-        end
-      else
-        shell_error("No unwanted settings in ConfigDB. No changes made.")
-      end
+      do_config_filter(filtered, force)
     end
   end
 
@@ -544,13 +493,49 @@ defmodule Mix.Tasks.Pleroma.Config do
     Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
   end
 
+  defp get_filters(config) do
+    groups =
+      config
+      |> Enum.filter(fn
+        {_group} -> true
+        _ -> false
+      end)
+      |>Enum.map(fn {group} -> group end)
+
+    keys =
+      config
+      |> Enum.filter(fn
+        {_group, _key} -> true
+        _ -> false
+      end)
+
+    {groups, keys}
+  end
+
   defp not_whitelisted?(%{group: group, key: key}, whitelisted_groups, whitelisted_keys) do
     not Enum.member?(whitelisted_groups, group) and
       not Enum.member?(whitelisted_keys, {group, key})
   end
 
   defp blacklisted?(%{group: group, key: key}, blacklisted_groups, blacklisted_keys) do
-    Enum.member?(blacklisted_groups, {group}) or
+    Enum.member?(blacklisted_groups, group) or
       Enum.member?(blacklisted_keys, {group, key})
   end
+
+  defp do_config_filter(filtered, _) when length(filtered) == 0 do
+    shell_error("No unwanted settings in ConfigDB. No changes made.")
+  end
+
+  defp do_config_filter(filtered, force) do
+    shell_info("The following settings will be removed from ConfigDB:\n")
+    Enum.each(filtered, &dump(&1))
+
+    if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
+
+      Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
+    else
+      shell_error("No changes made.")
+    end
+  end
 end

From 4c27a3c5a0f2bd0bf5956f3fbcde244f45267379 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 21:52:31 +0200
Subject: [PATCH 113/163] ConfigDB: Refactor AdminAPI controller config
 filtering

---
 .../controllers/config_controller.ex          | 63 +++++++------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 78c798a3b..0f17ca05d 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -73,8 +73,8 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
   def descriptions(conn, _params) do
     descriptions =
       Pleroma.Docs.JSON.compiled_descriptions()
-      |> Enum.filter(&whitelisted_config?/1)
-      |> Enum.reject(&blacklisted_config?/1)
+      |> Enum.filter(&allowed_config?(&1, :whitelist))
+      |> Enum.reject(&allowed_config?(&1, :blacklist))
 
     json(conn, translate_descriptions(descriptions))
   end
@@ -135,8 +135,8 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
     with :ok <- configurable_from_database() do
       results =
         configs
-        |> Enum.filter(&whitelisted_config?/1)
-        |> Enum.reject(&blacklisted_config?/1)
+        |> Enum.filter(&allowed_config?(&1, :whitelist))
+        |> Enum.reject(&allowed_config?(&1, :blacklist))
         |> Enum.map(fn
           %{group: group, key: key, delete: true} = params ->
             ConfigDB.delete(%{group: group, key: key, subkeys: params[:subkeys]})
@@ -178,51 +178,34 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
     end
   end
 
-  defp whitelisted_config?(":pleroma", ":database_config_whitelist"), do: false
+  defp allowed_config?(":pleroma", ":database_config_whitelist", _), do: true
+  defp allowed_config?(":pleroma", ":database_config_blacklist", _), do: true
 
-  defp whitelisted_config?(group, key) do
-    if whitelisted_configs = Config.get(:database_config_whitelist) do
-      Enum.any?(whitelisted_configs, fn
-        {whitelisted_group} ->
-          group == inspect(whitelisted_group)
+  defp allowed_config?(group, key, mode) do
+    configs = 
+      case mode do
+        :whitelist -> Config.get(:database_config_whitelist)
+        :blacklist -> Config.get(:database_config_blacklist)
+    end
 
-        {whitelisted_group, whitelisted_key} ->
-          group == inspect(whitelisted_group) && key == inspect(whitelisted_key)
+    if configs do
+      Enum.any?(configs, fn
+        {allowed_group} ->
+          group == inspect(allowed_group)
+
+        {allowed_group, allowed_key} ->
+          group == inspect(allowed_group) && key == inspect(allowed_key)
       end)
     else
       true
     end
   end
 
-  defp whitelisted_config?(%{group: group, key: key}) do
-    whitelisted_config?(group, key)
+  defp allowed_config?(%{group: group, key: key}, mode) do
+    allowed_config?(group, key, mode)
   end
 
-  defp whitelisted_config?(%{group: group} = config) do
-    whitelisted_config?(group, config[:key])
-  end
-
-  defp blacklisted_config?(":pleroma", ":database_config_blacklist"), do: true
-
-  defp blacklisted_config?(group, key) do
-    if blacklisted_configs = Config.get(:database_config_blacklist) do
-      Enum.any?(blacklisted_configs, fn
-        {blacklisted_group} ->
-          group == inspect(blacklisted_group)
-
-        {blacklisted_group, blacklisted_key} ->
-          group == inspect(blacklisted_group) and key == inspect(blacklisted_key)
-      end)
-    else
-      true
-    end
-  end
-
-  defp blacklisted_config?(%{group: group, key: key}) do
-    blacklisted_config?(group, key)
-  end
-
-  defp blacklisted_config?(%{group: group} = config) do
-    blacklisted_config?(group, config[:key])
+  defp allowed_config?(%{group: group} = config, mode) do
+    allowed_config?(group, config[:key], mode)
   end
 end

From 0448ba5cd2b9dee3cafdeed878c04086646ad14f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 22:09:32 +0200
Subject: [PATCH 114/163] ApplicationTest: skip test spamming warnings from
 ExSyslogger

:warn log level is deprecated, but ExSyslogger hasn't been updated yet.
---
 test/pleroma/application_test.exs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/pleroma/application_test.exs b/test/pleroma/application_test.exs
index 79fc18d8a..75ddec08e 100644
--- a/test/pleroma/application_test.exs
+++ b/test/pleroma/application_test.exs
@@ -7,11 +7,15 @@ defmodule Pleroma.ApplicationTest do
 
   import ExUnit.CaptureLog
 
+  # TODO HACK: Temporarily disabled.
+  # Currently causes a bunch of warnings about :warn being deprecated in logs.
+  # ex_syslogger needs to either be updated upstream or forked.
   describe "config :pleroma, :logger, backends: [{:ex_syslogger, :ex_syslogger}]" do
     setup do
       clear_config([:logger], backends: [{:ex_syslogger, :ex_syslogger}])
     end
 
+    @tag :skip
     test "is handled" do
       log = capture_log(fn -> Pleroma.Application.configure_logger() end)
 

From bbae94ddf3844f0c5b7eabb97235e5dff672ff6f Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 22:15:37 +0200
Subject: [PATCH 115/163] Revert "Only warn about bad clear_config usage if
 warned usage is met"

What was I even thinking when writing that?

This reverts commit 3790e6786cce376cbabf2588beed27d0daf9c55c.
---
 test/support/helpers.ex | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 259180e8f..7fa6c31a4 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -73,8 +73,7 @@ defmodule Pleroma.Tests.Helpers do
   defmacro clear_config(config_path, temp_setting) do
     # NOTE: `clear_config([section, key], value)` != `clear_config([section], key: value)` (!)
     # Displaying a warning to prevent unintentional clearing of all but one keys in section
-    if is_list(config_path) and length(config_path) == 1 and Keyword.keyword?(temp_setting) and
-         Keyword.keys(temp_setting) == [:key] do
+    if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
       Logger.warning(
         "Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`"
       )

From 00c9059252e4ef124a9cbe21a28b947993e5bcdb Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 22:23:20 +0200
Subject: [PATCH 116/163] Remove unused require Logger

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

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index b65b0e630..62f5bdeea 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -11,8 +11,6 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
   alias Pleroma.Config
   alias Pleroma.Config.DeprecationWarnings
 
-  require Logger
-
   describe "filter exiftool" do
     test "gives warning when still used" do
       clear_config(

From 3ba331939076f4a3785ce809bf7c0b7488ef2efe Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 22:56:41 +0200
Subject: [PATCH 117/163] Lint

---
 lib/mix/tasks/pleroma/config.ex                            | 2 +-
 lib/pleroma/web/admin_api/controllers/config_controller.ex | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index f49af1ef8..a10506236 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -500,7 +500,7 @@ defmodule Mix.Tasks.Pleroma.Config do
         {_group} -> true
         _ -> false
       end)
-      |>Enum.map(fn {group} -> group end)
+      |> Enum.map(fn {group} -> group end)
 
     keys =
       config
diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 0f17ca05d..753690d45 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -182,11 +182,11 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
   defp allowed_config?(":pleroma", ":database_config_blacklist", _), do: true
 
   defp allowed_config?(group, key, mode) do
-    configs = 
+    configs =
       case mode do
         :whitelist -> Config.get(:database_config_whitelist)
         :blacklist -> Config.get(:database_config_blacklist)
-    end
+      end
 
     if configs do
       Enum.any?(configs, fn

From bde0e3e35339a7ab68543d0c260eeb5e6ce1b02e Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 19 Jul 2026 23:14:14 +0200
Subject: [PATCH 118/163] Woodpecker CI: Build Vix in unit test pipelines
 instead of downloading

---
 .woodpecker/unit-testing-elixir-1.15.yaml | 3 ++-
 .woodpecker/unit-testing-elixir-1.19.yaml | 3 ++-
 changelog.d/unit-testing-build-vix.skip   | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/unit-testing-build-vix.skip

diff --git a/.woodpecker/unit-testing-elixir-1.15.yaml b/.woodpecker/unit-testing-elixir-1.15.yaml
index a5bcc0ef3..0f8eac566 100644
--- a/.woodpecker/unit-testing-elixir-1.15.yaml
+++ b/.woodpecker/unit-testing-elixir-1.15.yaml
@@ -24,10 +24,11 @@ steps:
     entrypoint: *script_file_entrypoint
     environment:
       MIX_ENV: test
+      VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS
       DB_HOST: postgres
       DB_PORT: 5432
     commands:
-      - apk add --no-cache build-base cmake exiftool ffmpeg file-dev git openssl
+      - apk add --no-cache build-base cmake exiftool ffmpeg vips-dev file-dev git openssl
       - adduser -D -h /home/testuser testuser
       - mkdir -p /home/testuser/.mix /home/testuser/.hex
       - chown -R testuser:testuser . /home/testuser
diff --git a/.woodpecker/unit-testing-elixir-1.19.yaml b/.woodpecker/unit-testing-elixir-1.19.yaml
index 06dc6758e..60b0826a7 100644
--- a/.woodpecker/unit-testing-elixir-1.19.yaml
+++ b/.woodpecker/unit-testing-elixir-1.19.yaml
@@ -24,10 +24,11 @@ steps:
     entrypoint: *script_file_entrypoint
     environment:
       MIX_ENV: test
+      VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS
       DB_HOST: postgres
       DB_PORT: 5432
     commands:
-      - apk add --no-cache build-base cmake exiftool ffmpeg file-dev git openssl
+      - apk add --no-cache build-base cmake exiftool ffmpeg vips-dev file-dev git openssl
       - adduser -D -h /home/testuser testuser
       - mkdir -p /home/testuser/.mix /home/testuser/.hex
       - chown -R testuser:testuser . /home/testuser
diff --git a/changelog.d/unit-testing-build-vix.skip b/changelog.d/unit-testing-build-vix.skip
new file mode 100644
index 000000000..e69de29bb

From ac08f0487f339dd1fba74622180e84e30cb1a264 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 20 Jul 2026 11:14:09 +0200
Subject: [PATCH 119/163] Woodpecker CI: Do not build arm/v7 in PR, simplify

---
 .woodpecker/docker-armv7.yaml                 | 29 +++++--------------
 .../docker-arm32v7-pr-forbid-build.skip       |  0
 2 files changed, 7 insertions(+), 22 deletions(-)
 create mode 100644 changelog.d/docker-arm32v7-pr-forbid-build.skip

diff --git a/.woodpecker/docker-armv7.yaml b/.woodpecker/docker-armv7.yaml
index c921a56f9..d001da787 100644
--- a/.woodpecker/docker-armv7.yaml
+++ b/.woodpecker/docker-armv7.yaml
@@ -1,7 +1,4 @@
 when:
-  # Temporary PR validation while arm/v7 Docker builds are being brought up.
-  - event: pull_request
-    path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ]
   - event: push
     branch: ${CI_REPO_DEFAULT_BRANCH}
     path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ]
@@ -20,6 +17,10 @@ variables:
   docker_variables: &docker_variables
     repo: pleroma/pleroma
     registry: git.pleroma.social
+    username:
+      from_secret: pleroma-ci-user
+    password:
+      from_secret: pleroma-ci-password
   armv7_build_settings: &armv7_build_settings
     <<: *docker_variables
     build_args:
@@ -28,24 +29,8 @@ variables:
       - ALPINE_IMG=arm32v7/alpine
       - ALPINE_VER=3.20
     extra_opts: --custom-platform=linux/arm/v7
-  armv7_push_settings: &armv7_push_settings
-    <<: *armv7_build_settings
-    username:
-      from_secret: pleroma-ci-user
-    password:
-      from_secret: pleroma-ci-password
 
 steps:
-  docker-armv7-pr:
-    image: woodpeckerci/plugin-kaniko:2.3.1
-    when:
-      - event: pull_request
-    settings:
-      <<: *armv7_build_settings
-      dry_run: true
-      tags:
-        - armv7-pr-check
-
   docker-develop-armv7:
     image: woodpeckerci/plugin-kaniko:2.3.1
     when:
@@ -54,7 +39,7 @@ steps:
       - event: manual
         branch: ${CI_REPO_DEFAULT_BRANCH}
     settings:
-      <<: *armv7_push_settings
+      <<: *armv7_build_settings
       tags:
         - latest-armv7
         - develop-armv7
@@ -65,7 +50,7 @@ steps:
     when:
       - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
     settings:
-      <<: *armv7_push_settings
+      <<: *armv7_build_settings
       tags:
         - latest-armv7
         - stable-armv7
@@ -77,7 +62,7 @@ steps:
       - event: tag
       - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
     settings:
-      <<: *armv7_push_settings
+      <<: *armv7_build_settings
       tags:
         - latest-armv7
         - stable-armv7
diff --git a/changelog.d/docker-arm32v7-pr-forbid-build.skip b/changelog.d/docker-arm32v7-pr-forbid-build.skip
new file mode 100644
index 000000000..e69de29bb

From 631094666c2a5b4009eec452ec9929c026256b08 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 30 May 2026 18:41:01 +0200
Subject: [PATCH 120/163] Woodpecker CI: Unify armv7 workflow with main Docker
 workflow

---
 .woodpecker/docker-armv7.yaml | 70 -----------------------------------
 .woodpecker/docker.yaml       | 42 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 70 deletions(-)
 delete mode 100644 .woodpecker/docker-armv7.yaml

diff --git a/.woodpecker/docker-armv7.yaml b/.woodpecker/docker-armv7.yaml
deleted file mode 100644
index d001da787..000000000
--- a/.woodpecker/docker-armv7.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-when:
-  - event: push
-    branch: ${CI_REPO_DEFAULT_BRANCH}
-    path: [ "**/*.ex", "**/*.eex", "**/*.exs", "mix.lock", ".woodpecker/**", "Dockerfile" ]
-  - event: tag
-  - event: manual
-    branch: ${CI_REPO_DEFAULT_BRANCH}
-  - event: manual
-    branch: stable
-
-# Target the CAX21 arm64 host with native arm32 userspace support, not generic arm64 runners.
-labels:
-  platform: linux/arm
-  armv7: native
-
-variables:
-  docker_variables: &docker_variables
-    repo: pleroma/pleroma
-    registry: git.pleroma.social
-    username:
-      from_secret: pleroma-ci-user
-    password:
-      from_secret: pleroma-ci-password
-  armv7_build_settings: &armv7_build_settings
-    <<: *docker_variables
-    build_args:
-      - ELIXIR_IMG=arm32v7/elixir
-      - ELIXIR_TAG=1.17.3-otp-26-alpine
-      - ALPINE_IMG=arm32v7/alpine
-      - ALPINE_VER=3.20
-    extra_opts: --custom-platform=linux/arm/v7
-
-steps:
-  docker-develop-armv7:
-    image: woodpeckerci/plugin-kaniko:2.3.1
-    when:
-      - event: push
-        branch: ${CI_REPO_DEFAULT_BRANCH}
-      - event: manual
-        branch: ${CI_REPO_DEFAULT_BRANCH}
-    settings:
-      <<: *armv7_build_settings
-      tags:
-        - latest-armv7
-        - develop-armv7
-        - ${CI_COMMIT_SHA:0:8}-armv7
-
-  docker-stable-armv7:
-    image: woodpeckerci/plugin-kaniko:2.3.1
-    when:
-      - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
-    settings:
-      <<: *armv7_build_settings
-      tags:
-        - latest-armv7
-        - stable-armv7
-        - ${CI_COMMIT_SHA:0:8}-armv7
-
-  docker-stable-tag-armv7:
-    image: woodpeckerci/plugin-kaniko:2.3.1
-    when:
-      - event: tag
-      - evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
-    settings:
-      <<: *armv7_build_settings
-      tags:
-        - latest-armv7
-        - stable-armv7
-        - ${CI_COMMIT_SHA:0:8}-armv7
-        - ${CI_COMMIT_TAG}-armv7
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 9a5be78e2..7ebd1ffb2 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -12,6 +12,7 @@ matrix:
   platform:
     - linux/amd64
     - linux/arm64
+    - linux/arm
 
 # This is needed for the when clauses below.
 labels:
@@ -26,6 +27,14 @@ variables:
       from_secret: pleroma-ci-user
     password:
       from_secret: pleroma-ci-password
+  armv7_docker_variables: &armv7_docker_variables
+    <<: *docker_variables
+    build_args:
+      - ELIXIR_IMG=arm32v7/elixir
+      - ELIXIR_TAG=1.17.3-otp-26-alpine
+      - ALPINE_IMG=arm32v7/alpine
+      - ALPINE_VER=3.20
+    extra_opts: --custom-platform=linux/arm/v7
   kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
 
 steps:
@@ -51,6 +60,17 @@ steps:
         - develop-arm64
         - ${CI_COMMIT_SHA:0:8}-arm64
 
+  docker-develop-armv7:
+    image: woodpeckerci/plugin-kaniko:2.3.1
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
+    settings:
+      <<: *armv7_docker_variables
+      tags:
+        - latest-armv7
+        - develop-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
   docker-stable-amd64:
     image: *kaniko_image
     when:
@@ -106,3 +126,25 @@ steps:
       tags:
         - <<: *arm64_tags
         - ${CI_COMMIT_TAG}-arm64
+
+  docker-stable-armv7:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
+    settings:
+      <<: *armv7_docker_variables
+      tags: &armv7_tags
+        - latest-armv7
+        - stable-armv7
+        - ${CI_COMMIT_SHA:0:8}-armv7
+
+  docker-stable-tag-armv7:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "tag"'
+      - evaluate: 'platform == "linux/arm" && CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
+    settings:
+      <<: *armv7_docker_variables
+      tags:
+        - <<: *armv7_tags
+        - ${CI_COMMIT_TAG}-armv7

From 7d4b53bf4850938b9e77c0bce487fef201ccd415 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 30 May 2026 18:41:59 +0200
Subject: [PATCH 121/163] Woodpecker CI: include armv7 arch in combined Docker
 tags

---
 .woodpecker/docker-combine.yaml         | 2 +-
 changelog.d/woodpecker-armv7-fixups.fix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/woodpecker-armv7-fixups.fix

diff --git a/.woodpecker/docker-combine.yaml b/.woodpecker/docker-combine.yaml
index 6c91d26e9..9b9f89fdb 100644
--- a/.woodpecker/docker-combine.yaml
+++ b/.woodpecker/docker-combine.yaml
@@ -27,7 +27,7 @@ steps:
     settings: &docker_settings
       registry: "git.pleroma.social"
       image: "pleroma/pleroma"
-      architectures: [amd64, arm64]
+      architectures: [amd64, arm64, armv7]
       tags:
         - latest
         - develop
diff --git a/changelog.d/woodpecker-armv7-fixups.fix b/changelog.d/woodpecker-armv7-fixups.fix
new file mode 100644
index 000000000..7bbe7ab3e
--- /dev/null
+++ b/changelog.d/woodpecker-armv7-fixups.fix
@@ -0,0 +1 @@
+Include arm32v7 in multi-arch Docker images

From f7be7f801883c0843e146686e4ea3fb4e1d73426 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 2 Jun 2026 09:50:38 +0200
Subject: [PATCH 122/163] Woodpecker CI Docker: Switch to kaniko_image anchor
 everywhere

---
 .woodpecker/docker.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 7ebd1ffb2..a9b32f7dd 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -39,7 +39,7 @@ variables:
 
 steps:
   docker-develop-amd64:
-    image: woodpeckerci/plugin-kaniko:2.3.1
+    image: *kaniko_image
     when:
       - evaluate: 'platform == "linux/amd64" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
     settings:
@@ -50,7 +50,7 @@ steps:
         - ${CI_COMMIT_SHA:0:8}-amd64
 
   docker-develop-arm64:
-    image: woodpeckerci/plugin-kaniko:2.3.1
+    image: *kaniko_image
     when:
       - evaluate: 'platform == "linux/arm64" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
     settings:
@@ -61,7 +61,7 @@ steps:
         - ${CI_COMMIT_SHA:0:8}-arm64
 
   docker-develop-armv7:
-    image: woodpeckerci/plugin-kaniko:2.3.1
+    image: *kaniko_image
     when:
       - evaluate: 'platform == "linux/arm" && CI_COMMIT_BRANCH == "${CI_REPO_DEFAULT_BRANCH}"'
     settings:

From 8c8c2de1e1e557892c06ec188e108d5b4951a49e Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 2 Jun 2026 09:51:11 +0200
Subject: [PATCH 123/163] Woodpecker CI Docker: Downgrade to kaniko plugin
 version 2.2.2

2.3.1 duplicates arch variant in the platform triplet resulting in
podman erroring out when using the image.
---
 .woodpecker/docker.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index a9b32f7dd..3df53578d 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -35,7 +35,9 @@ variables:
       - ALPINE_IMG=arm32v7/alpine
       - ALPINE_VER=3.20
     extra_opts: --custom-platform=linux/arm/v7
-  kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
+  # HACK: Temporary downgrade to 2.2.2, update to newest version when
+  # https://github.com/osscontainertools/kaniko/issues/745 lands in a plugin release
+  kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.2.2
 
 steps:
   docker-develop-amd64:

From 56105bc18da0c3efb39d5fe553aa10d751fccb30 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Tue, 2 Jun 2026 09:55:05 +0200
Subject: [PATCH 124/163] Woodpecker CI Docker: fully qualify docker images

---
 .woodpecker/docker.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 3df53578d..d25e43f57 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -30,14 +30,14 @@ variables:
   armv7_docker_variables: &armv7_docker_variables
     <<: *docker_variables
     build_args:
-      - ELIXIR_IMG=arm32v7/elixir
+      - ELIXIR_IMG=docker.io/arm32v7/elixir
       - ELIXIR_TAG=1.17.3-otp-26-alpine
-      - ALPINE_IMG=arm32v7/alpine
+      - ALPINE_IMG=docker.io/arm32v7/alpine
       - ALPINE_VER=3.20
     extra_opts: --custom-platform=linux/arm/v7
   # HACK: Temporary downgrade to 2.2.2, update to newest version when
   # https://github.com/osscontainertools/kaniko/issues/745 lands in a plugin release
-  kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.2.2
+  kaniko_image: &kaniko_image docker.io/woodpeckerci/plugin-kaniko:2.2.2
 
 steps:
   docker-develop-amd64:

From 7ab1901a289c8386ecdfdc148e0848d49ffffc2e Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 20 Jul 2026 16:59:39 +0200
Subject: [PATCH 125/163] Woodpecker CI Docker: Bump Kaniko plugin version to
 2.3.2

Removes the temporary downgrade and updates the plugin to a version that
includes kaniko with a fix for:
https://github.com/osscontainertools/kaniko/issues/745
---
 .woodpecker/docker.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index d25e43f57..1bcf1d2ed 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -35,9 +35,7 @@ variables:
       - ALPINE_IMG=docker.io/arm32v7/alpine
       - ALPINE_VER=3.20
     extra_opts: --custom-platform=linux/arm/v7
-  # HACK: Temporary downgrade to 2.2.2, update to newest version when
-  # https://github.com/osscontainertools/kaniko/issues/745 lands in a plugin release
-  kaniko_image: &kaniko_image docker.io/woodpeckerci/plugin-kaniko:2.2.2
+  kaniko_image: &kaniko_image docker.io/woodpeckerci/plugin-kaniko:2.3.2
 
 steps:
   docker-develop-amd64:

From 103b724962a73af92d2d854a0dadfe5784173b03 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 20 May 2026 20:58:03 +0200
Subject: [PATCH 126/163] EnsureHostMatchesPlug: add missing behavior
 declaration

---
 lib/pleroma/web/plugs/ensure_host_matches_plug.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pleroma/web/plugs/ensure_host_matches_plug.ex b/lib/pleroma/web/plugs/ensure_host_matches_plug.ex
index ab2129f9e..960e86d4f 100644
--- a/lib/pleroma/web/plugs/ensure_host_matches_plug.ex
+++ b/lib/pleroma/web/plugs/ensure_host_matches_plug.ex
@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.Plugs.EnsureHostMatchesPlug do
   @moduledoc "Ensures Host header matches instance"
+  @behaviour Plug
 
   alias Pleroma.Web.Endpoint
 

From a30298c1eb174858fd9aa8a5919e90349f35670c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 20 May 2026 20:58:41 +0200
Subject: [PATCH 127/163] StaticNotFoundPlug: Move 404 on non-existing static
 files to a new plug

This fixes preferred frontends not working (returning 404 on most static
frontend files).
---
 changelog.d/fix-preferred-frontend.fix        |  1 +
 lib/pleroma/web/endpoint.ex                   |  8 ++++
 lib/pleroma/web/plugs/instance_static.ex      | 35 ++---------------
 .../web/plugs/static_not_found_plug.ex        | 38 +++++++++++++++++++
 4 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 changelog.d/fix-preferred-frontend.fix
 create mode 100644 lib/pleroma/web/plugs/static_not_found_plug.ex

diff --git a/changelog.d/fix-preferred-frontend.fix b/changelog.d/fix-preferred-frontend.fix
new file mode 100644
index 000000000..07bf4d0c6
--- /dev/null
+++ b/changelog.d/fix-preferred-frontend.fix
@@ -0,0 +1 @@
+Fix preferred frontend not working due to InstanceStatic plug prematurely returning HTTP 404
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 07b33f866..4582fd0fd 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -139,6 +139,14 @@ defmodule Pleroma.Web.Endpoint do
     from: {:pleroma, "priv/static/adminfe/"}
   )
 
+  plug(Pleroma.Web.Plugs.StaticNotFoundPlug,
+    at: "/",
+    cache_control_for_etags: @static_cache_disabled,
+    headers: %{
+      "cache-control" => @static_cache_disabled
+    }
+  )
+
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.
   if code_reloading? do
diff --git a/lib/pleroma/web/plugs/instance_static.ex b/lib/pleroma/web/plugs/instance_static.ex
index 948188287..d2a674d39 100644
--- a/lib/pleroma/web/plugs/instance_static.ex
+++ b/lib/pleroma/web/plugs/instance_static.ex
@@ -4,7 +4,7 @@
 
 defmodule Pleroma.Web.Plugs.InstanceStatic do
   require Pleroma.Constants
-  import Plug.Conn, only: [put_resp_header: 3, put_status: 2, send_resp: 3, halt: 1]
+  import Plug.Conn, only: [put_resp_header: 3]
 
   @moduledoc """
   This is a shim to call `Plug.Static` but with runtime `from` configuration.
@@ -51,37 +51,10 @@ defmodule Pleroma.Web.Plugs.InstanceStatic do
       |> Map.put(:from, from)
       |> Map.put(:content_types, false)
 
-    conn =
-      conn
-      |> set_content_type(conn.request_path)
-      |> Plug.Static.call(opts)
+    conn = set_content_type(conn, conn.request_path)
 
-    if conn.halted do
-      conn
-    else
-      path = String.trim_leading(conn.request_path, "/")
-
-      if not File.exists?(file_path(path)) do
-        conn
-        |> put_status(:not_found)
-        |> send_404()
-        |> halt()
-      else
-        conn
-      end
-    end
-  end
-
-  defp send_404(conn) do
-    if String.ends_with?(String.downcase(conn.request_path), ".json") do
-      conn
-      |> put_resp_header("content-type", "application/json")
-      |> send_resp(404, Jason.encode!(%{error: "not found"}))
-    else
-      conn
-      |> put_resp_header("content-type", "text/plain")
-      |> send_resp(404, "Not found")
-    end
+    # Call Plug.Static with our sanitized content-type
+    Plug.Static.call(conn, opts)
   end
 
   defp set_content_type(conn, "/emoji/" <> filepath) do
diff --git a/lib/pleroma/web/plugs/static_not_found_plug.ex b/lib/pleroma/web/plugs/static_not_found_plug.ex
new file mode 100644
index 000000000..e2e7a622c
--- /dev/null
+++ b/lib/pleroma/web/plugs/static_not_found_plug.ex
@@ -0,0 +1,38 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2026 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.Plugs.StaticNotFoundPlug do
+  @moduledoc """
+  A small plug that enforces returning 404 on static files when they don't exist.
+  """
+  @behaviour Plug
+
+  require Pleroma.Constants
+  import Plug.Conn, only: [put_resp_header: 3, send_resp: 3, halt: 1]
+
+  def init(opts), do: opts
+
+  for only <- Pleroma.Constants.static_only_files() do
+    def call(%{request_path: "/" <> unquote(only) <> _} = conn, _opts) do
+      send_404(conn)
+    end
+  end
+
+  def call(conn, _) do
+    conn
+  end
+
+  defp send_404(conn) do
+    if String.ends_with?(String.downcase(conn.request_path), ".json") do
+      conn
+      |> put_resp_header("content-type", "application/json")
+      |> send_resp(404, Jason.encode!(%{error: "not found"}))
+    else
+      conn
+      |> put_resp_header("content-type", "text/plain")
+      |> send_resp(404, "Not found")
+    end
+    |> halt()
+  end
+end

From 9129c6579594a06d7c993ba028d9995e8e86b6e7 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sat, 23 May 2026 23:31:24 +0200
Subject: [PATCH 128/163] StaticNotFoundPlug: Move tests out from
 InstanceStatic

---
 .../web/plugs/instance_static_test.exs        | 43 ----------------
 .../web/plugs/static_not_found_plug_test.exs  | 49 +++++++++++++++++++
 2 files changed, 49 insertions(+), 43 deletions(-)
 create mode 100644 test/pleroma/web/plugs/static_not_found_plug_test.exs

diff --git a/test/pleroma/web/plugs/instance_static_test.exs b/test/pleroma/web/plugs/instance_static_test.exs
index 017c49d1e..b5a5a3334 100644
--- a/test/pleroma/web/plugs/instance_static_test.exs
+++ b/test/pleroma/web/plugs/instance_static_test.exs
@@ -137,47 +137,4 @@ defmodule Pleroma.Web.Plugs.InstanceStaticTest do
     # It should be preserved because "image" is in the allowed_mime_types list
     assert content_type == "image/jpeg"
   end
-
-  describe "404s for missing files in static-only paths" do
-    test "returns 404 for non-existent static-only JSON files" do
-      conn = get(build_conn(), "/static/non-existent.json")
-
-      assert conn.status == 404
-      assert ["application/json"] = get_resp_header(conn, "content-type")
-      assert Jason.decode!(conn.resp_body) == %{"error" => "not found"}
-    end
-
-    test "returns 404 for non-existent static-only non-JSON files" do
-      conn = get(build_conn(), "/static/non-existent.txt")
-
-      assert conn.status == 404
-      assert conn.resp_body == "Not found"
-      assert ["text/plain"] = get_resp_header(conn, "content-type")
-    end
-
-    test "returns 404 for non-existent .css files" do
-      conn = get(build_conn(), "/static/non-existent.css")
-
-      assert conn.status == 404
-      assert conn.resp_body == "Not found"
-      # Verifies that we forced text/plain for the error body, even though the path was .css
-      assert ["text/plain"] = get_resp_header(conn, "content-type")
-    end
-
-    test "returns 404 for non-existent files without an extension" do
-      conn = get(build_conn(), "/static/non-existent")
-
-      assert conn.status == 404
-      assert conn.resp_body == "Not found"
-      assert ["text/plain"] = get_resp_header(conn, "content-type")
-    end
-
-    test "returns 200 (falls through to SPA) for non-static-only paths" do
-      # /some-route is NOT in static_only_files, so it should still fall through to the SPA.
-      conn = get(build_conn(), "/some-route")
-
-      assert conn.status == 200
-      assert ["text/html; charset=utf-8"] = get_resp_header(conn, "content-type")
-    end
-  end
 end
diff --git a/test/pleroma/web/plugs/static_not_found_plug_test.exs b/test/pleroma/web/plugs/static_not_found_plug_test.exs
new file mode 100644
index 000000000..a5d063c53
--- /dev/null
+++ b/test/pleroma/web/plugs/static_not_found_plug_test.exs
@@ -0,0 +1,49 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2026 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+defmodule Pleroma.Web.Plugs.StaticNotFoundPlugTest do
+  use Pleroma.Web.ConnCase
+
+  describe "404s for missing files in static-only paths" do
+    test "returns 404 for non-existent static-only JSON files" do
+      conn = get(build_conn(), "/static/non-existent.json")
+
+      assert conn.status == 404
+      assert ["application/json"] = get_resp_header(conn, "content-type")
+      assert Jason.decode!(conn.resp_body) == %{"error" => "not found"}
+    end
+
+    test "returns 404 for non-existent static-only non-JSON files" do
+      conn = get(build_conn(), "/static/non-existent.txt")
+
+      assert conn.status == 404
+      assert conn.resp_body == "Not found"
+      assert ["text/plain"] = get_resp_header(conn, "content-type")
+    end
+
+    test "returns 404 for non-existent .css files" do
+      conn = get(build_conn(), "/static/non-existent.css")
+
+      assert conn.status == 404
+      assert conn.resp_body == "Not found"
+      # Verifies that we forced text/plain for the error body, even though the path was .css
+      assert ["text/plain"] = get_resp_header(conn, "content-type")
+    end
+
+    test "returns 404 for non-existent files without an extension" do
+      conn = get(build_conn(), "/static/non-existent")
+
+      assert conn.status == 404
+      assert conn.resp_body == "Not found"
+      assert ["text/plain"] = get_resp_header(conn, "content-type")
+    end
+
+    test "returns 200 (falls through to SPA) for non-static-only paths" do
+      # /some-route is NOT in static_only_files, so it should still fall through to the SPA.
+      conn = get(build_conn(), "/some-route")
+
+      assert conn.status == 200
+      assert ["text/html; charset=utf-8"] = get_resp_header(conn, "content-type")
+    end
+  end
+end

From 00ca971390f07dc87b2206ededd06493ca20e6c6 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Sun, 24 May 2026 00:49:32 +0200
Subject: [PATCH 129/163] FrontendStaticPlug: Add test for static files outside
 of index

---
 test/pleroma/web/plugs/frontend_static_plug_test.exs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/pleroma/web/plugs/frontend_static_plug_test.exs b/test/pleroma/web/plugs/frontend_static_plug_test.exs
index b7c06eacd..7dc7e52cf 100644
--- a/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@ -122,16 +122,27 @@ defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
 
       clear_config([:frontends, :pickable], ["#{name}/#{ref}"])
       path = "#{@dir}/frontends/#{name}/#{ref}"
+      path2 = "#{@dir}/frontends/#{name}/#{ref}/packs/html"
 
       Pleroma.Backports.mkdir_p!(path)
       File.write!("#{path}/index.html", "from frontend plug")
 
+      Pleroma.Backports.mkdir_p!(path2)
+      File.write!("#{path2}/custom.html", "from frontend plug")
+
       index =
         conn
         |> put_req_cookie("preferred_frontend", "#{name}/#{ref}")
         |> get("/")
 
       assert html_response(index, 200) == "from frontend plug"
+
+      custom =
+        conn
+        |> put_req_cookie("preferred_frontend", "#{name}/#{ref}")
+        |> get("/packs/html/custom.html")
+
+      assert html_response(custom, 200) == "from frontend plug"
     end
 
     test "only returns content from pickable frontends", %{conn: conn} do

From 85a0f2e602914b1ada62ce77b90fd7233c907ada Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 1 Jun 2026 21:20:01 +0200
Subject: [PATCH 130/163] StaticNotFoundPlug: Remove unused plug options

---
 lib/pleroma/web/endpoint.ex | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 4582fd0fd..8552f5d0a 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -139,13 +139,7 @@ defmodule Pleroma.Web.Endpoint do
     from: {:pleroma, "priv/static/adminfe/"}
   )
 
-  plug(Pleroma.Web.Plugs.StaticNotFoundPlug,
-    at: "/",
-    cache_control_for_etags: @static_cache_disabled,
-    headers: %{
-      "cache-control" => @static_cache_disabled
-    }
-  )
+  plug(Pleroma.Web.Plugs.StaticNotFoundPlug)
 
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.

From 1d6664b1f46c7dae805ff5b3d7ea79265a58bb84 Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 1 Jun 2026 21:50:20 +0200
Subject: [PATCH 131/163] InstanceStaticPlug: Add more override and fallback
 tests

---
 .../web/plugs/instance_static_test.exs        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/pleroma/web/plugs/instance_static_test.exs b/test/pleroma/web/plugs/instance_static_test.exs
index b5a5a3334..1d67e8dc3 100644
--- a/test/pleroma/web/plugs/instance_static_test.exs
+++ b/test/pleroma/web/plugs/instance_static_test.exs
@@ -61,6 +61,28 @@ defmodule Pleroma.Web.Plugs.InstanceStaticTest do
     File.write!(@dir <> "/static/kaniini.html", "<h1>rabbit hugs as a service</h1>")
     index = get(build_conn(), "/static/kaniini.html")
     assert html_response(index, 200) == "<h1>rabbit hugs as a service</h1>"
+
+    File.write!(@dir <> "/static/kaniini the bnuuy.html", "<h1>rabbit hugs as a service</h1>")
+    index = get(build_conn(), "/static/kaniini%20the%20bnuuy.html")
+    assert html_response(index, 200) == "<h1>rabbit hugs as a service</h1>"
+  end
+
+  test "overrides /static/styles files with spaces in URL" do
+    Pleroma.Backports.mkdir_p!(@dir <> "/static/styles")
+    File.write(@dir <> "/static/styles/Redmond DX.iss", "overridden")
+
+    index = get(build_conn(), "/static/styles/Redmond%20DX.iss")
+    assert index.status == 200
+    assert index.resp_body == File.read!(@dir <> "/static/styles/Redmond DX.iss")
+    assert index.halted == true
+  end
+
+  test "serves fallback /static/styles files with spaces in URL" do
+    index = get(build_conn(), "/static/styles/Redmond%20DX.iss")
+
+    assert index.status == 200
+    assert index.resp_body == File.read!("priv/static/static/styles/Redmond DX.iss")
+    assert index.halted == true
   end
 
   test "does not sanitize dangerous files in general, as there can be html and javascript files legitimately in this folder" do

From c772f9b40a3b4a09e2c27ccf3eea1a839fa6e92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 21 Jul 2026 01:18:55 +0200
Subject: [PATCH 132/163] Add a failing test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../controllers/timeline_controller_test.exs  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index b685f4ff8..b8d6129bb 100644
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -907,21 +907,25 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       {:ok, activity_test1} = CommonAPI.post(user, %{status: "#test #test1"})
       {:ok, activity_none} = CommonAPI.post(user, %{status: "#test #none"})
 
-      any_test = get(conn, "/api/v1/timelines/tag/test?any[]=test1")
+      for hashtag_timeline_mode <- [:enabled, :disabled] do
+        clear_config([:features, :improved_hashtag_timeline], hashtag_timeline_mode)
 
-      [status_none, status_test1, status_test] = json_response_and_validate_schema(any_test, :ok)
+        any_test = get(conn, "/api/v1/timelines/tag/test?any[]=test1")
 
-      assert to_string(activity_test.id) == status_test["id"]
-      assert to_string(activity_test1.id) == status_test1["id"]
-      assert to_string(activity_none.id) == status_none["id"]
+        [status_none, status_test1, status_test] = json_response_and_validate_schema(any_test, :ok)
 
-      restricted_test = get(conn, "/api/v1/timelines/tag/test?all[]=test1&none[]=none")
+        assert to_string(activity_test.id) == status_test["id"]
+        assert to_string(activity_test1.id) == status_test1["id"]
+        assert to_string(activity_none.id) == status_none["id"]
 
-      assert [status_test1] == json_response_and_validate_schema(restricted_test, :ok)
+        restricted_test = get(conn, "/api/v1/timelines/tag/test?all[]=test1&none[]=none")
 
-      all_test = get(conn, "/api/v1/timelines/tag/test?all[]=none")
+        assert [status_test1] == json_response_and_validate_schema(restricted_test, :ok)
 
-      assert [status_none] == json_response_and_validate_schema(all_test, :ok)
+        all_test = get(conn, "/api/v1/timelines/tag/test?all[]=none")
+
+        assert [status_none] == json_response_and_validate_schema(all_test, :ok)
+      end
     end
 
     test "muted emotions", %{conn: conn} do

From 59269cf07a42e0f6ac406c99f47414fa98f3e71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 21 Jul 2026 01:22:33 +0200
Subject: [PATCH 133/163] Fix hashtag timeline query
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 lib/pleroma/web/activity_pub/activity_pub.ex  | 24 ++++++++++++-------
 .../controllers/timeline_controller_test.exs  |  3 ++-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 1e8bfe3dd..a564a634d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -893,14 +893,22 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       |> Repo.all()
 
     # Note: NO extra ordering should be done on "activities.id desc nulls last" for optimal plan
-    from(
-      [_activity, object] in query,
-      join: hto in "hashtags_objects",
-      on: hto.object_id == object.id,
-      where: hto.hashtag_id in ^hashtag_ids,
-      distinct: [desc: object.id],
-      order_by: [desc: object.id]
-    )
+    query =
+      from(
+        [_activity, object] in query,
+        join: hto in "hashtags_objects",
+        on: hto.object_id == object.id,
+        where: hto.hashtag_id in ^hashtag_ids
+      )
+
+    if query.distinct == [] do
+      from([activity, object] in query,
+        distinct: [desc: activity.id],
+        order_by: [desc: activity.id]
+      )
+    else
+      query
+    end
   end
 
   defp restrict_hashtag_any(query, %{tag: tag}) when is_binary(tag) do
diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index b8d6129bb..19f75fe0e 100644
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -912,7 +912,8 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
 
         any_test = get(conn, "/api/v1/timelines/tag/test?any[]=test1")
 
-        [status_none, status_test1, status_test] = json_response_and_validate_schema(any_test, :ok)
+        [status_none, status_test1, status_test] =
+          json_response_and_validate_schema(any_test, :ok)
 
         assert to_string(activity_test.id) == status_test["id"]
         assert to_string(activity_test1.id) == status_test1["id"]

From 2a56a02d9a3049533495ba5690ff12e703cca200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 21 Jul 2026 01:25:05 +0200
Subject: [PATCH 134/163] changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 changelog.d/hashtag-timeline.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/hashtag-timeline.fix

diff --git a/changelog.d/hashtag-timeline.fix b/changelog.d/hashtag-timeline.fix
new file mode 100644
index 000000000..c5814d9c9
--- /dev/null
+++ b/changelog.d/hashtag-timeline.fix
@@ -0,0 +1 @@
+Fix hashtag timeline query for additional tag handling

From d090aeb2bb3398871f730981a49e52627ed0a635 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Wed, 22 Jul 2026 20:35:51 +0400
Subject: [PATCH 135/163] fix(http): forward plain HTTP proxy requests

---
 DEVLOG.md                                  |   1 +
 changelog.d/gun-pool-rework.fix            |   2 +-
 docs/configuration/howto_proxy.md          |   1 +
 lib/pleroma/gun/conn.ex                    |  21 +++-
 lib/pleroma/gun/connection_pool.ex         |   2 +-
 lib/pleroma/http/adapter/gun.ex            |  39 +++++++-
 test/pleroma/gun/conn_test.exs             |  35 +++++++
 test/pleroma/http/gun_integration_test.exs | 111 ++++++++++++++++++++-
 8 files changed, 201 insertions(+), 11 deletions(-)

diff --git a/DEVLOG.md b/DEVLOG.md
index 25f07171f..1e5d2b63d 100644
--- a/DEVLOG.md
+++ b/DEVLOG.md
@@ -11,3 +11,4 @@
 - Gun reports a stale stream error to the process that calls `cancel/2`; pool workers must consume that reply so one HTTP/2 cancellation cannot terminate other multiplexed requests.
 - Streamed uploads must be registered before body enumeration and cancelled if enumeration exits, throws, or raises, otherwise a partial HTTP/1 request can remain reusable.
 - Gun 2.4 bounds HTTP/1 response header and trailer buffers, rejects invalid request headers by default, and fixes cross-origin HTTP/2 push handling; Gun 2.4.1 includes Cowlib 2.17.1 to repair HTTP/2 HPACK decoding.
+- Plain HTTP proxy requests must use absolute-form request targets; CONNECT is reserved for HTTPS tunnels because forwarding proxies commonly reject CONNECT to port 80.
diff --git a/changelog.d/gun-pool-rework.fix b/changelog.d/gun-pool-rework.fix
index b7d9adccf..d555b5bce 100644
--- a/changelog.d/gun-pool-rework.fix
+++ b/changelog.d/gun-pool-rework.fix
@@ -1 +1 @@
-Fixed Gun HTTP/1 concurrency, authenticated proxy handling, tunnel requests, and streamed connection cleanup. Updated Gun and Cowlib for HTTP client security fixes.
+Fixed Gun HTTP/1 concurrency, forwarding and authenticated proxy handling, tunnel requests, and streamed connection cleanup. Updated Gun and Cowlib for HTTP client security fixes.
diff --git a/docs/configuration/howto_proxy.md b/docs/configuration/howto_proxy.md
index 9e571d6fc..d805ff965 100644
--- a/docs/configuration/howto_proxy.md
+++ b/docs/configuration/howto_proxy.md
@@ -12,3 +12,4 @@ config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}
 ```
 
 The Gun HTTP adapter supports SOCKS5. SOCKS4 proxies require another HTTP adapter.
+For regular HTTP proxies, Gun forwards plain HTTP requests directly and uses CONNECT tunnels for HTTPS requests.
diff --git a/lib/pleroma/gun/conn.ex b/lib/pleroma/gun/conn.ex
index f56a1af2f..85a2fb0e8 100644
--- a/lib/pleroma/gun/conn.ex
+++ b/lib/pleroma/gun/conn.ex
@@ -42,6 +42,21 @@ defmodule Pleroma.Gun.Conn do
     Map.put(opts, :tls_opts, tls_opts)
   end
 
+  defp do_open(%URI{scheme: "http"} = uri, %{proxy: {proxy_host, proxy_port}} = opts) do
+    with open_opts <- opts |> proxy_open_opts() |> Map.put(:protocols, [:http]),
+         {:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
+         {:ok, protocol} <- await_up(conn, opts[:connect_timeout]) do
+      {:ok, conn, protocol, :forward_proxy}
+    else
+      error ->
+        Logger.warning(
+          "Opening forward proxy connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
+        )
+
+        error
+    end
+  end
+
   defp do_open(uri, %{proxy: {proxy_host, proxy_port}} = opts) do
     connect_opts =
       uri
@@ -174,12 +189,12 @@ defmodule Pleroma.Gun.Conn do
           error -> error
         end
 
-      {:response, _fin, 403, _headers} ->
-        close_with_error(conn, :unauthorized)
-
       {:response, _fin, 407, _headers} ->
         close_with_error(conn, :proxy_auth_failed)
 
+      {:response, _fin, status, _headers} when is_integer(status) ->
+        close_with_error(conn, {:proxy_connect_failed, status})
+
       error ->
         Gun.close(conn)
         error
diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
index f2620836e..5e4fc5c3f 100644
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@@ -208,7 +208,7 @@ defmodule Pleroma.Gun.ConnectionPool do
     call_worker(conn_pid, {:release_stream, stream})
   end
 
-  @spec tunnel_ref(pid()) :: reference() | nil
+  @spec tunnel_ref(pid()) :: reference() | :forward_proxy | nil
   def tunnel_ref(conn_pid) do
     case Registry.select(@registry, [
            {{:_, :_, {:"$1", :"$2"}}, [{:==, :"$1", conn_pid}], [:"$2"]}
diff --git a/lib/pleroma/http/adapter/gun.ex b/lib/pleroma/http/adapter/gun.ex
index 61d297101..dea1798a1 100644
--- a/lib/pleroma/http/adapter/gun.ex
+++ b/lib/pleroma/http/adapter/gun.ex
@@ -34,9 +34,10 @@ defmodule Pleroma.HTTP.Adapter.Gun do
 
   defp request(env, %{conn: conn, tunnel: tunnel} = opts) do
     uri = URI.parse(Tesla.build_url(env))
-    path = Tesla.Adapter.Shared.prepare_path(uri.path, uri.query)
+    path = request_path(uri, tunnel)
     method = Tesla.Adapter.Shared.format_method(env.method)
     {headers, body, send_body} = prepare_body(env.headers, env.body, opts[:send_body])
+    headers = maybe_add_forward_proxy_headers(headers, uri, opts, tunnel)
     request_opts = request_opts(opts[:reply_to], tunnel)
 
     stream =
@@ -76,10 +77,46 @@ defmodule Pleroma.HTTP.Adapter.Gun do
 
   defp request_opts(reply_to, nil), do: %{reply_to: reply_to || self()}
 
+  defp request_opts(reply_to, :forward_proxy), do: %{reply_to: reply_to || self()}
+
   defp request_opts(reply_to, tunnel) do
     %{reply_to: reply_to || self(), tunnel: tunnel}
   end
 
+  defp request_path(uri, :forward_proxy) do
+    path = Tesla.Adapter.Shared.prepare_path(uri.path, uri.query)
+    "#{uri.scheme}://#{authority(uri)}#{path}"
+  end
+
+  defp request_path(uri, _tunnel) do
+    Tesla.Adapter.Shared.prepare_path(uri.path, uri.query)
+  end
+
+  defp maybe_add_forward_proxy_headers(headers, uri, opts, :forward_proxy) do
+    headers
+    |> put_header_new("host", authority(uri))
+    |> maybe_put_proxy_authorization(opts)
+  end
+
+  defp maybe_add_forward_proxy_headers(headers, _uri, _opts, _tunnel), do: headers
+
+  defp maybe_put_proxy_authorization(headers, %{proxy_auth: {username, password}})
+       when is_binary(username) and is_binary(password) do
+    value = "Basic " <> Base.encode64(username <> ":" <> password)
+    List.keystore(headers, "proxy-authorization", 0, {"proxy-authorization", value})
+  end
+
+  defp maybe_put_proxy_authorization(headers, _opts), do: headers
+
+  defp put_header_new(headers, name, value) do
+    if List.keymember?(headers, name, 0), do: headers, else: [{name, value} | headers]
+  end
+
+  defp authority(%URI{scheme: scheme, host: host, port: port}) do
+    host = if String.contains?(host, ":"), do: "[#{host}]", else: host
+    if port == URI.default_port(scheme), do: host, else: "#{host}:#{port}"
+  end
+
   defp prepare_body(headers, %Multipart{} = multipart, _send_body) do
     {format_headers(headers ++ Multipart.headers(multipart)), Multipart.body(multipart), :stream}
   end
diff --git a/test/pleroma/gun/conn_test.exs b/test/pleroma/gun/conn_test.exs
index 79ea7b33f..a38740a42 100644
--- a/test/pleroma/gun/conn_test.exs
+++ b/test/pleroma/gun/conn_test.exs
@@ -88,6 +88,26 @@ defmodule Pleroma.Gun.ConnTest do
     stop_conn(conn)
   end
 
+  test "uses HTTP/1 for a TLS forwarding proxy" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+
+    expect(Pleroma.GunMock, :open, fn ~c"proxy.example", 8443, opts ->
+      assert opts.transport == :tls
+      assert opts.tls_opts == [verify: :verify_none]
+      assert opts.protocols == [:http]
+      {:ok, conn}
+    end)
+
+    assert {:ok, ^conn, :http, :forward_proxy} =
+             Conn.open(URI.parse("http://origin.example/inbox"),
+               proxy: {~c"proxy.example", 8443},
+               transport: :tls,
+               proxy_tls_opts: [verify: :verify_none]
+             )
+
+    stop_conn(conn)
+  end
+
   test "passes authentication and remote DNS destination to a SOCKS5 proxy" do
     conn = spawn_link(fn -> Process.sleep(:infinity) end)
 
@@ -130,6 +150,21 @@ defmodule Pleroma.Gun.ConnTest do
              )
   end
 
+  test "returns the proxy status when CONNECT is forbidden" do
+    conn = spawn_link(fn -> Process.sleep(:infinity) end)
+    stream = make_ref()
+
+    expect(Pleroma.GunMock, :open, fn _, _, _ -> {:ok, conn} end)
+    expect(Pleroma.GunMock, :connect, fn ^conn, _ -> stream end)
+    expect(Pleroma.GunMock, :await, fn ^conn, ^stream -> {:response, :fin, 403, []} end)
+    expect(Pleroma.GunMock, :close, fn ^conn -> Process.exit(conn, :normal) end)
+
+    assert {:error, {:proxy_connect_failed, 403}} =
+             Conn.open(URI.parse("https://origin.example/inbox"),
+               proxy: {~c"proxy.example", 8080}
+             )
+  end
+
   test "rejects SOCKS4 before opening a socket" do
     assert {:error, :socks4_unsupported} =
              Conn.open(URI.parse("https://origin.example/inbox"),
diff --git a/test/pleroma/http/gun_integration_test.exs b/test/pleroma/http/gun_integration_test.exs
index f50f8105e..9282e2e6c 100644
--- a/test/pleroma/http/gun_integration_test.exs
+++ b/test/pleroma/http/gun_integration_test.exs
@@ -14,16 +14,22 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
 
     origin = start_tls_origin(self())
     connect_proxy = start_connect_proxy(self())
+    forward_proxy = start_forward_proxy(self())
     socks_proxy = start_socks5_proxy(self())
 
     on_exit(fn ->
       Process.sleep(20)
       stop_server(socks_proxy)
+      stop_server(forward_proxy)
       stop_server(connect_proxy)
       stop_server(origin)
     end)
 
-    {:ok, origin: origin, connect_proxy: connect_proxy, socks_proxy: socks_proxy}
+    {:ok,
+     origin: origin,
+     connect_proxy: connect_proxy,
+     forward_proxy: forward_proxy,
+     socks_proxy: socks_proxy}
   end
 
   test "requests HTTPS directly on a non-standard port", %{origin: origin} do
@@ -66,6 +72,28 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
     assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = result
   end
 
+  test "requests HTTP through a forwarding proxy", %{forward_proxy: proxy} do
+    proxy_opts = [proxy: {~c"127.0.0.1", proxy.port}]
+    url = "http://origin.example:8080/final?key=value"
+
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(url, proxy_opts)
+
+    assert_receive {:forward_proxy, ^url, "origin.example:8080", nil}
+  end
+
+  test "authenticates HTTP requests to a forwarding proxy", %{forward_proxy: proxy} do
+    proxy_opts = [
+      proxy: {~c"127.0.0.1", proxy.port},
+      proxy_auth: {"alice", "secret"}
+    ]
+
+    url = "http://origin.example/final"
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} = request(url, proxy_opts)
+
+    expected = "Basic " <> Base.encode64("alice:secret")
+    assert_receive {:forward_proxy, ^url, "origin.example", ^expected}
+  end
+
   test "opens a request-ready authenticated CONNECT tunnel", %{
     origin: origin,
     connect_proxy: proxy
@@ -215,6 +243,32 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
     assert origin_port == origin.port
   end
 
+  test "requests through unauthenticated SOCKS5 with an IP proxy host", %{
+    origin: origin,
+    socks_proxy: proxy
+  } do
+    proxy_opts = [proxy: {:socks5, {127, 0, 0, 1}, proxy.port}]
+
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} =
+             request(origin.base_url <> "/final", proxy_opts)
+
+    assert_receive {:socks5_proxy, nil, nil, "127.0.0.1", origin_port}
+    assert origin_port == origin.port
+  end
+
+  test "requests through unauthenticated SOCKS5 with a localhost proxy host", %{
+    origin: origin,
+    socks_proxy: proxy
+  } do
+    proxy_opts = [proxy: {:socks5, ~c"localhost", proxy.port}]
+
+    assert {:ok, %Tesla.Env{status: 200, body: "ok"}} =
+             request(origin.base_url <> "/final", proxy_opts)
+
+    assert_receive {:socks5_proxy, nil, nil, "127.0.0.1", origin_port}
+    assert origin_port == origin.port
+  end
+
   defp request(url, proxy_opts \\ [], follow_redirects \\ false) do
     middleware =
       if follow_redirects do
@@ -433,6 +487,37 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
     end
   end
 
+  defp start_forward_proxy(parent) do
+    start_tcp_server(fn socket -> serve_forward_proxy(socket, parent) end)
+  end
+
+  defp serve_forward_proxy(socket, parent) do
+    with {:ok, request} <- recv_headers(:gen_tcp, socket) do
+      {headers, _buffered_body} = split_headers(request)
+      target = request_path(headers)
+      host = header(headers, "host")
+      auth = header(headers, "proxy-authorization")
+
+      if String.starts_with?(target, "http://") do
+        send(parent, {:forward_proxy, target, host, auth})
+
+        :gen_tcp.send(
+          socket,
+          "HTTP/1.1 200 OK\r\nContent-Length: 2\r\nConnection: keep-alive\r\n\r\nok"
+        )
+
+        serve_forward_proxy(socket, parent)
+      else
+        :gen_tcp.send(
+          socket,
+          "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+        )
+
+        :gen_tcp.close(socket)
+      end
+    end
+  end
+
   defp start_socks5_proxy(parent) do
     start_tcp_server(fn socket -> serve_socks5_proxy(socket, parent) end)
   end
@@ -440,10 +525,7 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
   defp serve_socks5_proxy(socket, parent) do
     with {:ok, <<5, method_count>>} <- :gen_tcp.recv(socket, 2, 2_000),
          {:ok, methods} <- :gen_tcp.recv(socket, method_count, 2_000),
-         true <- :binary.match(methods, <<2>>) != :nomatch,
-         :ok <- :gen_tcp.send(socket, <<5, 2>>),
-         {:ok, username, password} <- recv_socks5_auth(socket),
-         :ok <- :gen_tcp.send(socket, <<1, 0>>),
+         {:ok, username, password} <- negotiate_socks5_auth(socket, methods),
          {:ok, host, port} <- recv_socks5_destination(socket),
          {:ok, upstream} <- tcp_connect(host, port),
          :ok <- :gen_tcp.send(socket, <<5, 0, 0, 1, 0, 0, 0, 0, 0, 0>>) do
@@ -455,6 +537,25 @@ defmodule Pleroma.HTTP.GunIntegrationTest do
     end
   end
 
+  defp negotiate_socks5_auth(socket, methods) do
+    cond do
+      :binary.match(methods, <<2>>) != :nomatch ->
+        with :ok <- :gen_tcp.send(socket, <<5, 2>>),
+             {:ok, username, password} <- recv_socks5_auth(socket),
+             :ok <- :gen_tcp.send(socket, <<1, 0>>) do
+          {:ok, username, password}
+        end
+
+      :binary.match(methods, <<0>>) != :nomatch ->
+        with :ok <- :gen_tcp.send(socket, <<5, 0>>) do
+          {:ok, nil, nil}
+        end
+
+      true ->
+        {:error, :unsupported_auth}
+    end
+  end
+
   defp recv_socks5_auth(socket) do
     with {:ok, <<1, username_length>>} <- :gen_tcp.recv(socket, 2, 2_000),
          {:ok, username} <- :gen_tcp.recv(socket, username_length, 2_000),

From 4aa0d5d709d144c2df22489e2c6e079d4c00c394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Fri, 24 Jul 2026 00:58:58 +0200
Subject: [PATCH 136/163] Allow disabling Chats feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 config/config.exs                                  |  2 ++
 config/description.exs                             | 13 +++++++++++++
 lib/pleroma/chat.ex                                |  2 ++
 lib/pleroma/web/activity_pub/views/user_view.ex    |  2 +-
 lib/pleroma/web/mastodon_api/mastodon_api.ex       |  9 +++++++++
 lib/pleroma/web/mastodon_api/views/account_view.ex |  4 +++-
 .../web/mastodon_api/views/instance_view.ex        |  3 +++
 .../web/pleroma_api/controllers/chat_controller.ex | 13 +++++++++++++
 lib/pleroma/web/streamer.ex                        | 14 ++++++++------
 9 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index e6a4eb3e6..f13c12fb9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -979,6 +979,8 @@ config :pleroma, :database_config_whitelist, [
   {:web_push_encryption, :vapid_details}
 ]
 
+config :pleroma, Pleroma.Chat, enabled: true
+
 # 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/description.exs b/config/description.exs
index 7c377588c..8ad640869 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2726,6 +2726,19 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: Pleroma.Chat,
+    type: :group,
+    description: "Pleroma Chat settings",
+    children: [
+      %{
+        key: :enabled,
+        type: :boolean,
+        description: "Enables the backend chats API."
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: :http,
diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index 926176bfa..6ac1b24b8 100644
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -108,4 +108,6 @@ defmodule Pleroma.Chat do
     |> cast(%{pinned: false}, [:pinned])
     |> Repo.update()
   end
+
+  def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled], true)
 end
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 8847692c8..c273043e1 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -68,7 +68,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
     capabilities =
       if is_boolean(user.accepts_chat_messages) do
         %{
-          "acceptsChatMessages" => user.accepts_chat_messages
+          "acceptsChatMessages" => Pleroma.Chat.enabled?() and user.accepts_chat_messages
         }
       else
         %{}
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index d6f2dd3a3..a65326226 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -385,6 +385,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
       |> cast_params()
       |> Map.update(:include_types, [], fn include_types -> include_types end)
 
+    if "pleroma:chat_mention" in options.include_types and not Pleroma.Chat.enabled?() do
+      options
+      |> Map.update(:include_types, [], fn include_types ->
+        List.delete(include_types, "pleroma:chat_mention")
+      end)
+    else
+      options
+    end
+
     if ("pleroma:report" not in options.include_types and
           User.privileged?(user, :reports_manage_reports)) or
          User.privileged?(user, :reports_manage_reports) do
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 5386c5a6c..407328372 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -287,6 +287,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
       user.last_status_at &&
         user.last_status_at |> NaiveDateTime.to_date() |> Date.to_iso8601()
 
+    accepts_chat_messages = Pleroma.Chat.enabled?() and user.accepts_chat_messages
+
     %{
       id: to_string(user.id),
       username: username_from_nickname(user.nickname),
@@ -336,7 +338,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
         relationship: relationship,
         skip_thread_containment: user.skip_thread_containment,
         background_image: image_url(user.background) |> MediaProxy.url(),
-        accepts_chat_messages: user.accepts_chat_messages,
+        accepts_chat_messages: accepts_chat_messages,
         favicon: favicon,
         avatar_description: avatar_description,
         header_description: header_description
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 1a0f63ffa..efb15d26e 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -167,6 +167,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
   def features do
     [
       "pleroma_api",
+      if Config.get([Pleroma.Chat, :enabled], true) do
+        "chat"
+      end,
       "mastodon_api",
       "mastodon_api_grouped_notifications",
       "mastodon_api_streaming",
diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
index ac9bb2779..9c9f17e86 100644
--- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@ -41,6 +41,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
   )
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate, replace_params: false)
+  plug(:ensure_chats_enabled)
 
   defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.ChatOperation
 
@@ -244,4 +245,16 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
       _ -> nil
     end
   end
+
+  defp ensure_chats_enabled(conn, _opts) do
+    if Chat.enabled?() do
+      conn
+    else
+      conn
+      |> put_status(:not_found)
+      |> put_view(Pleroma.Web.ErrorView)
+      |> render("404.json")
+      |> halt()
+    end
+  end
 end
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index 120e94751..14d942c9f 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -289,15 +289,17 @@ defmodule Pleroma.Web.Streamer do
 
   defp do_stream(topic, {user, %MessageReference{} = cm_ref})
        when topic in ["user", "user:pleroma_chat"] do
-    topic = "#{topic}:#{user.id}"
+    if Pleroma.Chat.enabled?() do
+      topic = "#{topic}:#{user.id}"
 
-    text = StreamerView.render("chat_update.json", %{chat_message_reference: cm_ref}, topic)
+      text = StreamerView.render("chat_update.json", %{chat_message_reference: cm_ref}, topic)
 
-    Registry.dispatch(@registry, topic, fn list ->
-      Enum.each(list, fn {pid, _auth} ->
-        send(pid, {:text, text})
+      Registry.dispatch(@registry, topic, fn list ->
+        Enum.each(list, fn {pid, _auth} ->
+          send(pid, {:text, text})
+        end)
       end)
-    end)
+    end
   end
 
   defp do_stream("user", %Activity{} = item) do

From efb43a02fab5a69bfb59c07c5c4017ff4ab86eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Fri, 24 Jul 2026 00:59:15 +0200
Subject: [PATCH 137/163] changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 changelog.d/disabling-chats.change | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/disabling-chats.change

diff --git a/changelog.d/disabling-chats.change b/changelog.d/disabling-chats.change
new file mode 100644
index 000000000..579679a03
--- /dev/null
+++ b/changelog.d/disabling-chats.change
@@ -0,0 +1 @@
+Allow disabling Chats feature

From 6ffa90a42a5cc0278c305ecb4305745650c5f26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Fri, 24 Jul 2026 01:00:46 +0200
Subject: [PATCH 138/163] Include actual accepts_chat_messages in source field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 config/description.exs                             | 2 +-
 lib/pleroma/web/mastodon_api/views/account_view.ex | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/description.exs b/config/description.exs
index 8ad640869..1293179b9 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2735,7 +2735,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Enables the backend chats API."
+        description: "Enables the chats API."
       }
     ]
   },
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 407328372..1e3882fc6 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -393,6 +393,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
     |> Kernel.put_in([:source, :pleroma, :show_role], user.show_role)
     |> Kernel.put_in([:source, :pleroma, :no_rich_text], user.no_rich_text)
     |> Kernel.put_in([:source, :pleroma, :show_birthday], user.show_birthday)
+    |> Kernel.put_in([:source, :pleroma, :accepts_chat_messages], user.accepts_chat_messages)
   end
 
   defp maybe_put_settings(data, _, _, _), do: data

From 97b94a2f43d10f23c6227797e2660db2409409ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Fri, 24 Jul 2026 01:05:12 +0200
Subject: [PATCH 139/163] Update tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../web/api_spec/operations/chat_operation.ex | 28 +++++++++++++------
 .../web/activity_pub/views/user_view_test.exs |  8 ++++++
 .../controllers/chat_controller_test.exs      |  8 ++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index 76c2db57e..7bc39acc6 100644
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -31,7 +31,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             "The updated chat",
             "application/json",
             Chat
-          )
+          ),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -56,7 +57,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             "The read ChatMessage",
             "application/json",
             ChatMessage
-          )
+          ),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -87,7 +89,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             "The existing chat",
             "application/json",
             Chat
-          )
+          ),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -118,7 +121,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             "The created or existing chat",
             "application/json",
             Chat
-          )
+          ),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -146,7 +150,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
         Operation.parameter(:pinned, :query, BooleanLike.schema(), "Include only pinned chats")
       ],
       responses: %{
-        200 => Operation.response("The chats of the user", "application/json", chats_response())
+        200 => Operation.response("The chats of the user", "application/json", chats_response()),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -172,7 +177,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
         | pagination_params()
       ],
       responses: %{
-        200 => Operation.response("The chats of the user", "application/json", chats_response())
+        200 => Operation.response("The chats of the user", "application/json", chats_response()),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -224,6 +230,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             ChatMessage
           ),
         400 => Operation.response("Bad Request", "application/json", ApiError),
+        404 => Operation.response("Not Found", "application/json", ApiError),
         422 => Operation.response("MRF Rejection", "application/json", ApiError)
       },
       security: [
@@ -249,7 +256,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
             "The deleted ChatMessage",
             "application/json",
             ChatMessage
-          )
+          ),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -268,7 +276,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
         Operation.parameter(:id, :path, :string, "The id of the chat", required: true)
       ],
       responses: %{
-        200 => Operation.response("The existing chat", "application/json", Chat)
+        200 => Operation.response("The existing chat", "application/json", Chat),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
@@ -287,7 +296,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
         Operation.parameter(:id, :path, :string, "The id of the chat", required: true)
       ],
       responses: %{
-        200 => Operation.response("The existing chat", "application/json", Chat)
+        200 => Operation.response("The existing chat", "application/json", Chat),
+        404 => Operation.response("Not Found", "application/json", ApiError)
       },
       security: [
         %{
diff --git a/test/pleroma/web/activity_pub/views/user_view_test.exs b/test/pleroma/web/activity_pub/views/user_view_test.exs
index a3f807ca9..1aed28d5b 100644
--- a/test/pleroma/web/activity_pub/views/user_view_test.exs
+++ b/test/pleroma/web/activity_pub/views/user_view_test.exs
@@ -220,5 +220,13 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
                "acceptsChatMessages"
              )
     end
+
+    test "it returns false if chat is disabled" do
+      clear_config([Pleroma.Chat, :enabled], false)
+      user = insert(:user, accepts_chat_messages: true)
+
+      assert %{"capabilities" => %{"acceptsChatMessages" => false}} =
+               UserView.render("user.json", user: user)
+    end
   end
 end
diff --git a/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
index 0dc0e7014..8244ba434 100644
--- a/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
@@ -546,6 +546,14 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
         account_ids = Enum.map(result, &get_in(&1, ["account", "id"]))
         assert Enum.sort(account_ids) == Enum.sort([user2.id, user3.id])
       end
+
+      test "it returns 404 when chats are disabled", %{conn: conn} do
+        clear_config([Pleroma.Chat, :enabled], false)
+
+        conn
+        |> get(unquote(tested_endpoint))
+        |> json_response_and_validate_schema(404)
+      end
     end
   end
 end

From c3fe61c2f549b0cf563cb2de4380d92cb312efe0 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:01:13 +0400
Subject: [PATCH 140/163] fix(user): correct cache key invalidation

---
 changelog.d/user-cache-keys.fix |  1 +
 lib/pleroma/user.ex             | 44 +++++++++++++++++++--------------
 test/pleroma/user_test.exs      | 12 +++++++++
 3 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 changelog.d/user-cache-keys.fix

diff --git a/changelog.d/user-cache-keys.fix b/changelog.d/user-cache-keys.fix
new file mode 100644
index 000000000..4af21dd1f
--- /dev/null
+++ b/changelog.d/user-cache-keys.fix
@@ -0,0 +1 @@
+Fix inconsistent User cache keys and invalidate numeric ID aliases.
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 75da41da9..768a6f3c2 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -272,13 +272,13 @@ defmodule Pleroma.User do
   end
 
   def cached_blocked_users_ap_ids(user) do
-    @cachex.fetch!(:user_cache, "blocked_users_ap_ids:#{user.ap_id}", fn _ ->
+    @cachex.fetch!(:user_cache, cache_key(:blocked_users_ap_ids, user), fn _ ->
       blocked_users_ap_ids(user)
     end)
   end
 
   def cached_muted_users_ap_ids(user) do
-    @cachex.fetch!(:user_cache, "muted_users_ap_ids:#{user.ap_id}", fn _ ->
+    @cachex.fetch!(:user_cache, cache_key(:muted_users_ap_ids, user), fn _ ->
       muted_users_ap_ids(user)
     end)
   end
@@ -1253,13 +1253,18 @@ defmodule Pleroma.User do
     get_cached_by_nickname(nickname)
   end
 
+  defp cache_key(:id, %User{id: id}), do: cache_key(:id, id)
+  defp cache_key(:nickname, %User{nickname: nickname}), do: cache_key(:nickname, nickname)
+  defp cache_key(namespace, %User{ap_id: ap_id}), do: cache_key(namespace, ap_id)
+  defp cache_key(namespace, value), do: "#{namespace}:#{value}"
+
   def set_cache({:ok, user}), do: set_cache(user)
   def set_cache({:error, err}), do: {:error, err}
 
   def set_cache(%User{} = user) do
-    @cachex.put(:user_cache, "ap_id:#{user.ap_id}", user)
-    @cachex.put(:user_cache, "nickname:#{user.nickname}", user)
-    @cachex.put(:user_cache, "friends_ap_ids:#{user.nickname}", get_user_friends_ap_ids(user))
+    @cachex.put(:user_cache, cache_key(:ap_id, user), user)
+    @cachex.put(:user_cache, cache_key(:nickname, user), user)
+    @cachex.put(:user_cache, cache_key(:friends_ap_ids, user), get_user_friends_ap_ids(user))
     {:ok, user}
   end
 
@@ -1287,22 +1292,23 @@ defmodule Pleroma.User do
 
   @spec get_cached_user_friends_ap_ids(User.t()) :: [String.t()]
   def get_cached_user_friends_ap_ids(user) do
-    @cachex.fetch!(:user_cache, "friends_ap_ids:#{user.ap_id}", fn _ ->
+    @cachex.fetch!(:user_cache, cache_key(:friends_ap_ids, user), fn _ ->
       get_user_friends_ap_ids(user)
     end)
   end
 
   def invalidate_cache(user) do
-    @cachex.del(:user_cache, "ap_id:#{user.ap_id}")
-    @cachex.del(:user_cache, "nickname:#{user.nickname}")
-    @cachex.del(:user_cache, "friends_ap_ids:#{user.ap_id}")
-    @cachex.del(:user_cache, "blocked_users_ap_ids:#{user.ap_id}")
-    @cachex.del(:user_cache, "muted_users_ap_ids:#{user.ap_id}")
+    @cachex.del(:user_cache, cache_key(:ap_id, user))
+    @cachex.del(:user_cache, cache_key(:nickname, user))
+    @cachex.del(:user_cache, cache_key(:id, user))
+    @cachex.del(:user_cache, cache_key(:friends_ap_ids, user))
+    @cachex.del(:user_cache, cache_key(:blocked_users_ap_ids, user))
+    @cachex.del(:user_cache, cache_key(:muted_users_ap_ids, user))
   end
 
   @spec get_cached_by_ap_id(String.t()) :: User.t() | nil
   def get_cached_by_ap_id(ap_id) do
-    key = "ap_id:#{ap_id}"
+    key = cache_key(:ap_id, ap_id)
 
     with {:ok, nil} <- @cachex.get(:user_cache, key),
          user when not is_nil(user) <- get_by_ap_id(ap_id),
@@ -1315,14 +1321,14 @@ defmodule Pleroma.User do
   end
 
   def get_cached_by_id(id) do
-    key = "id:#{id}"
+    key = cache_key(:id, id)
 
     ap_id =
       @cachex.fetch!(:user_cache, key, fn _ ->
         user = get_by_id(id)
 
         if user do
-          @cachex.put(:user_cache, "ap_id:#{user.ap_id}", user)
+          @cachex.put(:user_cache, cache_key(:ap_id, user), user)
           {:commit, user.ap_id}
         else
           {:ignore, ""}
@@ -1333,7 +1339,7 @@ defmodule Pleroma.User do
   end
 
   def get_cached_by_nickname(nickname) do
-    key = "nickname:#{nickname}"
+    key = cache_key(:nickname, nickname)
 
     @cachex.fetch!(:user_cache, key, fn _ ->
       case get_or_fetch_by_nickname(nickname) do
@@ -1651,7 +1657,7 @@ defmodule Pleroma.User do
         |> Oban.insert()
       end
 
-      @cachex.del(:user_cache, "muted_users_ap_ids:#{muter.ap_id}")
+      @cachex.del(:user_cache, cache_key(:muted_users_ap_ids, muter))
 
       {:ok, Enum.filter([user_mute, user_notification_mute], & &1)}
     end
@@ -1661,7 +1667,7 @@ defmodule Pleroma.User do
     with {:ok, user_mute} <- UserRelationship.delete_mute(muter, mutee),
          {:ok, user_notification_mute} <-
            UserRelationship.delete_notification_mute(muter, mutee) do
-      @cachex.del(:user_cache, "muted_users_ap_ids:#{muter.ap_id}")
+      @cachex.del(:user_cache, cache_key(:muted_users_ap_ids, muter))
       {:ok, [user_mute, user_notification_mute]}
     end
   end
@@ -2815,7 +2821,7 @@ defmodule Pleroma.User do
           {:ok, UserRelationship.t()} | {:error, Ecto.Changeset.t()}
   defp add_to_block(%User{} = user, %User{} = blocked, expires_at) do
     with {:ok, relationship} <- UserRelationship.create_block(user, blocked, expires_at) do
-      @cachex.del(:user_cache, "blocked_users_ap_ids:#{user.ap_id}")
+      @cachex.del(:user_cache, cache_key(:blocked_users_ap_ids, user))
       {:ok, relationship}
     end
   end
@@ -2824,7 +2830,7 @@ defmodule Pleroma.User do
           {:ok, UserRelationship.t()} | {:ok, nil} | {:error, Ecto.Changeset.t()}
   defp remove_from_block(%User{} = user, %User{} = blocked) do
     with {:ok, relationship} <- UserRelationship.delete_block(user, blocked) do
-      @cachex.del(:user_cache, "blocked_users_ap_ids:#{user.ap_id}")
+      @cachex.del(:user_cache, cache_key(:blocked_users_ap_ids, user))
       {:ok, relationship}
     end
   end
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
index de735cdb7..9ae9cce26 100644
--- a/test/pleroma/user_test.exs
+++ b/test/pleroma/user_test.exs
@@ -1988,14 +1988,26 @@ defmodule Pleroma.UserTest do
   end
 
   describe "caching" do
+    test "set_cache stores friends under the AP ID cache key" do
+      user = insert(:user)
+
+      User.set_cache(user)
+
+      assert {:ok, []} = Cachex.get(:user_cache, "friends_ap_ids:#{user.ap_id}")
+      assert {:ok, nil} = Cachex.get(:user_cache, "friends_ap_ids:#{user.nickname}")
+    end
+
     test "invalidate_cache works" do
       user = insert(:user)
 
       User.set_cache(user)
+      User.get_cached_by_id(user.id)
       User.invalidate_cache(user)
 
       {:ok, nil} = Cachex.get(:user_cache, "ap_id:#{user.ap_id}")
       {:ok, nil} = Cachex.get(:user_cache, "nickname:#{user.nickname}")
+      {:ok, nil} = Cachex.get(:user_cache, "friends_ap_ids:#{user.ap_id}")
+      {:ok, nil} = Cachex.get(:user_cache, "id:#{user.id}")
     end
 
     test "User.delete() plugs any possible zombie objects" do

From 08c8571c59c64eb58708bceb69bb788cc6e730f3 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:01:24 +0400
Subject: [PATCH 141/163] fix(workers): avoid dynamic publisher atoms

---
 changelog.d/publisher-worker-atoms.fix        |  1 +
 lib/pleroma/workers/publisher_worker.ex       | 15 +++++++-
 .../pleroma/workers/publisher_worker_test.exs | 34 ++++++++++++++++---
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/publisher-worker-atoms.fix

diff --git a/changelog.d/publisher-worker-atoms.fix b/changelog.d/publisher-worker-atoms.fix
new file mode 100644
index 000000000..2df6608ba
--- /dev/null
+++ b/changelog.d/publisher-worker-atoms.fix
@@ -0,0 +1 @@
+Avoid creating atoms from serialized PublisherWorker parameters.
diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex
index f799af77a..4ac0e218e 100644
--- a/lib/pleroma/workers/publisher_worker.ex
+++ b/lib/pleroma/workers/publisher_worker.ex
@@ -9,6 +9,13 @@ defmodule Pleroma.Workers.PublisherWorker do
 
   use Oban.Worker, queue: :federator_outgoing, max_attempts: 13
 
+  @publish_one_param_keys %{
+    "activity_id" => :activity_id,
+    "cc" => :cc,
+    "inbox" => :inbox,
+    "unreachable_since" => :unreachable_since
+  }
+
   @impl true
   def perform(%Job{args: %{"op" => "publish", "activity_id" => activity_id}}) do
     activity = Activity.get_by_id(activity_id)
@@ -16,7 +23,13 @@ defmodule Pleroma.Workers.PublisherWorker do
   end
 
   def perform(%Job{args: %{"op" => "publish_one", "params" => params}} = job) do
-    params = Map.new(params, fn {k, v} -> {String.to_atom(k), v} end)
+    params =
+      Enum.reduce(params, %{}, fn {key, value}, acc ->
+        case @publish_one_param_keys do
+          %{^key => atom_key} -> Map.put(acc, atom_key, value)
+          _ -> acc
+        end
+      end)
 
     # Cancel / skip the job if this server believed to be unreachable now
     if not Instances.reachable?(params.inbox) do
diff --git a/test/pleroma/workers/publisher_worker_test.exs b/test/pleroma/workers/publisher_worker_test.exs
index 4519864a5..0c71415fd 100644
--- a/test/pleroma/workers/publisher_worker_test.exs
+++ b/test/pleroma/workers/publisher_worker_test.exs
@@ -11,6 +11,7 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
 
   alias Pleroma.Instances
   alias Pleroma.Object
+  alias Pleroma.Workers.PublisherWorker
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.CommonAPI
@@ -70,12 +71,12 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
           max_attempts: 5
         }
 
-        assert {:error, :connection_error} = Pleroma.Workers.PublisherWorker.perform(job)
+        assert {:error, :connection_error} = PublisherWorker.perform(job)
         assert Instances.reachable?("https://example.com/inbox")
 
         # Final attempt
         job = %{job | attempt: 5}
-        assert {:error, :connection_error} = Pleroma.Workers.PublisherWorker.perform(job)
+        assert {:error, :connection_error} = PublisherWorker.perform(job)
         refute Instances.reachable?("https://example.com/inbox")
       end
     end
@@ -95,11 +96,36 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
           max_attempts: 5
         }
 
-        assert :ok = Pleroma.Workers.PublisherWorker.perform(job)
+        assert :ok = PublisherWorker.perform(job)
         assert Instances.reachable?("https://example.com/inbox")
       end
     end
 
+    test "does not create atoms from unexpected job params", %{activity: activity} do
+      unknown_key = "unknown_#{System.unique_integer([:positive])}"
+
+      assert_raise ArgumentError, fn -> String.to_existing_atom(unknown_key) end
+
+      with_mock Pleroma.Web.Federator,
+        perform: fn :publish_one, _params -> {:ok, %{status: 200}} end do
+        job = %Oban.Job{
+          args: %{
+            "op" => "publish_one",
+            "params" => %{
+              "inbox" => "https://example.com/inbox",
+              "activity_id" => activity.id,
+              unknown_key => "ignored"
+            }
+          },
+          attempt: 1,
+          max_attempts: 5
+        }
+
+        assert :ok = PublisherWorker.perform(job)
+        assert_raise ArgumentError, fn -> String.to_existing_atom(unknown_key) end
+      end
+    end
+
     test "cancels job if server is unreachable", %{activity: activity} do
       # First mark the server as unreachable
       Instances.set_unreachable("https://example.com/inbox")
@@ -117,7 +143,7 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
         max_attempts: 5
       }
 
-      assert {:cancel, :unreachable} = Pleroma.Workers.PublisherWorker.perform(job)
+      assert {:cancel, :unreachable} = PublisherWorker.perform(job)
     end
   end
 end

From 3abe4ebfbd737abad8c2395de03a9245e48b763d Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:01:34 +0400
Subject: [PATCH 142/163] perf(oauth): avoid duplicate user preload

---
 changelog.d/oauth-user-preload.change                |  1 +
 .../mastodon_api/controllers/status_controller.ex    |  5 ++++-
 lib/pleroma/web/plugs/o_auth_plug.ex                 |  2 +-
 test/pleroma/web/plugs/o_auth_plug_test.exs          | 12 ++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/oauth-user-preload.change

diff --git a/changelog.d/oauth-user-preload.change b/changelog.d/oauth-user-preload.change
new file mode 100644
index 000000000..43f5ea06b
--- /dev/null
+++ b/changelog.d/oauth-user-preload.change
@@ -0,0 +1 @@
+Avoid a duplicate user query during OAuth authentication.
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index 26e38aac8..6cd7469f9 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -716,7 +716,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
     end
   end
 
-  defp put_application(params, %{assigns: %{token: %Token{user: %User{} = user} = token}} = _conn) do
+  defp put_application(
+         params,
+         %{assigns: %{token: %Token{} = token, user: %User{} = user}} = _conn
+       ) do
     if user.disclose_client do
       %{client_name: client_name, website: website} = Repo.preload(token, :app).app
       Map.put(params, :generator, %{type: "Application", name: client_name, url: website})
diff --git a/lib/pleroma/web/plugs/o_auth_plug.ex b/lib/pleroma/web/plugs/o_auth_plug.ex
index 488968691..b59ac9d3e 100644
--- a/lib/pleroma/web/plugs/o_auth_plug.ex
+++ b/lib/pleroma/web/plugs/o_auth_plug.ex
@@ -52,7 +52,7 @@ defmodule Pleroma.Web.Plugs.OAuthPlug do
         where: t.token == ^token
       )
 
-    with %Token{user_id: user_id} = token_record <- Repo.one(token_query) |> Repo.preload(:user),
+    with %Token{user_id: user_id} = token_record <- Repo.one(token_query),
          false <- is_nil(user_id),
          %User{} = user <- User.get_cached_by_id(user_id) do
       {:ok, user, token_record}
diff --git a/test/pleroma/web/plugs/o_auth_plug_test.exs b/test/pleroma/web/plugs/o_auth_plug_test.exs
index 8917eadd1..2509e4203 100644
--- a/test/pleroma/web/plugs/o_auth_plug_test.exs
+++ b/test/pleroma/web/plugs/o_auth_plug_test.exs
@@ -44,6 +44,18 @@ defmodule Pleroma.Web.Plugs.OAuthPlugTest do
     assert conn.assigns[:user] == opts[:user]
   end
 
+  test "with a valid token, it does not preload the duplicate user association", %{
+    conn: conn,
+    token: token
+  } do
+    conn =
+      conn
+      |> put_req_header("authorization", "bearer #{token.token}")
+      |> OAuthPlug.call(%{})
+
+    assert %Ecto.Association.NotLoaded{} = conn.assigns.token.user
+  end
+
   test "with valid token (downcase) in url parameters, it assigns the user", opts do
     conn =
       :get

From 868723e371ba12f74dcd68828ea6fba15c0456f6 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:01:46 +0400
Subject: [PATCH 143/163] fix(streaming): preserve followed domain exception

---
 changelog.d/stream-domain-block-following.fix |  1 +
 lib/pleroma/web/streamer.ex                   | 11 +++++++++--
 test/pleroma/web/streamer_test.exs            | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/stream-domain-block-following.fix

diff --git a/changelog.d/stream-domain-block-following.fix b/changelog.d/stream-domain-block-following.fix
new file mode 100644
index 000000000..84890c680
--- /dev/null
+++ b/changelog.d/stream-domain-block-following.fix
@@ -0,0 +1 @@
+Keep followed users visible in streams when their domain is blocked.
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index 120e94751..5abe33af1 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -195,6 +195,9 @@ defmodule Pleroma.Web.Streamer do
     recipients = MapSet.new(item.recipients)
     domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.domain_blocks)
 
+    following_ap_ids =
+      if user.domain_blocks == [], do: [], else: User.get_cached_user_friends_ap_ids(user)
+
     with parent <- Object.normalize(item, fetch: false) || item,
          true <- Enum.all?([blocked_ap_ids, muted_ap_ids], &(item.actor not in &1)),
          true <- item.data["type"] != "Announce" || item.actor not in reblog_muted_ap_ids,
@@ -205,8 +208,12 @@ defmodule Pleroma.Web.Streamer do
          true <- MapSet.disjoint?(recipients, recipient_blocks),
          %{host: item_host} <- URI.parse(item.actor),
          %{host: parent_host} <- URI.parse(parent.data["actor"]),
-         false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, item_host),
-         false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, parent_host),
+         false <-
+           item.actor not in following_ap_ids and
+             Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, item_host),
+         false <-
+           parent.data["actor"] not in following_ap_ids and
+             Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, parent_host),
          true <- thread_containment(item, user),
          false <- CommonAPI.thread_muted?(parent, user) do
       false
diff --git a/test/pleroma/web/streamer_test.exs b/test/pleroma/web/streamer_test.exs
index b26bd1847..7610b3379 100644
--- a/test/pleroma/web/streamer_test.exs
+++ b/test/pleroma/web/streamer_test.exs
@@ -475,6 +475,20 @@ defmodule Pleroma.Web.StreamerTest do
       assert Streamer.filtered_by_user?(user, favorite_activity)
     end
 
+    test "it does not filter followed users on blocked domains", %{user: user} do
+      followed =
+        insert(:user, %{ap_id: "https://hecking-lewd-place.com/user/friend"})
+
+      {:ok, user} = User.block_domain(user, "hecking-lewd-place.com")
+      {:ok, activity} = CommonAPI.post(followed, %{status: "still a friend"})
+
+      assert Streamer.filtered_by_user?(user, activity)
+
+      {:ok, user, _followed} = User.follow(user, followed)
+
+      refute Streamer.filtered_by_user?(user, activity)
+    end
+
     test "it sends follow activities to the 'user:notification' stream", %{
       user: user,
       token: oauth_token

From 1a48466b851da9076fe569eff065026dcbd588af Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:42:45 +0400
Subject: [PATCH 144/163] style(tests): sort publisher worker aliases

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

diff --git a/test/pleroma/workers/publisher_worker_test.exs b/test/pleroma/workers/publisher_worker_test.exs
index 0c71415fd..0e1b9d698 100644
--- a/test/pleroma/workers/publisher_worker_test.exs
+++ b/test/pleroma/workers/publisher_worker_test.exs
@@ -11,11 +11,11 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
 
   alias Pleroma.Instances
   alias Pleroma.Object
-  alias Pleroma.Workers.PublisherWorker
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.Federator
+  alias Pleroma.Workers.PublisherWorker
 
   describe "Oban job priority:" do
     setup do

From 0862c8b88d2a5b48478cbb1e59b1c0314ebace53 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 16:53:36 +0400
Subject: [PATCH 145/163] fix: advertise Chats feature flags correctly

---
 .../web/mastodon_api/views/instance_view.ex   | 11 ++++---
 .../mastodon_api/views/instance_view_test.exs | 31 +++++++++++++++++--
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index efb15d26e..437e42580 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -167,9 +167,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
   def features do
     [
       "pleroma_api",
-      if Config.get([Pleroma.Chat, :enabled], true) do
-        "chat"
-      end,
       "mastodon_api",
       "mastodon_api_grouped_notifications",
       "mastodon_api_streaming",
@@ -205,8 +202,12 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
       end,
       "pleroma_emoji_reactions",
       "pleroma_custom_emoji_reactions",
-      "pleroma_chat_messages",
-      "pleroma:pin_chats",
+      if Pleroma.Chat.enabled?() do
+        "pleroma_chat_messages"
+      end,
+      if Pleroma.Chat.enabled?() do
+        "pleroma:pin_chats"
+      end,
       if Config.get([:instance, :show_reactions]) do
         "exposable_reactions"
       end,
diff --git a/test/pleroma/web/mastodon_api/views/instance_view_test.exs b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
index 66485be0e..5f1e21098 100644
--- a/test/pleroma/web/mastodon_api/views/instance_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/instance_view_test.exs
@@ -114,8 +114,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     "quote_posting",
     "pleroma_emoji_reactions",
     "pleroma_custom_emoji_reactions",
-    "pleroma_chat_messages",
-    "pleroma:pin_chats",
     "pleroma:get:main/ostatus",
     "pleroma:group_actors",
     "pleroma:bookmark_folders",
@@ -128,6 +126,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     "gopher",
     "chat",
     "shout",
+    "pleroma_chat_messages",
+    "pleroma:pin_chats",
     "relay",
     "safe_dm_mentions",
     "exposable_reactions",
@@ -139,6 +139,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     [:media_proxy, :enabled],
     [:gopher, :enabled],
     [:shout, :enabled],
+    [Pleroma.Chat, :enabled],
     [:instance, :allow_relay],
     [:instance, :safe_dm_mentions],
     [:instance, :show_reactions],
@@ -443,6 +444,32 @@ defmodule Pleroma.Web.MastodonAPI.InstanceViewTest do
     end
   end
 
+  describe "chat features" do
+    test "advertises Shout without Chats" do
+      clear_config([:shout, :enabled], true)
+      clear_config([Pleroma.Chat, :enabled], false)
+
+      features = InstanceView.features()
+
+      assert "chat" in features
+      assert "shout" in features
+      refute "pleroma_chat_messages" in features
+      refute "pleroma:pin_chats" in features
+    end
+
+    test "advertises Chats without Shout" do
+      clear_config([:shout, :enabled], false)
+      clear_config([Pleroma.Chat, :enabled], true)
+
+      features = InstanceView.features()
+
+      refute "chat" in features
+      refute "shout" in features
+      assert "pleroma_chat_messages" in features
+      assert "pleroma:pin_chats" in features
+    end
+  end
+
   describe "federation/0" do
     setup do: clear_config([:mrf, :transparency], true)
 

From 0070b131304f12a4795095b59a33a31ae8b4fb32 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 17:43:02 +0400
Subject: [PATCH 146/163] test(workers): replace publisher mocks with Mox

---
 lib/pleroma/web/federator.ex                  |   3 +-
 lib/pleroma/web/federator/publishing.ex       |   1 +
 lib/pleroma/workers/publisher_worker.ex       |   7 +-
 .../pleroma/workers/publisher_worker_test.exs | 117 ++++++++++--------
 4 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/lib/pleroma/web/federator.ex b/lib/pleroma/web/federator.ex
index 90cd2e54a..88b267331 100644
--- a/lib/pleroma/web/federator.ex
+++ b/lib/pleroma/web/federator.ex
@@ -89,7 +89,8 @@ defmodule Pleroma.Web.Federator do
 
   # Job Worker Callbacks
 
-  @spec perform(atom(), any()) :: {:ok, any()} | {:error, any()}
+  @impl true
+  @spec perform(atom(), any()) :: :ok | {:ok, any()} | {:error, any()}
   def perform(:publish_one, params) do
     Publisher.prepare_one(params)
     |> Publisher.publish_one()
diff --git a/lib/pleroma/web/federator/publishing.ex b/lib/pleroma/web/federator/publishing.ex
index 3a242b8dc..889b6b83e 100644
--- a/lib/pleroma/web/federator/publishing.ex
+++ b/lib/pleroma/web/federator/publishing.ex
@@ -3,5 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Federator.Publishing do
+  @callback perform(atom(), any()) :: :ok | {:ok, any()} | {:error, any()}
   @callback publish(map()) :: any()
 end
diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex
index 4ac0e218e..186f6f4ef 100644
--- a/lib/pleroma/workers/publisher_worker.ex
+++ b/lib/pleroma/workers/publisher_worker.ex
@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Workers.PublisherWorker do
   alias Pleroma.Activity
+  alias Pleroma.Config
   alias Pleroma.Instances
   alias Pleroma.Web.Federator
 
@@ -19,7 +20,7 @@ defmodule Pleroma.Workers.PublisherWorker do
   @impl true
   def perform(%Job{args: %{"op" => "publish", "activity_id" => activity_id}}) do
     activity = Activity.get_by_id(activity_id)
-    Federator.perform(:publish, activity)
+    federator().perform(:publish, activity)
   end
 
   def perform(%Job{args: %{"op" => "publish_one", "params" => params}} = job) do
@@ -35,7 +36,7 @@ defmodule Pleroma.Workers.PublisherWorker do
     if not Instances.reachable?(params.inbox) do
       {:cancel, :unreachable}
     else
-      case Federator.perform(:publish_one, params) do
+      case federator().perform(:publish_one, params) do
         {:ok, _} ->
           :ok
 
@@ -57,6 +58,8 @@ defmodule Pleroma.Workers.PublisherWorker do
   @impl true
   def timeout(_job), do: :timer.seconds(10)
 
+  defp federator, do: Config.get([:pipeline, :federator], Federator)
+
   @base_backoff 15
   @pow 5
   @impl true
diff --git a/test/pleroma/workers/publisher_worker_test.exs b/test/pleroma/workers/publisher_worker_test.exs
index 0e1b9d698..ddbbba910 100644
--- a/test/pleroma/workers/publisher_worker_test.exs
+++ b/test/pleroma/workers/publisher_worker_test.exs
@@ -6,8 +6,8 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
   use Pleroma.DataCase, async: false
   use Oban.Testing, repo: Pleroma.Repo
 
+  import Mox
   import Pleroma.Factory
-  import Mock
 
   alias Pleroma.Instances
   alias Pleroma.Object
@@ -15,6 +15,7 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.Federator
+  alias Pleroma.Web.FederatorMock
   alias Pleroma.Workers.PublisherWorker
 
   describe "Oban job priority:" do
@@ -56,49 +57,49 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
     end
 
     test "marks server as unreachable only on final failure", %{activity: activity} do
-      with_mock Pleroma.Web.Federator,
-        perform: fn :publish_one, _params -> {:error, :connection_error} end do
-        # First attempt
-        job = %Oban.Job{
-          args: %{
-            "op" => "publish_one",
-            "params" => %{
-              "inbox" => "https://example.com/inbox",
-              "activity_id" => activity.id
-            }
-          },
-          attempt: 1,
-          max_attempts: 5
-        }
+      expect(FederatorMock, :perform, 2, fn :publish_one, _params ->
+        {:error, :connection_error}
+      end)
 
-        assert {:error, :connection_error} = PublisherWorker.perform(job)
-        assert Instances.reachable?("https://example.com/inbox")
+      # First attempt
+      job = %Oban.Job{
+        args: %{
+          "op" => "publish_one",
+          "params" => %{
+            "inbox" => "https://example.com/inbox",
+            "activity_id" => activity.id
+          }
+        },
+        attempt: 1,
+        max_attempts: 5
+      }
 
-        # Final attempt
-        job = %{job | attempt: 5}
-        assert {:error, :connection_error} = PublisherWorker.perform(job)
-        refute Instances.reachable?("https://example.com/inbox")
-      end
+      assert {:error, :connection_error} = PublisherWorker.perform(job)
+      assert Instances.reachable?("https://example.com/inbox")
+
+      # Final attempt
+      job = %{job | attempt: 5}
+      assert {:error, :connection_error} = PublisherWorker.perform(job)
+      refute Instances.reachable?("https://example.com/inbox")
     end
 
     test "does not mark server as unreachable on successful publish", %{activity: activity} do
-      with_mock Pleroma.Web.Federator,
-        perform: fn :publish_one, _params -> {:ok, %{status: 200}} end do
-        job = %Oban.Job{
-          args: %{
-            "op" => "publish_one",
-            "params" => %{
-              "inbox" => "https://example.com/inbox",
-              "activity_id" => activity.id
-            }
-          },
-          attempt: 1,
-          max_attempts: 5
-        }
+      expect(FederatorMock, :perform, fn :publish_one, _params -> {:ok, %{status: 200}} end)
 
-        assert :ok = PublisherWorker.perform(job)
-        assert Instances.reachable?("https://example.com/inbox")
-      end
+      job = %Oban.Job{
+        args: %{
+          "op" => "publish_one",
+          "params" => %{
+            "inbox" => "https://example.com/inbox",
+            "activity_id" => activity.id
+          }
+        },
+        attempt: 1,
+        max_attempts: 5
+      }
+
+      assert :ok = PublisherWorker.perform(job)
+      assert Instances.reachable?("https://example.com/inbox")
     end
 
     test "does not create atoms from unexpected job params", %{activity: activity} do
@@ -106,24 +107,30 @@ defmodule Pleroma.Workers.PublisherWorkerTest do
 
       assert_raise ArgumentError, fn -> String.to_existing_atom(unknown_key) end
 
-      with_mock Pleroma.Web.Federator,
-        perform: fn :publish_one, _params -> {:ok, %{status: 200}} end do
-        job = %Oban.Job{
-          args: %{
-            "op" => "publish_one",
-            "params" => %{
-              "inbox" => "https://example.com/inbox",
-              "activity_id" => activity.id,
-              unknown_key => "ignored"
-            }
-          },
-          attempt: 1,
-          max_attempts: 5
-        }
+      expect(FederatorMock, :perform, fn :publish_one, params ->
+        assert params == %{
+                 inbox: "https://example.com/inbox",
+                 activity_id: activity.id
+               }
 
-        assert :ok = PublisherWorker.perform(job)
-        assert_raise ArgumentError, fn -> String.to_existing_atom(unknown_key) end
-      end
+        {:ok, %{status: 200}}
+      end)
+
+      job = %Oban.Job{
+        args: %{
+          "op" => "publish_one",
+          "params" => %{
+            "inbox" => "https://example.com/inbox",
+            "activity_id" => activity.id,
+            unknown_key => "ignored"
+          }
+        },
+        attempt: 1,
+        max_attempts: 5
+      }
+
+      assert :ok = PublisherWorker.perform(job)
+      assert_raise ArgumentError, fn -> String.to_existing_atom(unknown_key) end
     end
 
     test "cancels job if server is unreachable", %{activity: activity} do

From b97092a97e2669f75d117103ab69e30255092b59 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 18:36:25 +0400
Subject: [PATCH 147/163] fix: preserve optimized hashtag ordering

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a564a634d..4efd18d39 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -901,10 +901,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         where: hto.hashtag_id in ^hashtag_ids
       )
 
-    if query.distinct == [] do
-      from([activity, object] in query,
-        distinct: [desc: activity.id],
-        order_by: [desc: activity.id]
+    if is_nil(query.distinct) do
+      from([_activity, object] in query,
+        distinct: [desc: object.id],
+        order_by: [desc: object.id]
       )
     else
       query

From ce4e1d42876d0cacb626109e2d5085f1729f315b Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Fri, 24 Jul 2026 16:03:57 +0200
Subject: [PATCH 148/163] ReverseProxy Tesla: Explicitly reformat proxy

---
 lib/pleroma/reverse_proxy/client/tesla.ex | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex
index 24168e367..941d23ea2 100644
--- a/lib/pleroma/reverse_proxy/client/tesla.ex
+++ b/lib/pleroma/reverse_proxy/client/tesla.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do
   @behaviour Pleroma.ReverseProxy.Client
 
   alias Pleroma.Gun.ConnectionPool
+  alias Pleroma.HTTP.AdapterHelper
 
   @type headers() :: [{String.t(), String.t()}]
   @type status() :: pos_integer()
@@ -20,6 +21,13 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do
   def request(method, url, headers, body, opts \\ []) do
     check_adapter()
 
+    # MediaProxyController inserts MediaProxy proxy configuration into the ReverseProxy call.
+    # This config can be unformatted and in String representation, while this works for Hackney,
+    # it does not work for Tesla and the proxy needs to be reformatted.
+    # Gun AdapterHelper doesn't do it, since it does not overwrite proxy config.
+    proxy = AdapterHelper.format_proxy(opts[:proxy])
+    opts = if proxy, do: Keyword.put(opts, :proxy, proxy), else: opts
+
     opts = Keyword.put(opts, :body_as, :chunks)
 
     with {:ok, response} <-

From 77b5f3f485049fb4fe3b81ac71f5ef28c0e1e264 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 18:49:44 +0400
Subject: [PATCH 149/163] test: cover multi-hashtag pagination

---
 .../controllers/timeline_controller_test.exs  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index 19f75fe0e..bed897e23 100644
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -929,6 +929,33 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       end
     end
 
+    test "multi-hashtag timeline pagination returns unique statuses", %{conn: conn} do
+      user = insert(:user)
+
+      {:ok, activity_one} = CommonAPI.post(user, %{status: "#test #test1"})
+      {:ok, activity_two} = CommonAPI.post(user, %{status: "#test #test1"})
+      {:ok, activity_three} = CommonAPI.post(user, %{status: "#test #test1"})
+
+      for hashtag_timeline_mode <- [:enabled, :disabled] do
+        clear_config([:features, :improved_hashtag_timeline], hashtag_timeline_mode)
+
+        first_page =
+          conn
+          |> get("/api/v1/timelines/tag/test?any[]=test1&limit=2")
+          |> json_response_and_validate_schema(:ok)
+
+        assert Enum.map(first_page, & &1["id"]) ==
+                 Enum.map([activity_three, activity_two], &to_string(&1.id))
+
+        second_page =
+          conn
+          |> get("/api/v1/timelines/tag/test?any[]=test1&limit=2&max_id=#{activity_two.id}")
+          |> json_response_and_validate_schema(:ok)
+
+        assert Enum.map(second_page, & &1["id"]) == [to_string(activity_one.id)]
+      end
+    end
+
     test "muted emotions", %{conn: conn} do
       user = insert(:user)
       token = insert(:oauth_token, user: user, scopes: ["read:statuses"])

From a9bf7212d495c5005789768f63d302fc4677f120 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 19:59:18 +0400
Subject: [PATCH 150/163] fix(feed): escape fallback content

---
 lib/pleroma/web/feed/feed_view.ex        |  5 ++---
 test/pleroma/web/feed/feed_view_test.exs | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 test/pleroma/web/feed/feed_view_test.exs

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index a433b8403..9724cc7f9 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -109,9 +109,8 @@ defmodule Pleroma.Web.Feed.FeedView do
     base_content =
       case activity_content(data) do
         "" ->
-          data["summary"] || data["type"] ||
-            ""
-            |> escape()
+          (data["summary"] || data["type"] || "")
+          |> escape()
 
         content ->
           content
diff --git a/test/pleroma/web/feed/feed_view_test.exs b/test/pleroma/web/feed/feed_view_test.exs
new file mode 100644
index 000000000..3ff3b9bae
--- /dev/null
+++ b/test/pleroma/web/feed/feed_view_test.exs
@@ -0,0 +1,22 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.Feed.FeedViewTest do
+  use Pleroma.DataCase, async: true
+
+  alias Pleroma.Web.Feed.FeedView
+
+  test "escapes fallback content" do
+    data = %{
+      "attachment" => [],
+      "content" => "",
+      "summary" => "<script>alert('feed')</script>"
+    }
+
+    expected = "&lt;script&gt;alert(&#39;feed&#39;)&lt;/script&gt;"
+
+    assert FeedView.atom_content_encoded(data) == expected
+    assert FeedView.rss_content_encoded(data) == expected
+  end
+end

From 85a802282e193333cca700a4ea46243c33057767 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:08:04 +0400
Subject: [PATCH 151/163] fix(feed): hide sensitive media previews

---
 lib/pleroma/web/feed/feed_view.ex             | 39 ++++++++++---------
 .../web/templates/feed/feed/_activity.rss.eex |  2 +-
 .../templates/feed/feed/_tag_activity.xml.eex |  2 +-
 test/pleroma/web/feed/feed_view_test.exs      | 24 ++++++++++++
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index 9724cc7f9..f8bc94504 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -117,10 +117,14 @@ defmodule Pleroma.Web.Feed.FeedView do
       end
 
     attachments_html =
-      (data["attachment"] || [])
-      |> Enum.map(&rss_attachment_preview/1)
-      |> Enum.reject(&(&1 == ""))
-      |> Enum.join("<br/><br/>")
+      if data["sensitive"] do
+        ""
+      else
+        (data["attachment"] || [])
+        |> Enum.map(&rss_attachment_preview/1)
+        |> Enum.reject(&(&1 == ""))
+        |> Enum.join("<br/><br/>")
+      end
 
     [base_content, attachments_html]
     |> Enum.reject(&(&1 == ""))
@@ -223,7 +227,9 @@ defmodule Pleroma.Web.Feed.FeedView do
     attachment["name"] || ""
   end
 
-  def media_content_xml(attachment) do
+  def media_content_xml(_attachment, true), do: ""
+
+  def media_content_xml(attachment, _sensitive) do
     href = escape(attachment_href(attachment) || "")
     type = escape(attachment_type(attachment) || "application/octet-stream")
     medium = escape(attachment_medium(attachment))
@@ -234,20 +240,17 @@ defmodule Pleroma.Web.Feed.FeedView do
         _ -> ""
       end
 
-    description_xml =
-      case attachment_description(attachment) do
-        "" ->
-          ""
+    case attachment_description(attachment) do
+      "" ->
+        ~s(<media:content url="#{href}" type="#{type}"#{file_size_attr} medium="#{medium}"/>\n)
 
-        description ->
-          ~s(\n  <media:description type="plain">#{escape(description)}</media:description>)
-      end
-
-    """
-    <media:content url="#{href}" type="#{type}"#{file_size_attr} medium="#{medium}">
-      <media:rating scheme="urn:simple">nonadult</media:rating>#{description_xml}
-    </media:content>
-    """
+      description ->
+        """
+        <media:content url="#{href}" type="#{type}"#{file_size_attr} medium="#{medium}">
+          <media:description type="plain">#{escape(description)}</media:description>
+        </media:content>
+        """
+    end
   end
 
   defp attachment_url_data(attachment) do
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index a8c2aa342..e2708543f 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -23,7 +23,7 @@
     <%= unless attachment_previewable?(attachment) do %>
       <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>" />
     <% end %>
-    <%= media_content_xml(attachment) %>
+    <%= media_content_xml(attachment, @data["sensitive"]) %>
   <% end %>
 
   <%= if @data["inReplyTo"] do %>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index 6ae3c5a55..9b857ee5e 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@ -11,7 +11,7 @@
     <%= unless attachment_previewable?(attachment) do %>
       <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>"/>
     <% end %>
-    <%= media_content_xml(attachment) %>
+    <%= media_content_xml(attachment, @data["sensitive"]) %>
   <% end %>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
diff --git a/test/pleroma/web/feed/feed_view_test.exs b/test/pleroma/web/feed/feed_view_test.exs
index 3ff3b9bae..45ed3c3ff 100644
--- a/test/pleroma/web/feed/feed_view_test.exs
+++ b/test/pleroma/web/feed/feed_view_test.exs
@@ -19,4 +19,28 @@ defmodule Pleroma.Web.Feed.FeedViewTest do
     assert FeedView.atom_content_encoded(data) == expected
     assert FeedView.rss_content_encoded(data) == expected
   end
+
+  test "does not preview or classify sensitive attachments" do
+    attachment = %{
+      "name" => "spoiler",
+      "url" => [%{"href" => "https://example.com/spoiler.png", "mediaType" => "image/png"}]
+    }
+
+    data = %{
+      "attachment" => [attachment],
+      "content" => "content warning",
+      "sensitive" => true
+    }
+
+    assert FeedView.atom_content_encoded(data) == "content warning"
+    assert FeedView.rss_content_encoded(data) == "content warning"
+    assert FeedView.media_content_xml(attachment, true) == ""
+
+    media_content = FeedView.media_content_xml(attachment, false)
+    assert media_content =~ "<media:description type=\"plain\">spoiler</media:description>"
+    refute media_content =~ "media:rating"
+
+    assert FeedView.media_content_xml(Map.delete(attachment, "name"), false) ==
+             ~s(<media:content url="https://example.com/spoiler.png" type="image/png" medium="image"/>\n)
+  end
 end

From d0c8ca92a5885fbd4919273300cd952f87bea661 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:11:19 +0400
Subject: [PATCH 152/163] fix(feed): escape self link URLs

---
 lib/pleroma/web/feed/feed_view.ex              |  6 +++++-
 test/pleroma/web/feed/user_controller_test.exs | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index f8bc94504..ade9f7a15 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -167,7 +167,11 @@ defmodule Pleroma.Web.Feed.FeedView do
 
   def activity_context(activity), do: escape(activity.data["context"])
 
-  def feed_self_url(conn), do: Phoenix.Controller.current_url(conn)
+  def feed_self_url(conn) do
+    conn
+    |> Phoenix.Controller.current_url()
+    |> escape()
+  end
 
   def activity_link(activity, data) do
     cond do
diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index 916531cd5..5dfe6aa89 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -138,6 +138,18 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
       assert activity_titles == [~c"2hu & as"]
     end
 
+    test "escapes query parameters in feed self links", %{conn: conn, user: user} do
+      for format <- ~w[atom rss] do
+        response =
+          conn
+          |> get("/users/#{user.nickname}/feed.#{format}?first=one&second=two")
+          |> response(200)
+
+        assert response =~ "first=one&amp;second=two"
+        refute response =~ "first=one&second=two"
+      end
+    end
+
     test "returns 404 for a missing feed", %{conn: conn} do
       conn =
         conn

From 96f471a291428c4d0266b3c9536a315e1668864a Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:21:54 +0400
Subject: [PATCH 153/163] fix(feed): format RSS build dates

---
 lib/pleroma/web/feed/feed_view.ex               | 14 ++++++++++++++
 lib/pleroma/web/templates/feed/feed/tag.rss.eex |  4 +++-
 test/pleroma/web/feed/tag_controller_test.exs   | 17 ++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index ade9f7a15..dcbb8404f 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -38,6 +38,20 @@ defmodule Pleroma.Web.Feed.FeedView do
     end
   end
 
+  def most_recent_update([], :rss), do: nil
+
+  def most_recent_update(activities, :rss) do
+    activities
+    |> Enum.map(fn activity ->
+      case Object.normalize(activity, fetch: false) do
+        %Object{updated_at: updated_at} -> updated_at
+        _ -> activity.updated_at
+      end
+    end)
+    |> Enum.max_by(&NaiveDateTime.to_erl/1)
+    |> to_rfc2822()
+  end
+
   def most_recent_update(activities, user, :atom) do
     (List.first(activities) || user).updated_at
     |> to_rfc3339()
diff --git a/lib/pleroma/web/templates/feed/feed/tag.rss.eex b/lib/pleroma/web/templates/feed/feed/tag.rss.eex
index 618b89ba3..b74a573e5 100644
--- a/lib/pleroma/web/templates/feed/feed/tag.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.rss.eex
@@ -12,7 +12,9 @@
     <webfeeds:logo><%= feed_logo() %></webfeeds:logo>
     <webfeeds:icon><%= feed_logo() %></webfeeds:icon>
     <webfeeds:accentColor>2b90d9</webfeeds:accentColor>
-    <lastBuildDate><%= most_recent_update(@activities) || to_rfc2822(NaiveDateTime.utc_now()) %></lastBuildDate>
+    <%= with last_build_date when not is_nil(last_build_date) <- most_recent_update(@activities, :rss) do %>
+      <lastBuildDate><%= last_build_date %></lastBuildDate>
+    <% end %>
     <generator><%= Pleroma.Application.named_version() %></generator>
     <%= for activity <- @activities do %>
     <%= render Phoenix.Controller.view_module(@conn), "_tag_activity.xml", Map.merge(assigns, prepare_activity(activity)) %>
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index 7f2f57b07..2e20e18d7 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -105,8 +105,10 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
         }
       ])
 
+    edited_at = NaiveDateTime.add(object.updated_at, 60)
+
     object
-    |> Ecto.Changeset.change(data: object_data)
+    |> Ecto.Changeset.change(data: object_data, updated_at: edited_at)
     |> Pleroma.Repo.update()
 
     {:ok, activity2} = CommonAPI.post(user, %{status: "42 This is :moominmamma #PleromaArt"})
@@ -141,6 +143,9 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
              FeedView.to_rfc2822(activity1.data["published"])
            ]
 
+    assert xpath(xml, ~x"//channel/lastBuildDate/text()"s) ==
+             FeedView.to_rfc2822(edited_at)
+
     assert xpath(xml, ~x"//channel/item/media:content/@url"sl) == [
              "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4"
            ]
@@ -181,6 +186,16 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
            ]
   end
 
+  test "does not fabricate lastBuildDate for an empty RSS feed", %{conn: conn} do
+    response =
+      conn
+      |> put_req_header("accept", "application/rss+xml")
+      |> get(tag_feed_path(conn, :feed, "empty.rss"))
+      |> response(200)
+
+    refute response =~ "<lastBuildDate>"
+  end
+
   describe "private instance" do
     setup do: clear_config([:instance, :public], false)
 

From d1a7e915ce3eff59243b0cd07f430517f4c63c58 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:34:33 +0400
Subject: [PATCH 154/163] fix(feed): preserve standard media enclosures

---
 .../templates/feed/feed/_activity.atom.eex    | 10 +++-
 .../web/templates/feed/feed/_activity.rss.eex | 11 ++--
 .../feed/feed/_tag_activity.atom.eex          | 10 +++-
 .../templates/feed/feed/_tag_activity.xml.eex | 11 ++--
 test/pleroma/web/feed/tag_controller_test.exs | 40 ++++++++++++-
 .../pleroma/web/feed/user_controller_test.exs | 57 +++++++++++++++++++
 6 files changed, 122 insertions(+), 17 deletions(-)

diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index f87d97cb4..604805211 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -22,9 +22,13 @@
     <category term="<%= tag %>"></category>
   <% end %>
 
-  <%= for attachment <- @data["attachment"] || [] do %>
-    <%= unless attachment_previewable?(attachment) do %>
-      <link rel="enclosure" href="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= attachment_size(attachment) %>"/>
+  <%= unless @data["sensitive"] do %>
+    <%= for attachment <- @data["attachment"] || [] do %>
+      <%= if size = attachment_size_positive(attachment) do %>
+        <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size %>"/>
+      <% else %>
+        <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>"/>
+      <% end %>
     <% end %>
   <% end %>
 
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index e2708543f..2127f554f 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -18,11 +18,14 @@
     <% end %>
   <% end %>
 
-  <%= for attachment <- @data["attachment"] || [] do %>
-    <%= size = attachment_size_positive(attachment) %>
-    <%= unless attachment_previewable?(attachment) do %>
-      <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>" />
+  <%= unless @data["sensitive"] do %>
+    <%= with [attachment | _] <- @data["attachment"] || [] do %>
+      <%= size = attachment_size_positive(attachment) %>
+      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size || 0 %>" />
     <% end %>
+  <% end %>
+
+  <%= for attachment <- @data["attachment"] || [] do %>
     <%= media_content_xml(attachment, @data["sensitive"]) %>
   <% end %>
 
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index ae762f9ed..1720ccd37 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -25,9 +25,13 @@
     <category term="<%= tag %>"></category>
   <% end %>
 
-  <%= for attachment <- @data["attachment"] || [] do %>
-    <%= unless attachment_previewable?(attachment) do %>
-      <link rel="enclosure" href="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= attachment_size(attachment) %>"/>
+  <%= unless @data["sensitive"] do %>
+    <%= for attachment <- @data["attachment"] || [] do %>
+      <%= if size = attachment_size_positive(attachment) do %>
+        <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size %>"/>
+      <% else %>
+        <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>"/>
+      <% end %>
     <% end %>
   <% end %>
 
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index 9b857ee5e..09945605c 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@ -6,11 +6,14 @@
   <description><%= activity_description(@data) %></description>
   <content:encoded><![CDATA[<%= rss_content_encoded(@data) %>]]></content:encoded>
 
-  <%= for attachment <- @data["attachment"] || [] do %>
-    <%= size = attachment_size_positive(attachment) %>
-    <%= unless attachment_previewable?(attachment) do %>
-      <enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>" length="<%= size || 0 %>"/>
+  <%= unless @data["sensitive"] do %>
+    <%= with [attachment | _] <- @data["attachment"] || [] do %>
+      <%= size = attachment_size_positive(attachment) %>
+      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size || 0 %>"/>
     <% end %>
+  <% end %>
+
+  <%= for attachment <- @data["attachment"] || [] do %>
     <%= media_content_xml(attachment, @data["sensitive"]) %>
   <% end %>
 
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index 2e20e18d7..0d12f500a 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -31,8 +31,18 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
           "url" => [
             %{
               "href" =>
-                "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4",
+                "https://peertube.moe/video.mp4?first=one&second=two",
               "mediaType" => "video/mp4",
+              "size" => "123",
+              "type" => "Link"
+            }
+          ]
+        },
+        %{
+          "url" => [
+            %{
+              "href" => "https://peertube.moe/notes.pdf",
+              "mediaType" => "application/pdf",
               "type" => "Link"
             }
           ]
@@ -64,6 +74,13 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
 
     assert xpath(xml, ~x"//feed/entry/author/name/text()"ls) == [user.nickname, user.nickname]
 
+    assert xpath(xml, ~x"//feed/entry/link[@rel='enclosure']/@href"sl) == [
+             "https://peertube.moe/video.mp4?first=one&second=two",
+             "https://peertube.moe/notes.pdf"
+           ]
+
+    assert xpath(xml, ~x"//feed/entry/link[@rel='enclosure']/@length"sl) == ["123"]
+
     conn =
       conn
       |> put_req_header("accept", "application/atom+xml")
@@ -97,8 +114,18 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
           "url" => [
             %{
               "href" =>
-                "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4",
+                "https://peertube.moe/video.mp4?first=one&second=two",
               "mediaType" => "video/mp4",
+              "size" => "123",
+              "type" => "Link"
+            }
+          ]
+        },
+        %{
+          "url" => [
+            %{
+              "href" => "https://peertube.moe/notes.pdf",
+              "mediaType" => "application/pdf",
               "type" => "Link"
             }
           ]
@@ -147,9 +174,16 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
              FeedView.to_rfc2822(edited_at)
 
     assert xpath(xml, ~x"//channel/item/media:content/@url"sl) == [
-             "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4"
+             "https://peertube.moe/video.mp4?first=one&second=two",
+             "https://peertube.moe/notes.pdf"
            ]
 
+    assert xpath(xml, ~x"//channel/item/enclosure/@url"sl) == [
+             "https://peertube.moe/video.mp4?first=one&second=two"
+           ]
+
+    assert xpath(xml, ~x"//channel/item/enclosure/@length"sl) == ["123"]
+
     obj1 = Object.normalize(activity1, fetch: false)
     obj2 = Object.normalize(activity2, fetch: false)
 
diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index 5dfe6aa89..e1f9fd403 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -150,6 +150,63 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
       end
     end
 
+    test "does not expose sensitive attachments as enclosures", %{
+      conn: conn,
+      object: object,
+      user: user
+    } do
+      object
+      |> Ecto.Changeset.change(data: Map.put(object.data, "sensitive", true))
+      |> Pleroma.Repo.update!()
+
+      atom_response =
+        conn
+        |> get("/users/#{user.nickname}/feed.atom")
+        |> response(200)
+
+      rss_response =
+        conn
+        |> get("/users/#{user.nickname}/feed.rss")
+        |> response(200)
+
+      refute atom_response =~ "rel=\"enclosure\""
+      refute rss_response =~ "<enclosure "
+    end
+
+    test "uses enclosure fallbacks for user feeds", %{conn: conn, object: object, user: user} do
+      attachment = %{"url" => [%{"href" => "https://example.com/file.bin"}]}
+
+      object
+      |> Ecto.Changeset.change(data: Map.put(object.data, "attachment", [attachment]))
+      |> Pleroma.Repo.update!()
+
+      atom_xml =
+        conn
+        |> get("/users/#{user.nickname}/feed.atom")
+        |> response(200)
+        |> parse()
+
+      assert xpath(atom_xml, ~x"//entry/link[@rel='enclosure']/@href"sl) == [
+               "https://example.com/file.bin"
+             ]
+
+      assert xpath(atom_xml, ~x"//entry/link[@rel='enclosure']/@type"sl) == [
+               "application/octet-stream"
+             ]
+
+      assert xpath(atom_xml, ~x"//entry/link[@rel='enclosure']/@length"sl) == []
+
+      rss_xml =
+        conn
+        |> get("/users/#{user.nickname}/feed.rss")
+        |> response(200)
+        |> parse()
+
+      assert xpath(rss_xml, ~x"//item/enclosure/@url"sl) == ["https://example.com/file.bin"]
+      assert xpath(rss_xml, ~x"//item/enclosure/@type"sl) == ["application/octet-stream"]
+      assert xpath(rss_xml, ~x"//item/enclosure/@length"sl) == ["0"]
+    end
+
     test "returns 404 for a missing feed", %{conn: conn} do
       conn =
         conn

From ecd8a14435428dcfed4e8389f65074215846da05 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:38:25 +0400
Subject: [PATCH 155/163] fix(feed): correct Atom entry links

---
 lib/pleroma/web/templates/feed/feed/_activity.atom.eex    | 3 +--
 .../web/templates/feed/feed/_tag_activity.atom.eex        | 3 +--
 test/pleroma/web/feed/tag_controller_test.exs             | 2 ++
 test/pleroma/web/feed/user_controller_test.exs            | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index 604805211..bc67e12b3 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -15,8 +15,7 @@
     <summary><%= escape(@data["summary"]) %></summary>
   <% end %>
 
-  <link type="application/atom+xml" href='<%= activity_link(@activity, @data) %>' rel="self"/>
-  <link type="text/html" href='<%= activity_link(@activity, @data) %>' rel="alternate"/>
+  <link type="text/html" href='<%= escape(activity_link(@activity, @data) || "") %>' rel="alternate"/>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
     <category term="<%= tag %>"></category>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 1720ccd37..ce5d62de6 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -18,8 +18,7 @@
     <summary><%= escape(@data["summary"]) %></summary>
   <% end %>
 
-  <link type="application/atom+xml" href='<%= activity_link(@activity, @data) %>' rel="self"/>
-  <link type="text/html" href='<%= activity_link(@activity, @data) %>' rel="alternate"/>
+  <link type="text/html" href='<%= escape(activity_link(@activity, @data) || "") %>' rel="alternate"/>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
     <category term="<%= tag %>"></category>
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index 0d12f500a..9e8874455 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -73,6 +73,8 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
            ]
 
     assert xpath(xml, ~x"//feed/entry/author/name/text()"ls) == [user.nickname, user.nickname]
+    assert xpath(xml, ~x"//feed/entry/link[@rel='self']/@href"sl) == []
+    assert length(xpath(xml, ~x"//feed/entry/link[@rel='alternate']/@href"sl)) == 2
 
     assert xpath(xml, ~x"//feed/entry/link[@rel='enclosure']/@href"sl) == [
              "https://peertube.moe/video.mp4?first=one&second=two",
diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index e1f9fd403..f363fc0a5 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -83,12 +83,12 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
         |> get(user_feed_path(conn, :feed, user.nickname))
         |> response(200)
 
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//entry/title/text()"l)
+      xml = SweetXml.parse(resp)
+      activity_titles = SweetXml.xpath(xml, ~x"//entry/title/text()"l)
 
       assert activity_titles == [~c"Won't, didn'...", ~c"2hu", ~c"2hu & as"]
+      assert SweetXml.xpath(xml, ~x"//entry/link[@rel='self']/@href"sl) == []
+      assert length(SweetXml.xpath(xml, ~x"//entry/link[@rel='alternate']/@href"sl)) == 3
       assert resp =~ FeedView.escape(object.data["content"])
       assert resp =~ FeedView.escape(object.data["summary"])
       assert resp =~ FeedView.escape(object.data["context"])

From c5183193495ac38ac8caff5fab90113b50dddfe0 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:43:40 +0400
Subject: [PATCH 156/163] fix(feed): correct RSS permalink metadata

---
 .../web/templates/feed/feed/_activity.rss.eex |  4 +--
 .../templates/feed/feed/_tag_activity.xml.eex |  4 +--
 test/pleroma/web/feed/tag_controller_test.exs | 33 +++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index 2127f554f..393501dad 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -1,7 +1,7 @@
 <item>
   <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-  <guid isPermaLink="true"><%= @data["id"] %></guid>
+  <guid isPermaLink="true"><%= escape(@data["id"] || "") %></guid>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <description><%= activity_description(@data) %></description>
   <content:encoded><![CDATA[<%= rss_content_encoded(@data) %>]]></content:encoded>
@@ -10,7 +10,7 @@
     <%= activity_context(@activity) %>
   </ostatus:conversation>
 
-  <link><%= activity_link(@activity, @data) %></link>
+  <link><%= escape(activity_link(@activity, @data) || "") %></link>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
     <%= if tag && tag != "" do %>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index 09945605c..a8796353f 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@ -1,6 +1,6 @@
 <item>
-  <guid isPermalink="true"><%= activity_link(@activity, @data) %></guid>
-  <link><%= activity_link(@activity, @data) %></link>
+  <guid isPermaLink="true"><%= escape(activity_link(@activity, @data) || "") %></guid>
+  <link><%= escape(activity_link(@activity, @data) || "") %></link>
   <pubDate><%= to_rfc2822(@data["published"]) %></pubDate>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <description><%= activity_description(@data) %></description>
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index 9e8874455..eef524cc4 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -167,6 +167,8 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
              ~c"yeah #PleromaArt"
            ]
 
+    assert xpath(xml, ~x"//channel/item/guid/@isPermaLink"sl) == ["true", "true"]
+
     assert xpath(xml, ~x"//channel/item/pubDate/text()"sl) == [
              FeedView.to_rfc2822(activity2.data["published"]),
              FeedView.to_rfc2822(activity1.data["published"])
@@ -232,6 +234,37 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
     refute response =~ "<lastBuildDate>"
   end
 
+  test "escapes and round-trips RSS item permalinks", %{conn: conn} do
+    user = insert(:user, local: false)
+    permalink = "https://remote.example/post?first=one&second=two"
+
+    note =
+      insert(:note,
+        user: user,
+        object_local: false,
+        data: %{
+          "content" => "remote #rsslink",
+          "external_url" => permalink,
+          "summary" => "",
+          "tag" => ["rsslink"]
+        }
+      )
+
+    insert(:note_activity, user: user, note: note, local: false, object_local: false)
+
+    response =
+      conn
+      |> put_req_header("accept", "application/rss+xml")
+      |> get(tag_feed_path(conn, :feed, "rsslink.rss"))
+      |> response(200)
+
+    assert response =~ "https://remote.example/post?first=one&amp;second=two"
+
+    xml = parse(response)
+    assert xpath(xml, ~x"//channel/item/guid/text()"s) == permalink
+    assert xpath(xml, ~x"//channel/item/link/text()"s) == permalink
+  end
+
   describe "private instance" do
     setup do: clear_config([:instance, :public], false)
 

From 2d667e1d2a2cfecea99cdcd660460882b2dfbf20 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:44:58 +0400
Subject: [PATCH 157/163] style(feed): format enclosure fixtures

---
 test/pleroma/web/feed/tag_controller_test.exs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index eef524cc4..a23c25274 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -30,8 +30,7 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
         %{
           "url" => [
             %{
-              "href" =>
-                "https://peertube.moe/video.mp4?first=one&second=two",
+              "href" => "https://peertube.moe/video.mp4?first=one&second=two",
               "mediaType" => "video/mp4",
               "size" => "123",
               "type" => "Link"
@@ -115,8 +114,7 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
         %{
           "url" => [
             %{
-              "href" =>
-                "https://peertube.moe/video.mp4?first=one&second=two",
+              "href" => "https://peertube.moe/video.mp4?first=one&second=two",
               "mediaType" => "video/mp4",
               "size" => "123",
               "type" => "Link"

From 5f71532442c7ad45c34663a6b3cf08f081a35132 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 20:59:13 +0400
Subject: [PATCH 158/163] fix(feed): tighten enclosure metadata

---
 lib/pleroma/web/feed/feed_view.ex                   | 10 ++++++----
 .../web/templates/feed/feed/_activity.atom.eex      |  2 +-
 .../web/templates/feed/feed/_activity.rss.eex       |  9 ++++-----
 .../web/templates/feed/feed/_tag_activity.atom.eex  |  2 +-
 .../web/templates/feed/feed/_tag_activity.xml.eex   |  9 ++++-----
 test/pleroma/web/feed/feed_view_test.exs            | 13 +++++++++++++
 test/pleroma/web/feed/user_controller_test.exs      |  9 ++++++---
 7 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index dcbb8404f..fc29db2b7 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -131,7 +131,7 @@ defmodule Pleroma.Web.Feed.FeedView do
       end
 
     attachments_html =
-      if data["sensitive"] do
+      if sensitive?(data) do
         ""
       else
         (data["attachment"] || [])
@@ -181,6 +181,8 @@ defmodule Pleroma.Web.Feed.FeedView do
 
   def activity_context(activity), do: escape(activity.data["context"])
 
+  def sensitive?(data), do: data["sensitive"] in [true, "true"]
+
   def feed_self_url(conn) do
     conn
     |> Phoenix.Controller.current_url()
@@ -237,15 +239,15 @@ defmodule Pleroma.Web.Feed.FeedView do
     end
   end
 
-  def attachment_previewable?(attachment) do
-    attachment_medium(attachment) in ["image", "video", "audio"]
+  def rss_enclosure_attachment(attachments) do
+    Enum.find(attachments || [], &(not is_nil(attachment_size_positive(&1))))
   end
 
   def attachment_description(attachment) do
     attachment["name"] || ""
   end
 
-  def media_content_xml(_attachment, true), do: ""
+  def media_content_xml(_attachment, sensitive) when sensitive in [true, "true"], do: ""
 
   def media_content_xml(attachment, _sensitive) do
     href = escape(attachment_href(attachment) || "")
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index bc67e12b3..91ef947f7 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -21,7 +21,7 @@
     <category term="<%= tag %>"></category>
   <% end %>
 
-  <%= unless @data["sensitive"] do %>
+  <%= unless sensitive?(@data) do %>
     <%= for attachment <- @data["attachment"] || [] do %>
       <%= if size = attachment_size_positive(attachment) do %>
         <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size %>"/>
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index 393501dad..4d71a45c7 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -18,15 +18,14 @@
     <% end %>
   <% end %>
 
-  <%= unless @data["sensitive"] do %>
-    <%= with [attachment | _] <- @data["attachment"] || [] do %>
-      <%= size = attachment_size_positive(attachment) %>
-      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size || 0 %>" />
+  <%= unless sensitive?(@data) do %>
+    <%= with attachment when not is_nil(attachment) <- rss_enclosure_attachment(@data["attachment"]) do %>
+      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= attachment_size_positive(attachment) %>" />
     <% end %>
   <% end %>
 
   <%= for attachment <- @data["attachment"] || [] do %>
-    <%= media_content_xml(attachment, @data["sensitive"]) %>
+    <%= media_content_xml(attachment, sensitive?(@data)) %>
   <% end %>
 
   <%= if @data["inReplyTo"] do %>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index ce5d62de6..44c4806cf 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -24,7 +24,7 @@
     <category term="<%= tag %>"></category>
   <% end %>
 
-  <%= unless @data["sensitive"] do %>
+  <%= unless sensitive?(@data) do %>
     <%= for attachment <- @data["attachment"] || [] do %>
       <%= if size = attachment_size_positive(attachment) do %>
         <link rel="enclosure" href="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size %>"/>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index a8796353f..64e4c1d81 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@ -6,15 +6,14 @@
   <description><%= activity_description(@data) %></description>
   <content:encoded><![CDATA[<%= rss_content_encoded(@data) %>]]></content:encoded>
 
-  <%= unless @data["sensitive"] do %>
-    <%= with [attachment | _] <- @data["attachment"] || [] do %>
-      <%= size = attachment_size_positive(attachment) %>
-      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= size || 0 %>"/>
+  <%= unless sensitive?(@data) do %>
+    <%= with attachment when not is_nil(attachment) <- rss_enclosure_attachment(@data["attachment"]) do %>
+      <enclosure url="<%= escape(attachment_href(attachment) || "") %>" type="<%= escape(attachment_type(attachment) || "application/octet-stream") %>" length="<%= attachment_size_positive(attachment) %>"/>
     <% end %>
   <% end %>
 
   <%= for attachment <- @data["attachment"] || [] do %>
-    <%= media_content_xml(attachment, @data["sensitive"]) %>
+    <%= media_content_xml(attachment, sensitive?(@data)) %>
   <% end %>
 
   <%= for tag <- Pleroma.Object.hashtags(@object) do %>
diff --git a/test/pleroma/web/feed/feed_view_test.exs b/test/pleroma/web/feed/feed_view_test.exs
index 45ed3c3ff..786b6df07 100644
--- a/test/pleroma/web/feed/feed_view_test.exs
+++ b/test/pleroma/web/feed/feed_view_test.exs
@@ -35,6 +35,7 @@ defmodule Pleroma.Web.Feed.FeedViewTest do
     assert FeedView.atom_content_encoded(data) == "content warning"
     assert FeedView.rss_content_encoded(data) == "content warning"
     assert FeedView.media_content_xml(attachment, true) == ""
+    assert FeedView.media_content_xml(attachment, "true") == ""
 
     media_content = FeedView.media_content_xml(attachment, false)
     assert media_content =~ "<media:description type=\"plain\">spoiler</media:description>"
@@ -43,4 +44,16 @@ defmodule Pleroma.Web.Feed.FeedViewTest do
     assert FeedView.media_content_xml(Map.delete(attachment, "name"), false) ==
              ~s(<media:content url="https://example.com/spoiler.png" type="image/png" medium="image"/>\n)
   end
+
+  test "does not treat a legacy false string as sensitive" do
+    data = %{
+      "attachment" => [
+        %{"url" => [%{"href" => "https://example.com/image.png", "mediaType" => "image/png"}]}
+      ],
+      "content" => "visible",
+      "sensitive" => "false"
+    }
+
+    assert FeedView.atom_content_encoded(data) =~ "<img"
+  end
 end
diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index f363fc0a5..b78ddb63a 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -202,9 +202,12 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
         |> response(200)
         |> parse()
 
-      assert xpath(rss_xml, ~x"//item/enclosure/@url"sl) == ["https://example.com/file.bin"]
-      assert xpath(rss_xml, ~x"//item/enclosure/@type"sl) == ["application/octet-stream"]
-      assert xpath(rss_xml, ~x"//item/enclosure/@length"sl) == ["0"]
+      assert xpath(rss_xml, ~x"//item/enclosure/@url"sl) == []
+      assert xpath(rss_xml, ~x"//item/media:content/@url"sl) == ["https://example.com/file.bin"]
+
+      assert xpath(rss_xml, ~x"//item/media:content/@type"sl) == [
+               "application/octet-stream"
+             ]
     end
 
     test "returns 404 for a missing feed", %{conn: conn} do

From c5230d98c5bbb4ba70516f825fec4d1fb60d836d Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 21:04:35 +0400
Subject: [PATCH 159/163] fix(feed): complete Atom XML metadata

---
 lib/pleroma/web/feed/feed_view.ex             |  2 +-
 .../templates/feed/feed/_activity.atom.eex    |  2 +-
 .../feed/feed/_tag_activity.atom.eex          |  2 +-
 .../web/templates/feed/feed/tag.atom.eex      |  2 +-
 test/pleroma/web/feed/tag_controller_test.exs | 43 +++++++++++++++++++
 .../pleroma/web/feed/user_controller_test.exs | 28 ++++++++++++
 6 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index fc29db2b7..b409b1923 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -43,7 +43,7 @@ defmodule Pleroma.Web.Feed.FeedView do
   def most_recent_update(activities, :rss) do
     activities
     |> Enum.map(fn activity ->
-      case Object.normalize(activity, fetch: false) do
+      case activity.object do
         %Object{updated_at: updated_at} -> updated_at
         _ -> activity.updated_at
       end
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index 91ef947f7..f94ba0793 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -1,7 +1,7 @@
 <entry>
   <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
   <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-  <id><%= @data["id"] %></id>
+  <id><%= escape(@data["id"] || "") %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <content type="html"><%= escape(atom_content_encoded(@data)) %></content>
   <published><%= to_rfc3339(@data["published"]) %></published>
diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 44c4806cf..6c74c2ab7 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -4,7 +4,7 @@
 
     <%= render Phoenix.Controller.view_module(@conn), "_tag_author.atom", assigns %>
 
-  <id><%= @data["id"] %></id>
+  <id><%= escape(@data["id"] || "") %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <content type="html"><%= escape(atom_content_encoded(@data)) %></content>
   <published><%= to_rfc3339(@data["published"]) %></published>
diff --git a/lib/pleroma/web/templates/feed/feed/tag.atom.eex b/lib/pleroma/web/templates/feed/feed/tag.atom.eex
index 1646aeec7..fb04544d3 100644
--- a/lib/pleroma/web/templates/feed/feed/tag.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.atom.eex
@@ -13,7 +13,7 @@
     <subtitle><%= subtitle %></subtitle>
   <% end %>
   <logo><%= feed_logo() %></logo>
-  <updated><%= most_recent_update(@activities) %></updated>
+  <updated><%= most_recent_update(@activities) || to_rfc3339(NaiveDateTime.utc_now()) %></updated>
   <link rel="self" href="<%= feed_self_url(@conn) %>" type="application/atom+xml"/>
 
   <%= for activity <- @activities do %>
diff --git a/test/pleroma/web/feed/tag_controller_test.exs b/test/pleroma/web/feed/tag_controller_test.exs
index a23c25274..35e29ed8c 100644
--- a/test/pleroma/web/feed/tag_controller_test.exs
+++ b/test/pleroma/web/feed/tag_controller_test.exs
@@ -232,6 +232,49 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
     refute response =~ "<lastBuildDate>"
   end
 
+  test "provides a valid updated timestamp for an empty Atom feed", %{conn: conn} do
+    response =
+      conn
+      |> put_req_header("accept", "application/atom+xml")
+      |> get(tag_feed_path(conn, :feed, "empty.atom"))
+      |> response(200)
+
+    updated = response |> parse() |> xpath(~x"//feed/updated/text()"s)
+    assert {:ok, _datetime, 0} = DateTime.from_iso8601(updated)
+  end
+
+  test "escapes Atom IDs and tag feed self links", %{conn: conn} do
+    user = insert(:user, local: false)
+    object_id = "https://remote.example/object?first=one&second=two"
+
+    note =
+      insert(:note,
+        user: user,
+        object_local: false,
+        data: %{
+          "content" => "remote #atomlink",
+          "external_url" => object_id,
+          "id" => object_id,
+          "summary" => "",
+          "tag" => ["atomlink"]
+        }
+      )
+
+    insert(:note_activity, user: user, note: note, local: false, object_local: false)
+
+    response =
+      conn
+      |> put_req_header("accept", "application/atom+xml")
+      |> get("/tags/atomlink.atom?third=three&fourth=four")
+      |> response(200)
+
+    assert response =~ "https://remote.example/object?first=one&amp;second=two"
+    assert response =~ "third=three&amp;fourth=four"
+
+    xml = parse(response)
+    assert xpath(xml, ~x"//feed/entry/id/text()"s) == object_id
+  end
+
   test "escapes and round-trips RSS item permalinks", %{conn: conn} do
     user = insert(:user, local: false)
     permalink = "https://remote.example/post?first=one&second=two"
diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index b78ddb63a..458f5ec8d 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -150,6 +150,34 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
       end
     end
 
+    test "keeps fallback summary markup inert in rendered Atom content", %{
+      conn: conn,
+      object: object,
+      user: user
+    } do
+      data =
+        object.data
+        |> Map.put("content", "")
+        |> Map.put("summary", "<script>alert('feed')</script>")
+
+      object
+      |> Ecto.Changeset.change(data: data)
+      |> Pleroma.Repo.update!()
+
+      response =
+        conn
+        |> get("/users/#{user.nickname}/feed.atom")
+        |> response(200)
+
+      assert response =~ "&amp;lt;script&amp;gt;alert(&amp;#39;feed&amp;#39;)&amp;lt;/script&amp;gt;"
+
+      content_values = response |> parse() |> xpath(~x"//entry/content/text()"sl)
+
+      assert Enum.any?(content_values, fn content ->
+               String.starts_with?(content, "&lt;script&gt;alert(&#39;feed&#39;)&lt;/script&gt;")
+             end)
+    end
+
     test "does not expose sensitive attachments as enclosures", %{
       conn: conn,
       object: object,

From 5d8b5a73d2d23dac3b79ff74431bca1b02a7fe70 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Fri, 24 Jul 2026 21:05:16 +0400
Subject: [PATCH 160/163] style(feed): format Atom fallback assertion

---
 test/pleroma/web/feed/user_controller_test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs
index 458f5ec8d..d12904ec0 100644
--- a/test/pleroma/web/feed/user_controller_test.exs
+++ b/test/pleroma/web/feed/user_controller_test.exs
@@ -169,7 +169,8 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
         |> get("/users/#{user.nickname}/feed.atom")
         |> response(200)
 
-      assert response =~ "&amp;lt;script&amp;gt;alert(&amp;#39;feed&amp;#39;)&amp;lt;/script&amp;gt;"
+      assert response =~
+               "&amp;lt;script&amp;gt;alert(&amp;#39;feed&amp;#39;)&amp;lt;/script&amp;gt;"
 
       content_values = response |> parse() |> xpath(~x"//entry/content/text()"sl)
 

From d5f48101b806f973ded8f5cf3276538b269ec3b4 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 25 Jul 2026 00:06:03 +0400
Subject: [PATCH 161/163] fix(media-proxy): safely detect extensionless images

---
 changelog.d/mediaproxy-content-type.fix       |   1 +
 lib/pleroma/reverse_proxy.ex                  | 138 +++++++++--
 .../attachment_type_sniffer.ex                |  59 -----
 .../object_validators/attachment_validator.ex |  21 +-
 .../web/mastodon_api/views/status_view.ex     |   1 +
 .../web/media_proxy/media_proxy_controller.ex |   1 +
 test/pleroma/reverse_proxy_test.exs           | 178 ++++++--------
 .../attachment_type_sniffer_test.exs          | 178 --------------
 .../attachment_validator_test.exs             | 221 ------------------
 .../mastodon_api/views/status_view_test.exs   |  17 ++
 .../media_proxy_controller_test.exs           |   5 +-
 11 files changed, 211 insertions(+), 609 deletions(-)
 create mode 100644 changelog.d/mediaproxy-content-type.fix
 delete mode 100644 lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
 delete mode 100644 test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs

diff --git a/changelog.d/mediaproxy-content-type.fix b/changelog.d/mediaproxy-content-type.fix
new file mode 100644
index 000000000..f36dd6283
--- /dev/null
+++ b/changelog.d/mediaproxy-content-type.fix
@@ -0,0 +1 @@
+Detect image content types for extensionless MediaProxy responses.
diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index 11f041c57..061b2de9b 100644
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -17,6 +17,7 @@ defmodule Pleroma.ReverseProxy do
   @max_read_duration :timer.seconds(30)
   @max_body_length :infinity
   @failed_request_ttl :timer.seconds(60)
+  @sniff_bytes 8 * 1024
   @methods ~w(GET HEAD)
 
   @allowed_mime_types Pleroma.Config.get([Pleroma.Upload, :allowed_mime_types], [])
@@ -63,6 +64,9 @@ defmodule Pleroma.ReverseProxy do
     is always set (overriding any upstream header) so the media can be embedded
     in pages; the filename is derived from the content type
 
+  * `sniff_content_type` (default `false`): detects an image MIME type from the first
+  response chunk when the upstream type is missing or `application/octet-stream`.
+
   * `req_headers`, `resp_headers` additional headers.
 
   * `http`: options for [hackney](https://github.com/benoitc/hackney) or [gun](https://github.com/ninenines/gun).
@@ -71,11 +75,15 @@ defmodule Pleroma.ReverseProxy do
   @default_options [pool: :media]
 
   @inline_content_types [
+    "image/apng",
+    "image/avif",
+    "image/bmp",
     "image/gif",
     "image/jpeg",
     "image/jpg",
     "image/png",
     "image/svg+xml",
+    "image/webp",
     "audio/mpeg",
     "audio/mp3",
     "video/webm",
@@ -94,6 +102,7 @@ defmodule Pleroma.ReverseProxy do
           | {:req_headers, [{String.t(), String.t()}]}
           | {:resp_headers, [{String.t(), String.t()}]}
           | {:inline_content_types, boolean() | list(String.t())}
+          | {:sniff_content_type, boolean()}
           | {:redirect_on_failure, boolean()}
 
   @spec call(Plug.Conn.t(), String.t(), list(option())) :: Plug.Conn.t()
@@ -186,12 +195,14 @@ defmodule Pleroma.ReverseProxy do
   defp response(conn, client, url, status, headers, opts) do
     Logger.debug("#{__MODULE__} #{status} #{url} #{inspect(headers)}")
 
+    {headers, client, prefetched} = maybe_prefetch_for_content_type(headers, client, opts)
+
     result =
       conn
       |> put_resp_headers(build_resp_headers(headers, opts))
       |> streaming_compat
       |> send_chunked(status)
-      |> chunk_reply(client, opts)
+      |> chunk_reply(client, opts, prefetched)
 
     case result do
       {:ok, conn} ->
@@ -211,18 +222,28 @@ defmodule Pleroma.ReverseProxy do
     end
   end
 
-  defp chunk_reply(conn, client, opts) do
+  defp chunk_reply(conn, client, opts, :none) do
     chunk_reply(conn, client, opts, 0, 0)
   end
 
-  defp chunk_reply(conn, client, opts, sent_so_far, duration) do
-    with {:ok, duration} <-
-           check_read_duration(
-             duration,
-             Keyword.get(opts, :max_read_duration, @max_read_duration)
+  defp chunk_reply(conn, _client, _opts, :done), do: {:ok, conn}
+  defp chunk_reply(conn, _client, _opts, {:error, error}), do: {:error, error, conn}
+
+  defp chunk_reply(conn, client, opts, {:ok, data, duration}) do
+    with :ok <-
+           body_size_constraint(
+             byte_size(data),
+             Keyword.get(opts, :max_body_length, @max_body_length)
            ),
-         {:ok, data, client} <- client().stream_body(client),
-         {:ok, duration} <- increase_read_duration(duration),
+         {:ok, conn} <- chunk(conn, data) do
+      chunk_reply(conn, client, opts, byte_size(data), duration)
+    else
+      {:error, error} -> {:error, error, conn}
+    end
+  end
+
+  defp chunk_reply(conn, client, opts, sent_so_far, duration) do
+    with {:ok, data, client, duration} <- read_chunk(client, duration, opts),
          sent_so_far = sent_so_far + byte_size(data),
          :ok <-
            body_size_constraint(
@@ -237,6 +258,66 @@ defmodule Pleroma.ReverseProxy do
     end
   end
 
+  defp read_chunk(client, duration, opts) do
+    with {:ok, timer} <-
+           check_read_duration(
+             duration,
+             Keyword.get(opts, :max_read_duration, @max_read_duration)
+           ),
+         {:ok, data, client} <- client().stream_body(client),
+         {:ok, duration} <- increase_read_duration(timer) do
+      {:ok, data, client, duration}
+    end
+  end
+
+  defp maybe_prefetch_for_content_type(headers, client, opts) do
+    if Keyword.get(opts, :sniff_content_type, false) and generic_content_type?(headers) do
+      case read_chunk(client, 0, opts) do
+        {:ok, data, client, duration} ->
+          {maybe_put_image_content_type(headers, data), client, {:ok, data, duration}}
+
+        :done ->
+          {headers, client, :done}
+
+        {:error, error} ->
+          {headers, client, {:error, error}}
+      end
+    else
+      {headers, client, :none}
+    end
+  end
+
+  defp generic_content_type?(headers) do
+    headers
+    |> get_content_type()
+    |> String.trim()
+    |> String.downcase()
+    |> then(&(&1 in ["", "application/octet-stream"]))
+  end
+
+  defp maybe_put_image_content_type(headers, data) do
+    with false <- data == "",
+         {:ok, %{mime_type: "image/" <> _ = content_type}} <-
+           Majic.perform({:bytes, binary_part(data, 0, min(byte_size(data), @sniff_bytes))},
+             pool: Pleroma.MajicPool
+           ) do
+      [
+        {"content-type", content_type}
+        | Enum.reject(headers, fn {key, _} -> key == "content-type" end)
+      ]
+    else
+      _ -> headers
+    end
+  rescue
+    error ->
+      Logger.debug("#{__MODULE__}: content-type sniffing failed: #{Exception.message(error)}")
+      headers
+  catch
+    kind, reason ->
+      Logger.debug("#{__MODULE__}: content-type sniffing failed: #{kind}: #{inspect(reason)}")
+      headers
+  end
+
   defp head_response(conn, url, code, headers, opts) do
     Logger.debug("#{__MODULE__} #{code} #{url} #{inspect(headers)}")
 
@@ -283,17 +364,34 @@ defmodule Pleroma.ReverseProxy do
     |> Enum.filter(fn {k, _} -> k in @keep_req_headers end)
     |> build_req_range_or_encoding_header(opts)
     |> build_req_user_agent_header(opts)
-    |> Keyword.merge(Keyword.get(opts, :req_headers, []))
+    |> merge_headers(Keyword.get(opts, :req_headers, []))
+    |> maybe_force_identity_encoding(opts)
+  end
+
+  defp merge_headers(headers, extra_headers) do
+    Enum.reduce(extra_headers, headers, fn {key, value}, headers ->
+      List.keystore(headers, String.downcase(key), 0, {String.downcase(key), value})
+    end)
+  end
+
+  defp maybe_force_identity_encoding(headers, opts) do
+    if Keyword.get(opts, :sniff_content_type, false) do
+      List.keystore(headers, "accept-encoding", 0, {"accept-encoding", "identity"})
+    else
+      headers
+    end
   end
 
   # Disable content-encoding if any @range_headers are requested (see #1823).
   defp build_req_range_or_encoding_header(headers, _opts) do
     range? = Enum.any?(headers, fn {header, _} -> Enum.member?(@range_headers, header) end)
 
-    if range? && List.keymember?(headers, "accept-encoding", 0) do
-      List.keydelete(headers, "accept-encoding", 0)
-    else
-      headers
+    cond do
+      range? && List.keymember?(headers, "accept-encoding", 0) ->
+        List.keydelete(headers, "accept-encoding", 0)
+
+      true ->
+        headers
     end
   end
 
@@ -386,7 +484,7 @@ defmodule Pleroma.ReverseProxy do
 
       disposition = "attachment; filename=\"#{name}\""
 
-      List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
+      replace_header(headers, "content-disposition", disposition)
     else
       if opt == true do
         headers
@@ -400,11 +498,15 @@ defmodule Pleroma.ReverseProxy do
             "inline"
           end
 
-        List.keystore(headers, "content-disposition", 0, {"content-disposition", disposition})
+        replace_header(headers, "content-disposition", disposition)
       end
     end
   end
 
+  defp replace_header(headers, key, value) do
+    [{key, value} | Enum.reject(headers, fn {header, _} -> header == key end)]
+  end
+
   defp inline_filename(content_type) do
     case MIME.extensions(content_type) do
       [ext | _] when ext != "" -> "inline.#{ext}"
@@ -443,7 +545,9 @@ defmodule Pleroma.ReverseProxy do
     end
   end
 
-  defp check_read_duration(_, _), do: {:ok, :no_duration_limit, :no_duration_limit}
+  defp check_read_duration(_, _), do: {:ok, :no_duration_limit}
+
+  defp increase_read_duration(:no_duration_limit), do: {:ok, :no_duration_limit}
 
   defp increase_read_duration({previous_duration, started})
        when is_integer(previous_duration) and is_integer(started) do
diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
deleted file mode 100644
index 19215b627..000000000
--- a/lib/pleroma/web/activity_pub/object_validators/attachment_type_sniffer.ex
+++ /dev/null
@@ -1,59 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer do
-  @moduledoc """
-  Best-effort MIME sniffing for remote attachments whose declared type is
-  unusable (missing or `application/octet-stream`).
-
-  Fetches the first chunk of the URL and runs it through libmagic. Only
-  `image/*` results are returned; anything else, or any failure, yields `nil` —
-  so this never reclassifies non-image media and never blocks ingestion. This
-  exists because some remotes (e.g. extensionless Cloudflare Images URLs) ship
-  attachments with no usable `mediaType`, which would otherwise render in the
-  timeline as a clickable link instead of an inline image.
-  """
-
-  alias Pleroma.HTTP
-
-  require Logger
-
-  # libmagic only needs the file header; a few KB is plenty and keeps the
-  # request cheap even when the origin ignores Range.
-  @sniff_bytes 8 * 1024
-  @timeout 5_000
-
-  @spec sniff_image_type(binary() | nil) :: {:ok, binary() | nil}
-  def sniff_image_type(url) when is_binary(url) and url != "" do
-    do_sniff(url)
-  rescue
-    e ->
-      Logger.debug(
-        "Attachment type sniff failed for #{url}: #{Exception.format(:error, e, __STACKTRACE__)}"
-      )
-
-      {:ok, nil}
-  end
-
-  def sniff_image_type(_), do: {:ok, nil}
-
-  defp do_sniff(url) do
-    headers = [{"range", "bytes=0-#{@sniff_bytes - 1}"}]
-    opts = [pool: :media, timeout: @timeout, recv_timeout: @timeout]
-
-    with {:ok, %Tesla.Env{status: status, body: body}} when status in 200..299 <-
-           HTTP.get(url, headers, opts),
-         false <- blank?(body),
-         {:ok, %{mime_type: mime}} <- Majic.perform({:bytes, body}, pool: Pleroma.MajicPool),
-         true <- String.starts_with?(mime, "image/") do
-      {:ok, mime}
-    else
-      _ -> {:ok, nil}
-    end
-  end
-
-  defp blank?(nil), do: true
-  defp blank?(""), do: true
-  defp blank?(_), do: false
-end
diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
index b6e30a438..5ee9e7549 100644
--- a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@ -6,7 +6,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
   use Ecto.Schema
 
   alias Pleroma.EctoType.ActivityPub.ObjectValidators
-  alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer
 
   import Ecto.Changeset
 
@@ -62,27 +61,9 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
   end
 
   def fix_media_type(data) do
-    current = data["mediaType"] || data["mimeType"] || "application/octet-stream"
-
-    resolved =
-      if sniffable?(current) do
-        case AttachmentTypeSniffer.sniff_image_type(data["href"]) do
-          {:ok, mime} when is_binary(mime) -> mime
-          _ -> current
-        end
-      else
-        current
-      end
-
-    Map.put(data, "mediaType", resolved)
+    Map.put_new(data, "mediaType", data["mimeType"] || "application/octet-stream")
   end
 
-  # Only sniff when the declared type carries no real information. Everything
-  # else (including unrecognized-but-present types) is left as the remote sent it.
-  defp sniffable?("application/octet-stream"), do: true
-  defp sniffable?(""), do: true
-  defp sniffable?(_), do: false
-
   defp handle_href(href, mediaType, data) do
     [
       %{
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 6949c5f2d..725dc2ce7 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -620,6 +620,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         String.contains?(media_type, "image") -> "image"
         String.contains?(media_type, "video") -> "video"
         String.contains?(media_type, "audio") -> "audio"
+        attachment["type"] == "Image" -> "image"
         true -> "unknown"
       end
 
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index a0aafc32e..93f692008 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -208,6 +208,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
 
   defp media_proxy_opts do
     Config.get([:media_proxy, :proxy_opts], [])
+    |> Keyword.put_new(:sniff_content_type, true)
   end
 
   defp sandbox(conn, _params) do
diff --git a/test/pleroma/reverse_proxy_test.exs b/test/pleroma/reverse_proxy_test.exs
index 5f75f2a07..ad1d75f33 100644
--- a/test/pleroma/reverse_proxy_test.exs
+++ b/test/pleroma/reverse_proxy_test.exs
@@ -222,6 +222,56 @@ defmodule Pleroma.ReverseProxyTest do
     assert Conn.get_resp_header(conn, "content-type") == ["application/octet-stream"]
   end
 
+  test "sniffs and preserves an image body with a generic content type", %{conn: conn} do
+    body = File.read!("test/fixtures/image.jpg")
+
+    ClientMock
+    |> expect(:request, fn :get, "/extensionless", headers, _, _ ->
+      assert {"accept-encoding", "identity"} in headers
+      {:ok, 200, [{"content-type", "application/octet-stream"}], %{body: body}}
+    end)
+    |> expect(:stream_body, fn %{body: ^body} = client ->
+      {:ok, body, Map.delete(client, :body)}
+    end)
+    |> expect(:stream_body, fn %{} -> :done end)
+
+    conn =
+      ReverseProxy.call(conn, "/extensionless",
+        sniff_content_type: true,
+        max_read_duration: :infinity,
+        req_headers: [{"accept-encoding", "gzip"}]
+      )
+
+    assert conn.resp_body == body
+    assert Conn.get_resp_header(conn, "content-type") == ["image/jpeg"]
+
+    assert Conn.get_resp_header(conn, "content-disposition") == [
+             "inline; filename=\"inline.jpg\""
+           ]
+  end
+
+  test "preserves a generic content type for a non-image body", %{conn: conn} do
+    body = "not an image"
+
+    ClientMock
+    |> expect(:request, fn :get, "/extensionless", _, _, _ ->
+      {:ok, 200, [], %{body: body}}
+    end)
+    |> expect(:stream_body, fn %{body: ^body} = client ->
+      {:ok, body, Map.delete(client, :body)}
+    end)
+    |> expect(:stream_body, fn %{} -> :done end)
+
+    conn = ReverseProxy.call(conn, "/extensionless", sniff_content_type: true)
+
+    assert conn.resp_body == body
+    assert Conn.get_resp_header(conn, "content-type") == ["application/octet-stream"]
+
+    assert Conn.get_resp_header(conn, "content-disposition") == [
+             "attachment; filename=\"extensionless\""
+           ]
+  end
+
   defp headers_mock(_) do
     ClientMock
     |> expect(:request, fn :get, "/headers", headers, _, _ ->
@@ -298,21 +348,21 @@ defmodule Pleroma.ReverseProxyTest do
     end
   end
 
-  defp disposition_headers_mock(headers, url \\ "/disposition") do
+  defp disposition_headers_mock(headers) do
     ClientMock
-    |> expect(:request, fn :get, ^url, _, _, _ ->
-      Registry.register(ClientMock, url, 0)
+    |> expect(:request, fn :get, "/disposition", _, _, _ ->
+      Registry.register(ClientMock, "/disposition", 0)
 
-      {:ok, 200, headers, %{url: url}}
+      {:ok, 200, headers, %{url: "/disposition"}}
     end)
-    |> expect(:stream_body, 2, fn %{url: ^url} = client ->
-      case Registry.lookup(ClientMock, url) do
+    |> expect(:stream_body, 2, fn %{url: "/disposition"} = client ->
+      case Registry.lookup(ClientMock, "/disposition") do
         [{_, 0}] ->
-          Registry.update_value(ClientMock, url, &(&1 + 1))
+          Registry.update_value(ClientMock, "/disposition", &(&1 + 1))
           {:ok, "", client}
 
         [{_, 1}] ->
-          Registry.unregister(ClientMock, url)
+          Registry.unregister(ClientMock, "/disposition")
           :done
       end
     end)
@@ -337,6 +387,7 @@ defmodule Pleroma.ReverseProxyTest do
       disposition_headers_mock([
         {"content-type", "image/png"},
         {"content-disposition", "attachment; filename=\"filename.png\""},
+        {"content-disposition", "attachment; filename=\"duplicate.png\""},
         {"content-length", "0"}
       ])
 
@@ -347,23 +398,6 @@ defmodule Pleroma.ReverseProxyTest do
       refute String.starts_with?(disposition, "attachment")
     end
 
-    test "forces inline based on content type even without a file extension in the url", %{
-      conn: conn
-    } do
-      disposition_headers_mock(
-        [
-          {"content-type", "image/jpeg"},
-          {"content-length", "0"}
-        ],
-        "/original"
-      )
-
-      conn = ReverseProxy.call(conn, "/original")
-
-      [disposition] = Conn.get_resp_header(conn, "content-disposition")
-      assert disposition == "inline; filename=\"inline.jpg\""
-    end
-
     test "with content-disposition header", %{conn: conn} do
       disposition_headers_mock([
         {"content-disposition", "attachment; filename=\"filename.jpg\""},
@@ -390,69 +424,6 @@ defmodule Pleroma.ReverseProxyTest do
       assert {"content-disposition", "attachment; filename=\"upstream.png\""} in conn.resp_headers
     end
 
-    test "with inline_content_types: true does not synthesise inline when upstream is absent", %{
-      conn: conn
-    } do
-      disposition_headers_mock([
-        {"content-type", "image/png"},
-        {"content-length", "0"}
-      ])
-
-      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: true)
-
-      assert Conn.get_resp_header(conn, "content-disposition") == []
-    end
-
-    test "with inline_content_types: false forces attachment for everything", %{
-      conn: conn
-    } do
-      disposition_headers_mock([
-        {"content-type", "image/png"},
-        {"content-disposition", "inline; filename=\"pic.png\""},
-        {"content-length", "0"}
-      ])
-
-      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: false)
-
-      [disposition] = Conn.get_resp_header(conn, "content-disposition")
-      assert String.starts_with?(disposition, "attachment")
-    end
-
-    test "with inline_content_types: false derives attachment filename from the URL basename when no upstream filename", %{
-      conn: conn
-    } do
-      # No content-disposition header: the attachment branch falls back to
-      # attachment_name, which by default comes from MediaProxy.filename/1
-      # (the URL basename).
-      disposition_headers_mock([
-        {"content-type", "image/png"},
-        {"content-length", "0"}
-      ])
-
-      conn = ReverseProxy.call(conn, "/disposition", inline_content_types: false)
-
-      [disposition] = Conn.get_resp_header(conn, "content-disposition")
-      assert disposition == "attachment; filename=\"disposition\""
-    end
-
-    test "with inline_content_types: false honours an explicit attachment_name opt", %{
-      conn: conn
-    } do
-      disposition_headers_mock([
-        {"content-type", "image/png"},
-        {"content-length", "0"}
-      ])
-
-      conn =
-        ReverseProxy.call(conn, "/disposition",
-          inline_content_types: false,
-          attachment_name: "custom.bin"
-        )
-
-      [disposition] = Conn.get_resp_header(conn, "content-disposition")
-      assert disposition == "attachment; filename=\"custom.bin\""
-    end
-
     test "forces bare inline for a whitelisted type with no MIME extension", %{
       conn: conn
     } do
@@ -469,36 +440,17 @@ defmodule Pleroma.ReverseProxyTest do
       assert disposition == "inline"
     end
 
-    test "honours a custom inline_content_types whitelist", %{conn: conn} do
-      # image/bmp is NOT in the default whitelist; with a custom whitelist
-      # that includes it, the proxy should force inline.
+    test "serves modern browser image types inline", %{conn: conn} do
       disposition_headers_mock([
-        {"content-type", "image/bmp"},
-        {"content-disposition", "attachment; filename=\"upstream.bmp\""},
+        {"content-type", "image/webp"},
         {"content-length", "0"}
       ])
 
-      conn =
-        ReverseProxy.call(conn, "/disposition", inline_content_types: ["image/bmp"])
+      conn = ReverseProxy.call(conn, "/disposition")
 
-      [disposition] = Conn.get_resp_header(conn, "content-disposition")
-      assert String.starts_with?(disposition, "inline")
-      assert String.ends_with?(disposition, "inline.bmp\"")
-    end
-
-    test "treats a type outside the whitelist as attachment even on custom whitelist", %{
-      conn: conn
-    } do
-      disposition_headers_mock([
-        {"content-type", "image/png"},
-        {"content-disposition", "attachment; filename=\"filename.png\""},
-        {"content-length", "0"}
-      ])
-
-      conn =
-        ReverseProxy.call(conn, "/disposition", inline_content_types: ["image/bmp"])
-
-      assert {"content-disposition", "attachment; filename=\"filename.png\""} in conn.resp_headers
+      assert Conn.get_resp_header(conn, "content-disposition") == [
+               "inline; filename=\"inline.webp\""
+             ]
     end
   end
 
diff --git a/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs b/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs
deleted file mode 100644
index 52b1b67a1..000000000
--- a/test/pleroma/web/activity_pub/object_validators/attachment_type_sniffer_test.exs
+++ /dev/null
@@ -1,178 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSnifferTest do
-  use Pleroma.DataCase, async: true
-
-  alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentTypeSniffer
-
-  # @sniff_bytes must mirror the value in the module under test; we assert the
-  # Range header that the sniffer sends, so the test should fail loudly if the
-  # constant drifts.
-  @sniff_bytes 8 * 1024
-  @range_header "bytes=0-#{@sniff_bytes - 1}"
-
-  describe "sniff_image_type/1 with a real image body" do
-    test "returns image/jpeg for a JPEG body" do
-      url = "https://example.com/media/image.jpg"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: jpeg}
-      end)
-
-      assert {:ok, "image/jpeg"} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns image/png for a PNG body" do
-      url = "https://example.com/media/image.png"
-      png = File.read!("test/fixtures/image.png")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: png}
-      end)
-
-      assert {:ok, "image/png"} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns image/gif for a GIF body" do
-      url = "https://example.com/media/image.gif"
-      gif = File.read!("test/fixtures/image.gif")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: gif}
-      end)
-
-      assert {:ok, "image/gif"} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-  end
-
-  describe "sniff_image_type/1 sends a ranged request" do
-    test "sends a Range header asking for the first chunk" do
-      url = "https://example.com/media/ranged"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn
-        %{method: :get, url: ^url, headers: headers} ->
-          headers_map = Enum.into(headers, %{})
-          assert headers_map["range"] == @range_header
-
-          %Tesla.Env{status: 200, body: jpeg}
-
-        %{method: :get, url: ^url} ->
-          # If the sniffer did not send the Range header, fail explicitly.
-          flunk("expected Range header to be sent with the request")
-      end)
-
-      assert {:ok, "image/jpeg"} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-  end
-
-  describe "sniff_image_type/1 with a non-image body" do
-    test "returns nil for plain text" do
-      url = "https://example.com/media/note.txt"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: "just some plain text, not an image at all"}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil for an HTML body" do
-      url = "https://example.com/page"
-      html = File.read!("test/fixtures/rel_me_anchor.html")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: html}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil for an empty body" do
-      url = "https://example.com/media/empty"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: ""}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil for a nil body" do
-      url = "https://example.com/media/nil-body"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: nil}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-  end
-
-  describe "sniff_image_type/1 on HTTP failure" do
-    test "returns nil on a 404" do
-      url = "https://example.com/media/missing"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 404, body: ""}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil on a 500" do
-      url = "https://example.com/media/oops"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 500, body: "server error"}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil on a 3xx (not in 200..299)" do
-      url = "https://example.com/media/redirect"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 302, body: ""}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil on a transport-level error" do
-      url = "https://example.com/media/econnrefused"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        {:error, :econnrefused}
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-
-    test "returns nil when the HTTP adapter raises" do
-      url = "https://example.com/media/raises"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        raise "boom"
-      end)
-
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(url)
-    end
-  end
-
-  describe "sniff_image_type/1 guard clauses" do
-    test "returns nil for nil input without making a request" do
-      # No Tesla mock is configured; if a request were made, Tesla.Mock would
-      # raise and fail the test.
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type(nil)
-    end
-
-    test "returns nil for an empty-string URL without making a request" do
-      assert {:ok, nil} = AttachmentTypeSniffer.sniff_image_type("")
-    end
-  end
-end
diff --git a/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
index 870ad90cc..744ae8704 100644
--- a/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
+++ b/test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
@@ -215,226 +215,5 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidatorTest do
         AttachmentValidator.cast_and_validate(attachment)
         |> Ecto.Changeset.apply_action(:insert)
     end
-
-    test "sniffs image/jpeg for octet-stream attachments whose body is an image" do
-      url = "https://example.com/media/no-extension/original"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: jpeg}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "application/octet-stream",
-        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{href: ^url, mediaType: "image/jpeg"}] = attachment.url
-    end
-
-    test "sniffs image/jpeg for attachments with a missing mediaType" do
-      url = "https://example.com/media/missing-type/original"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: jpeg}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "url" => [%{"type" => "Link", "href" => url}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{href: ^url, mediaType: "image/jpeg"}] = attachment.url
-    end
-
-    test "leaves non-image octet-stream attachments as octet-stream" do
-      url = "https://example.com/media/some-document"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: "just some plain text, not an image at all"}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "application/octet-stream",
-        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{mediaType: "application/octet-stream"}] = attachment.url
-    end
-
-    test "does not sniff when the remote already provided a real mediaType" do
-      # No Tesla mock is set up: if the validator tried to fetch, Tesla.Mock
-      # would raise and fail the test. A real image type must be kept as-is.
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "image/png",
-        "url" => [
-          %{"type" => "Link", "href" => "https://example.com/x", "mediaType" => "image/png"}
-        ]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{mediaType: "image/png"}] = attachment.url
-    end
-  end
-
-  describe "fix_media_type fallbacks and sniffing" do
-    test "uses mimeType as a fallback when mediaType is absent (real type, not sniffed)" do
-      # No Tesla mock: if the validator tried to fetch, the test would fail.
-      # A real image type coming from mimeType must be preserved as-is on the
-      # outer attachment and on the synthesised url entry (string url form).
-      attachment = %{
-        "type" => "Document",
-        "mimeType" => "image/png",
-        "url" => "https://example.com/x.png"
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert attachment.mediaType == "image/png"
-      assert [%{mediaType: "image/png"}] = attachment.url
-    end
-
-    test "prefers mediaType over mimeType when both are present" do
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "image/gif",
-        "mimeType" => "image/png",
-        "url" => "https://example.com/x.gif"
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert attachment.mediaType == "image/gif"
-      assert [%{mediaType: "image/gif"}] = attachment.url
-    end
-
-    test "sniffs when the url entry's mediaType is application/octet-stream and the body is an image" do
-      # The outer attachment mediaType is not sniffed (no top-level href); only
-      # the url entry is. We assert only on the url entry.
-      url = "https://example.com/media/mime-type-octet"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: jpeg}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "application/octet-stream",
-        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{mediaType: "image/jpeg"}] = attachment.url
-    end
-
-    test "sniffs when mediaType is the empty string and the body is an image" do
-      url = "https://example.com/media/empty-mediatype"
-      png = File.read!("test/fixtures/image.png")
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 200, body: png}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "",
-        "url" => [%{"type" => "Link", "href" => url, "mediaType" => ""}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{mediaType: "image/png"}] = attachment.url
-    end
-
-    test "falls back to the declared type when the sniffer HTTP request fails" do
-      url = "https://example.com/media/sniff-404"
-
-      Tesla.Mock.mock(fn %{method: :get, url: ^url} ->
-        %Tesla.Env{status: 404, body: ""}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "application/octet-stream",
-        "url" => [%{"type" => "Link", "href" => url, "mediaType" => "application/octet-stream"}]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [%{mediaType: "application/octet-stream"}] = attachment.url
-    end
-
-    test "sniffs each url entry independently" do
-      jpeg_url = "https://example.com/media/a"
-      octet_url = "https://example.com/media/b"
-      jpeg = File.read!("test/fixtures/image.jpg")
-
-      Tesla.Mock.mock(fn
-        %{method: :get, url: ^jpeg_url} ->
-          %Tesla.Env{status: 200, body: jpeg}
-
-        %{method: :get, url: ^octet_url} ->
-          %Tesla.Env{status: 200, body: "definitely not an image"}
-      end)
-
-      attachment = %{
-        "type" => "Document",
-        "mediaType" => "application/octet-stream",
-        "url" => [
-          %{"type" => "Link", "href" => jpeg_url, "mediaType" => "application/octet-stream"},
-          %{"type" => "Link", "href" => octet_url, "mediaType" => "application/octet-stream"}
-        ]
-      }
-
-      {:ok, attachment} =
-        attachment
-        |> AttachmentValidator.cast_and_validate()
-        |> Ecto.Changeset.apply_action(:insert)
-
-      assert [
-               %{href: ^jpeg_url, mediaType: "image/jpeg"},
-               %{href: ^octet_url, mediaType: "application/octet-stream"}
-             ] = attachment.url
-    end
   end
 end
diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs
index 76123cd0f..faeca050e 100644
--- a/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@ -668,6 +668,23 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       assert expected == StatusView.render("attachment.json", %{attachment: object})
       assert_schema(expected, "Attachment", api_spec)
     end
+
+    test "uses the ActivityStreams image type when the MIME type is generic" do
+      object = %{
+        "type" => "Image",
+        "url" => [
+          %{
+            "mediaType" => "application/octet-stream",
+            "href" => "https://example.com/extensionless"
+          }
+        ]
+      }
+
+      attachment = StatusView.render("attachment.json", %{attachment: object})
+
+      assert attachment.type == "image"
+      assert attachment.pleroma.mime_type == "application/octet-stream"
+    end
   end
 
   test "put the url advertised in the Activity in to the url attribute" do
diff --git a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
index f7e52483c..800159c21 100644
--- a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
+++ b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
@@ -71,7 +71,10 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
 
     test "it performs ReverseProxy.call with valid signature", %{conn: conn, url: url} do
       with_mock Pleroma.ReverseProxy,
-        call: fn _conn, _url, _opts -> %Conn{status: :success} end do
+        call: fn _conn, _url, opts ->
+          assert opts[:sniff_content_type]
+          %Conn{status: :success}
+        end do
         assert %Conn{status: :success} = get(conn, url)
       end
     end

From 5ddd337045f6999ad884210055ed4492b63181a7 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 25 Jul 2026 09:26:26 +0400
Subject: [PATCH 162/163] chore: remove development log

---
 DEVLOG.md | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 DEVLOG.md

diff --git a/DEVLOG.md b/DEVLOG.md
deleted file mode 100644
index 1e5d2b63d..000000000
--- a/DEVLOG.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Development Log
-
-## Gun pool validation
-
-- The previous unique origin registry forced concurrent HTTP/1 requests onto one connection.
-- Pool identity omitted proxy routes and credentials, allowing incompatible routes to reuse a connection.
-- Gun 2.2 CONNECT requests require their tunnel stream reference on subsequent requests; Tesla's bundled Gun adapter does not preserve it.
-- CONNECT and SOCKS5 setup returned before the destination tunnel was ready and did not pass authentication credentials.
-- The existing global `max_connections` limit and idle reclaimer bound HTTP/1 sibling and many-host connection growth.
-- SOCKS4 is not supported by Gun 2.2 and is now rejected explicitly by the Gun adapter.
-- Gun reports a stale stream error to the process that calls `cancel/2`; pool workers must consume that reply so one HTTP/2 cancellation cannot terminate other multiplexed requests.
-- Streamed uploads must be registered before body enumeration and cancelled if enumeration exits, throws, or raises, otherwise a partial HTTP/1 request can remain reusable.
-- Gun 2.4 bounds HTTP/1 response header and trailer buffers, rejects invalid request headers by default, and fixes cross-origin HTTP/2 push handling; Gun 2.4.1 includes Cowlib 2.17.1 to repair HTTP/2 HPACK decoding.
-- Plain HTTP proxy requests must use absolute-form request targets; CONNECT is reserved for HTTPS tunnels because forwarding proxies commonly reject CONNECT to port 80.

From 99befcaf1bf2326d2196e5640a8834009a720290 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Sat, 25 Jul 2026 10:51:09 +0400
Subject: [PATCH 163/163] fix(activitypub): deduplicate account favourites

---
 lib/pleroma/web/activity_pub/activity_pub.ex  | 16 +++++++
 ...00_add_activity_favorites_lookup_index.exs | 20 ++++++++
 .../controllers/account_controller_test.exs   | 46 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 priv/repo/migrations/20260725000000_add_activity_favorites_lookup_index.exs

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a44c5b1ff..10d3fe063 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1025,6 +1025,20 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   defp restrict_assigned_account(query, _), do: query
 
   defp restrict_favorited_by(query, %{favorited_by: ap_id}) do
+    newer_favorite =
+      from(newer_favorite in Activity,
+        where: newer_favorite.actor == ^ap_id,
+        where: newer_favorite.id > parent_as(:favorited_activity).id,
+        where: fragment("?->>'type' = ?", newer_favorite.data, "Like"),
+        where:
+          fragment(
+            "associated_object_id(?) = associated_object_id(?)",
+            newer_favorite.data,
+            parent_as(:favorited_activity).data
+          ),
+        select: 1
+      )
+
     from(
       [activity, object: object] in query,
       join: favorited_activity in Activity,
@@ -1033,6 +1047,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         favorited_activity.actor == ^ap_id and
           fragment("?->>'type' = ?", favorited_activity.data, "Like") and
           fragment("associated_object_id(?) = (?)->>'id'", favorited_activity.data, object.data),
+      where: fragment("(?)->'likes' \\? (?)", object.data, ^ap_id),
+      where: not exists(subquery(newer_favorite)),
       select: %Activity{activity | pagination_id: favorited_activity.id}
     )
   end
diff --git a/priv/repo/migrations/20260725000000_add_activity_favorites_lookup_index.exs b/priv/repo/migrations/20260725000000_add_activity_favorites_lookup_index.exs
new file mode 100644
index 000000000..34bc04555
--- /dev/null
+++ b/priv/repo/migrations/20260725000000_add_activity_favorites_lookup_index.exs
@@ -0,0 +1,20 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.AddActivityFavoritesLookupIndex do
+  use Ecto.Migration
+
+  @disable_ddl_transaction true
+  @disable_migration_lock true
+
+  def change do
+    create_if_not_exists(
+      index(:activities, [:actor, "associated_object_id(data)", "id DESC"],
+        name: :activities_favorites_lookup_index,
+        where: "data->>'type' = 'Like'",
+        concurrently: true
+      )
+    )
+  end
+end
diff --git a/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
index e93b277cc..bdf9f03c1 100644
--- a/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
@@ -5,9 +5,12 @@
 defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
   use Pleroma.Web.ConnCase
 
+  alias Pleroma.Activity
   alias Pleroma.Config
+  alias Pleroma.Repo
   alias Pleroma.Tests.ObanHelpers
   alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
 
   import Pleroma.Factory
@@ -127,6 +130,49 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
       assert Enum.map(response, & &1["id"]) == [second_post.id, first_post.id, third_post.id]
     end
 
+    test "returns a status once when duplicate favorite activities exist", %{
+      conn: conn,
+      user: user
+    } do
+      older_activity = insert(:note_activity)
+      {:ok, _} = CommonAPI.favorite(older_activity.id, user)
+
+      activity = insert(:note_activity)
+      {:ok, favorite} = CommonAPI.favorite(activity.id, user)
+
+      duplicate =
+        Repo.insert!(%Activity{
+          actor: favorite.actor,
+          data: Map.put(favorite.data, "id", Utils.generate_activity_id()),
+          local: favorite.local,
+          recipients: favorite.recipients
+        })
+
+      conn = get(conn, "/api/v1/pleroma/accounts/#{user.id}/favourites?limit=1")
+      response = json_response_and_validate_schema(conn, :ok)
+
+      assert Enum.map(response, & &1["id"]) == [activity.id]
+      assert [link_header] = get_resp_header(conn, "link")
+      assert link_header =~ "max_id=#{duplicate.id}"
+      assert link_header =~ "min_id=#{duplicate.id}"
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/accounts/#{user.id}/favourites?max_id=#{duplicate.id}&limit=1")
+        |> json_response_and_validate_schema(:ok)
+
+      assert Enum.map(response, & &1["id"]) == [older_activity.id]
+
+      {:ok, _} = CommonAPI.unfavorite(activity.id, user)
+
+      response =
+        conn
+        |> get("/api/v1/pleroma/accounts/#{user.id}/favourites")
+        |> json_response_and_validate_schema(:ok)
+
+      assert Enum.map(response, & &1["id"]) == [older_activity.id]
+    end
+
     test "returns favorited DM only when user is logged in and he is one of recipients", %{
       current_user: current_user,
       user: user