projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get_announce_visibility-name' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index 8b482528b0871a84bc2878c6390803870c01fc2f..50197899496a34120d5301d6696d4435ea649925 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-373,7
+373,7
@@
defmodule Pleroma.Web.Router do
get("/filters", FilterController, :index)
get("/filters", FilterController, :index)
- get("/suggestions",
MastodonAPIController, :suggestions
)
+ get("/suggestions",
SuggestionController, :index
)
get("/conversations", ConversationController, :index)
post("/conversations/:id/read", ConversationController, :read)
get("/conversations", ConversationController, :index)
post("/conversations/:id/read", ConversationController, :read)
@@
-464,8
+464,8
@@
defmodule Pleroma.Web.Router do
get("/instance", MastodonAPIController, :masto_instance)
get("/instance/peers", MastodonAPIController, :peers)
get("/instance", MastodonAPIController, :masto_instance)
get("/instance/peers", MastodonAPIController, :peers)
- post("/apps",
MastodonAPIController, :create_app
)
- get("/apps/verify_credentials",
MastodonAPIController, :verify_app
_credentials)
+ post("/apps",
AppController, :create
)
+ get("/apps/verify_credentials",
AppController, :verify
_credentials)
get("/custom_emojis", MastodonAPIController, :custom_emojis)
get("/statuses/:id/card", StatusController, :card)
get("/custom_emojis", MastodonAPIController, :custom_emojis)
get("/statuses/:id/card", StatusController, :card)
@@
-661,10
+661,10
@@
defmodule Pleroma.Web.Router do
scope "/", Pleroma.Web.MastodonAPI do
pipe_through(:mastodon_html)
scope "/", Pleroma.Web.MastodonAPI do
pipe_through(:mastodon_html)
- get("/web/login",
MastodonAPI
Controller, :login)
- delete("/auth/sign_out",
MastodonAPI
Controller, :logout)
+ get("/web/login",
Auth
Controller, :login)
+ delete("/auth/sign_out",
Auth
Controller, :logout)
- post("/auth/password",
MastodonAPI
Controller, :password_reset)
+ post("/auth/password",
Auth
Controller, :password_reset)
scope [] do
pipe_through(:oauth_read)
scope [] do
pipe_through(:oauth_read)