From 2842684e8150ffdbe433cb3dc03750a6fdf26c94 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 26 Dec 2021 11:02:51 -0700
Subject: [PATCH] Revert "Merge branch 'notice-routes' into 'develop'"

---
 lib/pleroma/web/router.ex                     |  5 --
 .../web/static_fe/static_fe_controller.ex     |  9 ----
 .../web/o_status/o_status_controller_test.exs | 50 -------------------
 .../web/plugs/frontend_static_plug_test.exs   |  2 -
 4 files changed, 66 deletions(-)

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 7a3126f1b..774793caf 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -669,11 +669,6 @@ defmodule Pleroma.Web.Router do
     get("/activities/:uuid", OStatus.OStatusController, :activity)
     get("/notice/:id", OStatus.OStatusController, :notice)
 
-    # Notice compatibility routes for other frontends
-    get("/@:nickname/:id", OStatus.OStatusController, :notice)
-    get("/@:nickname/posts/:id", OStatus.OStatusController, :notice)
-    get("/:nickname/status/:id", OStatus.OStatusController, :notice)
-
     # Mastodon compatibility routes
     get("/users/:nickname/statuses/:id", OStatus.OStatusController, :object)
     get("/users/:nickname/statuses/:id/activity", OStatus.OStatusController, :activity)
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index b20a3689c..97c41c6f9 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -167,15 +167,6 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) do
   defp assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
     do: assign(conn, :notice_id, notice_id)
 
-  defp assign_id(%{path_info: ["@" <> _nickname, notice_id]} = conn, _opts),
-    do: assign(conn, :notice_id, notice_id)
-
-  defp assign_id(%{path_info: ["@" <> _nickname, "posts", notice_id]} = conn, _opts),
-    do: assign(conn, :notice_id, notice_id)
-
-  defp assign_id(%{path_info: [_nickname, "status", notice_id]} = conn, _opts),
-    do: assign(conn, :notice_id, notice_id)
-
   defp assign_id(%{path_info: ["users", user_id]} = conn, _opts),
     do: assign(conn, :username_or_id, user_id)
 
diff --git a/test/pleroma/web/o_status/o_status_controller_test.exs b/test/pleroma/web/o_status/o_status_controller_test.exs
index 5abbcfbdc..36e581f5e 100644
--- a/test/pleroma/web/o_status/o_status_controller_test.exs
+++ b/test/pleroma/web/o_status/o_status_controller_test.exs
@@ -343,54 +343,4 @@ test "does not require authentication on non-federating instances", %{
       |> response(200)
     end
   end
-
-  describe "notice compatibility routes" do
-    test "Soapbox FE", %{conn: conn} do
-      user = insert(:user)
-      note_activity = insert(:note_activity, user: user)
-
-      resp =
-        conn
-        |> put_req_header("accept", "text/html")
-        |> get("/@#{user.nickname}/posts/#{note_activity.id}")
-        |> response(200)
-
-      expected =
-        "<meta content=\"#{Endpoint.url()}/notice/#{note_activity.id}\" property=\"og:url\">"
-
-      assert resp =~ expected
-    end
-
-    test "Mastodon", %{conn: conn} do
-      user = insert(:user)
-      note_activity = insert(:note_activity, user: user)
-
-      resp =
-        conn
-        |> put_req_header("accept", "text/html")
-        |> get("/@#{user.nickname}/#{note_activity.id}")
-        |> response(200)
-
-      expected =
-        "<meta content=\"#{Endpoint.url()}/notice/#{note_activity.id}\" property=\"og:url\">"
-
-      assert resp =~ expected
-    end
-
-    test "Twitter", %{conn: conn} do
-      user = insert(:user)
-      note_activity = insert(:note_activity, user: user)
-
-      resp =
-        conn
-        |> put_req_header("accept", "text/html")
-        |> get("/#{user.nickname}/status/#{note_activity.id}")
-        |> response(200)
-
-      expected =
-        "<meta content=\"#{Endpoint.url()}/notice/#{note_activity.id}\" property=\"og:url\">"
-
-      assert resp =~ expected
-    end
-  end
 end
diff --git a/test/pleroma/web/plugs/frontend_static_plug_test.exs b/test/pleroma/web/plugs/frontend_static_plug_test.exs
index a91e24c49..ab31c5f22 100644
--- a/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@ -86,8 +86,6 @@ test "api routes are detected correctly" do
       "objects",
       "activities",
       "notice",
-      "@:nickname",
-      ":nickname",
       "users",
       "tags",
       "mailer",