diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-19 14:27:59 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-19 14:27:59 -0500 |
| commit | 0461794375ebd22a91548f20d736da624e38c06a (patch) | |
| tree | 2d579f1d08c264c32d4692ceaf0468158211b775 /lib/pleroma/web/router.ex | |
| parent | e3173a279dad89dfce6eae89368ad3ba180c0490 (diff) | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| download | pleroma-0461794375ebd22a91548f20d736da624e38c06a.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 72ad14f05..ccf2ef796 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -204,7 +204,7 @@ defmodule Pleroma.Web.Router do 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) @@ -704,6 +704,7 @@ defmodule Pleroma.Web.Router do # 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 |