From 699a7e57e82e71b9e706ded28185ee490a903c6d Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Mon, 16 Feb 2026 17:04:00 +0100
Subject: [PATCH] Fix LiveDashboard redirect not working when user added a path
 segment

/phoenix/live_dashboard -> /pleroma/live_dashboard would work

/phoenix/live_dashboard/ecto_stats -> /pleroma/live_dashboard/ecto_stats
would not work and instead reply with FE.
---
 changelog.d/live-dashboard-redirect.fix         |  1 +
 lib/pleroma/web/fallback/redirect_controller.ex | 13 +++++++++++--
 lib/pleroma/web/router.ex                       |  2 +-
 test/pleroma/web/fallback_test.exs              |  6 ++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/live-dashboard-redirect.fix

diff --git a/changelog.d/live-dashboard-redirect.fix b/changelog.d/live-dashboard-redirect.fix
new file mode 100644
index 000000000..10588d89e
--- /dev/null
+++ b/changelog.d/live-dashboard-redirect.fix
@@ -0,0 +1 @@
+Fix /phoenix/live_dashboard redirect not working when user added a path segment
diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex
index d75a95fb3..c7f80ad77 100644
--- a/lib/pleroma/web/fallback/redirect_controller.ex
+++ b/lib/pleroma/web/fallback/redirect_controller.ex
@@ -29,9 +29,18 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     )
   end
 
-  def live_dashboard(conn, _params) do
+  def live_dashboard(conn, %{"path" => path}) do
+    query_params = conn.query_string
+
+    redirect_path =
+      if query_params == "" do
+        "/pleroma/live_dashboard/#{path}"
+      else
+        "/pleroma/live_dashboard/#{path}?#{query_params}"
+      end
+
     conn
-    |> redirect(to: "/pleroma/live_dashboard")
+    |> redirect(to: redirect_path)
   end
 
   def redirector(conn, _params, code \\ 200) do
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 20ac1c67b..3ef60c2d9 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -1088,7 +1088,7 @@ defmodule Pleroma.Web.Router do
     get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
     match(:*, "/api/pleroma/*path", LegacyPleromaApiRerouterPlug, [])
     get("/api/*path", RedirectController, :api_not_implemented)
-    get("/phoenix/live_dashboard", RedirectController, :live_dashboard)
+    get("/phoenix/live_dashboard/*path", RedirectController, :live_dashboard)
     get("/*path", RedirectController, :redirector_with_preload)
 
     options("/*path", RedirectController, :empty)
diff --git a/test/pleroma/web/fallback_test.exs b/test/pleroma/web/fallback_test.exs
index 6d0ba3d2a..bc3052959 100644
--- a/test/pleroma/web/fallback_test.exs
+++ b/test/pleroma/web/fallback_test.exs
@@ -79,6 +79,12 @@ defmodule Pleroma.Web.FallbackTest do
 
   test "GET /phoenix/live_dashboard -> /pleroma/live_dashboard", %{conn: conn} do
     assert redirected_to(get(conn, "/phoenix/live_dashboard")) =~ "/pleroma/live_dashboard"
+    assert redirected_to(get(conn, "/phoenix/live_dashboard/")) =~ "/pleroma/live_dashboard/"
+  end
+
+  test "GET /phoenix/live_dashboard/* -> /pleroma/live_dashboard/*", %{conn: conn} do
+    assert redirected_to(get(conn, "/phoenix/live_dashboard/ecto_stats?nav=diagnose")) =~
+             "/pleroma/live_dashboard/ecto_stats?nav=diagnose"
   end
 
   test "OPTIONS /*path", %{conn: conn} do