diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-26 16:24:49 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-26 16:24:49 +0000 |
| commit | ee05abe052a0e56faf67711362b270893a4ab703 (patch) | |
| tree | 51b77ccd05cdb5ead27f319335e3a7bd7af42373 /lib | |
| parent | d91e9cee04f2e4cb809037e4fcfebc295994b563 (diff) | |
| parent | dafcf896d9eadd4df5fb84545d913de355e91b29 (diff) | |
| download | pleroma-ee05abe052a0e56faf67711362b270893a4ab703.tar.gz pleroma-ee05abe052a0e56faf67711362b270893a4ab703.zip | |
Merge branch 'revert/notice-routes' into 'develop'
Revert notice compatibility routes merge request
See merge request pleroma/pleroma!3576
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/static_fe/static_fe_controller.ex | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 26706a6b8..9198d280b 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 827c0a384..50f0927a3 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 @@ 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) |