pleroma

commit: ee05abe052a0e56faf67711362b270893a4ab703
parent d91e9cee04f2e4cb809037e4fcfebc295994b563
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Sat, 26 Feb 2022 16:24:49 +0000

Merge branch 'revert/notice-routes' into 'develop'

Revert notice compatibility routes merge request

See merge request pleroma/pleroma!3576
Diffstat:
M
CHANGELOG.md
1
-
M
lib/pleroma/web/router.ex
5
-----
M
lib/pleroma/web/static_fe/static_fe_controller.ex
9
---------
M
test/pleroma/web/o_status/o_status_controller_test.exs
50
--------------------------------------------------
M
test/pleroma/web/plugs/frontend_static_plug_test.exs
2
--

5 files changed, 0 insertions(+), 67 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,7 +33,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
 - Handle Reject for already-accepted Follows properly
-- Display OpenGraph data on alternative notice routes.
 - Fix replies count for remote replies
 - Fixed hashtags disappearing from the end of lines when Markdown is enabled
 - ChatAPI: Add link headers
diff --git 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
@@ -167,15 +167,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEController 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
@@ -343,54 +343,4 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
       |> 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
@@ -86,8 +86,6 @@ defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
       "objects",
       "activities",
       "notice",
-      "@:nickname",
-      ":nickname",
       "users",
       "tags",
       "mailer",