[#1234] Undone reordering-related changes in router.ex.

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6e80efec49fe8fce1b7eda54451782263085ff4e..8448a00a18eda29a3595561e0cb0d3f08bd56435 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -131,11 +131,6 @@ defmodule Pleroma.Web.Router do
   scope "/api/pleroma/admin", Pleroma.Web.AdminAPI do
     pipe_through(:admin_api)
 
-    get("/reports", AdminAPIController, :list_reports)
-    get("/reports/:id", AdminAPIController, :report_show)
-    put("/reports/:id", AdminAPIController, :report_update_state)
-    post("/reports/:id/respond", AdminAPIController, :report_respond)
-
     post("/users/follow", AdminAPIController, :user_follow)
     post("/users/unfollow", AdminAPIController, :user_unfollow)
 
@@ -169,6 +164,15 @@ defmodule Pleroma.Web.Router do
 
     get("/users", AdminAPIController, :list_users)
     get("/users/:nickname", AdminAPIController, :user_show)
+    get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
+
+    get("/reports", AdminAPIController, :list_reports)
+    get("/reports/:id", AdminAPIController, :report_show)
+    put("/reports/:id", AdminAPIController, :report_update_state)
+    post("/reports/:id/respond", AdminAPIController, :report_respond)
+
+    put("/statuses/:id", AdminAPIController, :status_update)
+    delete("/statuses/:id", AdminAPIController, :status_delete)
 
     get("/config", AdminAPIController, :config_show)
     post("/config", AdminAPIController, :config_update)
@@ -176,10 +180,6 @@ defmodule Pleroma.Web.Router do
     get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)
 
     get("/moderation_log", AdminAPIController, :list_log)
-
-    get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
-    put("/statuses/:id", AdminAPIController, :status_update)
-    delete("/statuses/:id", AdminAPIController, :status_delete)
   end
 
   scope "/", Pleroma.Web.TwitterAPI do
@@ -229,6 +229,7 @@ defmodule Pleroma.Web.Router do
 
     get("/conversations/:id/statuses", PleromaAPIController, :conversation_statuses)
     get("/conversations/:id", PleromaAPIController, :conversation)
+
     patch("/conversations/:id", PleromaAPIController, :update_conversation)
     post("/notifications/read", PleromaAPIController, :read_notification)
   end
@@ -236,14 +237,23 @@ defmodule Pleroma.Web.Router do
   scope "/api/v1", Pleroma.Web.MastodonAPI do
     pipe_through(:authenticated_api)
 
+    get("/accounts/verify_credentials", MastodonAPIController, :verify_credentials)
+
+    get("/accounts/relationships", MastodonAPIController, :relationships)
+
+    get("/accounts/:id/lists", MastodonAPIController, :account_lists)
+    get("/accounts/:id/identity_proofs", MastodonAPIController, :empty_array)
+
+    get("/follow_requests", MastodonAPIController, :follow_requests)
     get("/blocks", MastodonAPIController, :blocks)
     get("/mutes", MastodonAPIController, :mutes)
-    get("/domain_blocks", MastodonAPIController, :domain_blocks)
 
-    get("/accounts/:id/lists", MastodonAPIController, :account_lists)
-    get("/lists", ListController, :index)
-    get("/lists/:id", ListController, :show)
-    get("/lists/:id/accounts", ListController, :list_accounts)
+    get("/timelines/home", MastodonAPIController, :home_timeline)
+    get("/timelines/direct", MastodonAPIController, :dm_timeline)
+
+    get("/favourites", MastodonAPIController, :favourites)
+    # Note: not present in Mastodon: bookmarks
+    get("/bookmarks", MastodonAPIController, :bookmarks)
 
     post("/notifications/clear", MastodonAPIController, :clear_notifications)
     post("/notifications/dismiss", MastodonAPIController, :dismiss_notification)
@@ -256,75 +266,71 @@ defmodule Pleroma.Web.Router do
       :destroy_multiple_notifications
     )
 
-    # Note: not present in Mastodon
-    get("/bookmarks", MastodonAPIController, :bookmarks)
-
-    get("/accounts/:id/identity_proofs", MastodonAPIController, :empty_array)
-
-    get("/favourites", MastodonAPIController, :favourites)
-
-    get("/accounts/relationships", MastodonAPIController, :relationships)
-
-    get("/accounts/verify_credentials", MastodonAPIController, :verify_credentials)
-
-    get("/timelines/home", MastodonAPIController, :home_timeline)
-    get("/timelines/direct", MastodonAPIController, :dm_timeline)
-
-    get("/suggestions", MastodonAPIController, :suggestions)
     get("/scheduled_statuses", MastodonAPIController, :scheduled_statuses)
     get("/scheduled_statuses/:id", MastodonAPIController, :show_scheduled_status)
