diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-19 13:39:29 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-19 13:39:29 -0500 |
| commit | e343b46ea041ce6a542b23100df2e9c11e262c75 (patch) | |
| tree | 7bd219409244d97e51ad58f800889c65f41837a0 /lib/pleroma/web/router.ex | |
| parent | a5bbebda588a54cb76d1a75239523db676980eb0 (diff) | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| download | pleroma-instance-view-recompilation.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into instance-view-recompilationinstance-view-recompilation
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 |