diff options
| author | lain <lain@soykaf.club> | 2020-05-17 12:14:49 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-17 12:14:49 +0200 |
| commit | 9c171097653abce49b9847fff66bc39b35719a1c (patch) | |
| tree | e89ab9245f0844bfb3334f62f67f8ab9f0949580 /lib/pleroma/web/router.ex | |
| parent | f012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (diff) | |
| parent | b0ccdb5af4baa119b336298d38f34746cdce0111 (diff) | |
| download | pleroma-9c171097653abce49b9847fff66bc39b35719a1c.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 0e4f45869..c6e816405 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -415,6 +415,7 @@ defmodule Pleroma.Web.Router do post("/markers", MarkerController, :upsert) post("/media", MediaController, :create) + get("/media/:id", MediaController, :show) put("/media/:id", MediaController, :update) get("/notifications", NotificationController, :index) @@ -509,6 +510,8 @@ defmodule Pleroma.Web.Router do scope "/api/v2", Pleroma.Web.MastodonAPI do pipe_through(:api) get("/search", SearchController, :search2) + + post("/media", MediaController, :create2) end scope "/api", Pleroma.Web do |