diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-12 16:33:58 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-12 16:33:58 +0000 |
| commit | 71cc0d5c17fd5795d45e817c36ef14f320dd6f5b (patch) | |
| tree | b6dd78ecbafccdfeabde1f60b9d9685c28539246 /lib | |
| parent | b6567c9f4e290ba8ad928c9ed10e72d2589dd89a (diff) | |
| parent | 360e4cdaa2708d54903765c61afbc5ea5f1b2cdb (diff) | |
| download | pleroma-71cc0d5c17fd5795d45e817c36ef14f320dd6f5b.tar.gz | |
Merge branch 'fix/pleroma-extensions' into 'develop'
Move new endpoints to pleroma namespace in Mastodon API
See merge request pleroma/pleroma!1404
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index d53fa8a35..a3b6ea366 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -322,10 +322,6 @@ defmodule Pleroma.Web.Router do patch("/accounts/update_credentials", MastodonAPIController, :update_credentials) - patch("/accounts/update_avatar", MastodonAPIController, :update_avatar) - patch("/accounts/update_banner", MastodonAPIController, :update_banner) - patch("/accounts/update_background", MastodonAPIController, :update_background) - post("/statuses", MastodonAPIController, :post_status) delete("/statuses/:id", MastodonAPIController, :delete_status) @@ -360,6 +356,10 @@ defmodule Pleroma.Web.Router do put("/filters/:id", MastodonAPIController, :update_filter) delete("/filters/:id", MastodonAPIController, :delete_filter) + patch("/pleroma/accounts/update_avatar", MastodonAPIController, :update_avatar) + patch("/pleroma/accounts/update_banner", MastodonAPIController, :update_banner) + patch("/pleroma/accounts/update_background", MastodonAPIController, :update_background) + get("/pleroma/mascot", MastodonAPIController, :get_mascot) put("/pleroma/mascot", MastodonAPIController, :set_mascot) |