projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/peertube-videos' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index bc4f0b237165ef46609b04a68cbcac7c453a3a0b..9e457848e5a574abf0193f06ac99525e5162e660 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-160,9
+160,9
@@
defmodule Pleroma.Web.Router do
:right_delete_multiple
)
:right_delete_multiple
)
- get("/relay",
AdminAPIController, :relay_list
)
- post("/relay",
AdminAPIController, :relay_
follow)
- delete("/relay",
AdminAPIController, :relay_
unfollow)
+ get("/relay",
RelayController, :index
)
+ post("/relay",
RelayController, :
follow)
+ delete("/relay",
RelayController, :
unfollow)
post("/users/invite_token", InviteController, :create)
get("/users/invites", InviteController, :index)
post("/users/invite_token", InviteController, :create)
get("/users/invites", InviteController, :index)
@@
-209,6
+209,10
@@
defmodule Pleroma.Web.Router do
post("/oauth_app", OAuthAppController, :create)
patch("/oauth_app/:id", OAuthAppController, :update)
delete("/oauth_app/:id", OAuthAppController, :delete)
post("/oauth_app", OAuthAppController, :create)
patch("/oauth_app/:id", OAuthAppController, :update)
delete("/oauth_app/:id", OAuthAppController, :delete)
+
+ get("/media_proxy_caches", MediaProxyCacheController, :index)
+ post("/media_proxy_caches/delete", MediaProxyCacheController, :delete)
+ post("/media_proxy_caches/purge", MediaProxyCacheController, :purge)
end
scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
end
scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
@@
-463,6
+467,7
@@
defmodule Pleroma.Web.Router do
scope "/api/web", Pleroma.Web do
pipe_through(:authenticated_api)
scope "/api/web", Pleroma.Web do
pipe_through(:authenticated_api)
+ # Backend-obscure settings blob for MastoFE, don't parse/reuse elsewhere
put("/settings", MastoFEController, :put_settings)
end
put("/settings", MastoFEController, :put_settings)
end
@@
-721,7
+726,7
@@
defmodule Pleroma.Web.Router do
get("/registration/:token", RedirectController, :registration_page)
get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
get("/api*path", RedirectController, :api_not_implemented)
get("/registration/:token", RedirectController, :registration_page)
get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
get("/api*path", RedirectController, :api_not_implemented)
- get("/*path", RedirectController, :redirector)
+ get("/*path", RedirectController, :redirector
_with_preload
)
options("/*path", RedirectController, :empty)
end
options("/*path", RedirectController, :empty)
end