Merge remote-tracking branch 'pleroma/develop' into notice-routes

diff --combined lib/pleroma/web/router.ex
index 5e732e4bb7de34fc1b187bbb7bd362793db94909,ccf2ef796b33633215a36e3db10ca7dd66bb7f0b..d41c4f7fe01a782fad5d80974561484e4c0695b9
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -204,7 -204,7 +204,7 @@@ defmodule Pleroma.Web.Router d
      get("/users/:nickname/credentials", AdminAPIController, :show_user_credentials)
      patch("/users/:nickname/credentials", AdminAPIController, :update_user_credentials)
  
-     get("/users", UserController, :list)
+     get("/users", UserController, :index)
      get("/users/:nickname", UserController, :show)
      get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
      get("/users/:nickname/chats", AdminAPIController, :list_user_chats)
@@@ -637,11 -637,6 +637,11 @@@
      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)
@@@ -709,6 -704,7 +709,7 @@@
      # The following two are S2S as well, see `ActivityPub.fetch_follow_information_for_user/1`:
      get("/users/:nickname/followers", ActivityPubController, :followers)
      get("/users/:nickname/following", ActivityPubController, :following)
+     get("/users/:nickname/collections/featured", ActivityPubController, :pinned)
    end
  
    scope "/", Pleroma.Web.ActivityPub do