-    get("/follow_requests", MastodonAPIController, :follow_requests)
-    get("/filters", MastodonAPIController, :get_filters)
-    get("/endorsements", MastodonAPIController, :endorsements)
-    get("/conversations", MastodonAPIController, :conversations)
-    post("/conversations/:id/read", MastodonAPIController, :conversation_read)
 
-    delete("/lists/:id", ListController, :delete)
-    post("/lists", ListController, :create)
-    put("/lists/:id", ListController, :update)
+    get("/lists", ListController, :index)
+    get("/lists/:id", ListController, :show)
+    get("/lists/:id/accounts", ListController, :list_accounts)
 
-    post("/lists/:id/accounts", ListController, :add_to_list)
-    delete("/lists/:id/accounts", ListController, :remove_from_list)
+    get("/domain_blocks", MastodonAPIController, :domain_blocks)
 
-    post("/reports", MastodonAPIController, :create_report)
+    get("/filters", MastodonAPIController, :get_filters)
 
-    patch("/pleroma/accounts/update_avatar", MastodonAPIController, :update_avatar)
-    patch("/pleroma/accounts/update_banner", MastodonAPIController, :update_banner)
-    patch("/pleroma/accounts/update_background", MastodonAPIController, :update_background)
+    get("/suggestions", MastodonAPIController, :suggestions)
 
-    get("/pleroma/mascot", MastodonAPIController, :get_mascot)
-    put("/pleroma/mascot", MastodonAPIController, :set_mascot)
+    get("/conversations", MastodonAPIController, :conversations)
+    post("/conversations/:id/read", MastodonAPIController, :conversation_read)
 
-    post("/media", MastodonAPIController, :upload)
-    put("/media/:id", MastodonAPIController, :update_media)
+    get("/endorsements", MastodonAPIController, :endorsements)
 
     patch("/accounts/update_credentials", MastodonAPIController, :update_credentials)
 
-    post("/polls/:id/votes", MastodonAPIController, :poll_vote)
+    post("/statuses", MastodonAPIController, :post_status)
+    delete("/statuses/:id", MastodonAPIController, :delete_status)
 
     post("/statuses/:id/reblog", MastodonAPIController, :reblog_status)
     post("/statuses/:id/unreblog", MastodonAPIController, :unreblog_status)
-
+    post("/statuses/:id/favourite", MastodonAPIController, :fav_status)
+    post("/statuses/:id/unfavourite", MastodonAPIController, :unfav_status)
     post("/statuses/:id/pin", MastodonAPIController, :pin_status)
     post("/statuses/:id/unpin", MastodonAPIController, :unpin_status)
-
+    # Note: not present in Mastodon: bookmark
+    post("/statuses/:id/bookmark", MastodonAPIController, :bookmark_status)
+    # Note: not present in Mastodon: unbookmark
+    post("/statuses/:id/unbookmark", MastodonAPIController, :unbookmark_status)
     post("/statuses/:id/mute", MastodonAPIController, :mute_conversation)
     post("/statuses/:id/unmute", MastodonAPIController, :unmute_conversation)
 
-    post("/statuses/:id/favourite", MastodonAPIController, :fav_status)
-    post("/statuses/:id/unfavourite", MastodonAPIController, :unfav_status)
-
-    post("/statuses", MastodonAPIController, :post_status)
-    delete("/statuses/:id", MastodonAPIController, :delete_status)
-
     put("/scheduled_statuses/:id", MastodonAPIController, :update_scheduled_status)
     delete("/scheduled_statuses/:id", MastodonAPIController, :delete_scheduled_status)
 
+    post("/polls/:id/votes", MastodonAPIController, :poll_vote)
+
+    post("/media", MastodonAPIController, :upload)
+    put("/media/:id", MastodonAPIController, :update_media)
+
+    delete("/lists/:id", ListController, :delete)
+    post("/lists", ListController, :create)
+    put("/lists/:id", ListController, :update)
+
+    post("/lists/:id/accounts", ListController, :add_to_list)
+    delete("/lists/:id/accounts", ListController, :remove_from_list)
+
     post("/filters", MastodonAPIController, :create_filter)
     get("/filters/:id", MastodonAPIController, :get_filter)
     put("/filters/:id", MastodonAPIController, :update_filter)
     delete("/filters/:id", MastodonAPIController, :delete_filter)
 
+    patch("/pleroma/accounts/update_avatar", MastodonAPIController, :update_avatar)
+    patch("/pleroma/accounts/update_banner", MastodonAPIController, :update_banner)
+    patch("/pleroma/accounts/update_background", MastodonAPIController, :update_background)
+
+    get("/pleroma/mascot", MastodonAPIController, :get_mascot)
+    put("/pleroma/mascot", MastodonAPIController, :set_mascot)
+
+    post("/reports", MastodonAPIController, :create_report)
+
     post("/follows", MastodonAPIController, :follow)
     post("/accounts/:id/follow", MastodonAPIController, :follow)
 
@@ -347,10 +353,6 @@ defmodule Pleroma.Web.Router do
     get("/push/subscription", SubscriptionController, :get)
     put("/push/subscription", SubscriptionController, :update)
     delete("/push/subscription", SubscriptionController, :delete)
-
-    # Note: not present in Mastodon: bookmark, unbookmark
-    post("/statuses/:id/bookmark", MastodonAPIController, :bookmark_status)
-    post("/statuses/:id/unbookmark", MastodonAPIController, :unbookmark_status)
   end
 
   scope "/api/web", Pleroma.Web.MastodonAPI do
@@ -362,46 +364,47 @@ defmodule Pleroma.Web.Router do
   scope "/api/v1", Pleroma.Web.MastodonAPI do
     pipe_through(:api)
 
+    post("/accounts", MastodonAPIController, :account_register)
+
     get("/instance", MastodonAPIController, :masto_instance)
     get("/instance/peers", MastodonAPIController, :peers)
-
     post("/apps", MastodonAPIController, :create_app)
     get("/apps/verify_credentials", MastodonAPIController, :verify_app_credentials)
-
     get("/custom_emojis", MastodonAPIController, :custom_emojis)
 
+    get("/statuses/:id/card", MastodonAPIController, :status_card)
+
+    get("/statuses/:id/favourited_by", MastodonAPIController, :favourited_by)
+    get("/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by)
+
     get("/trends", MastodonAPIController, :empty_array)
 
     get("/accounts/search", SearchController, :account_search)
 
+    post(
+      "/pleroma/accounts/confirmation_resend",
+      MastodonAPIController,
+      :account_confirmation_resend
+    )
+
     get("/timelines/public", MastodonAPIController, :public_timeline)
     get("/timelines/tag/:tag", MastodonAPIController, :hashtag_timeline)
     get("/timelines/list/:list_id", MastodonAPIController, :list_timeline)
 
+    get("/statuses", MastodonAPIController, :get_statuses)
+    get("/statuses/:id", MastodonAPIController, :get_status)
+    get("/statuses/:id/context", MastodonAPIController, :get_context)
+
     get("/polls/:id", MastodonAPIController, :get_poll)
 
-    post("/accounts", MastodonAPIController, :account_register)
-    get("/accounts/:id", MastodonAPIController, :user)
+    get("/accounts/:id/statuses", MastodonAPIController, :user_statuses)
     get("/accounts/:id/followers", MastodonAPIController, :followers)
     get("/accounts/:id/following", MastodonAPIController, :following)
-    get("/accounts/:id/statuses", MastodonAPIController, :user_statuses)
+    get("/accounts/:id", MastodonAPIController, :user)
 
     get("/search", SearchController, :search)
 
-    get("/statuses", MastodonAPIController, :get_statuses)
-    get("/statuses/:id", MastodonAPIController, :get_status)
-    get("/statuses/:id/context", MastodonAPIController, :get_context)
-    get("/statuses/:id/card", MastodonAPIController, :status_card)
-    get("/statuses/:id/favourited_by", MastodonAPIController, :favourited_by)
-    get("/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by)
-
     get("/pleroma/accounts/:id/favourites", MastodonAPIController, :user_favourites)
-
-    post(
-      "/pleroma/accounts/confirmation_resend",
-      MastodonAPIController,
-      :account_confirmation_resend
-    )
   end
 
   scope "/api/v2", Pleroma.Web.MastodonAPI do
@@ -435,6 +438,7 @@ defmodule Pleroma.Web.Router do
 
     get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens)
     delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token)
+
     post("/qvitter/statuses/notifications/read", TwitterAPI.Controller, :notifications_read)
   end