diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
| commit | 88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 (patch) | |
| tree | d6115e451d0cd98672669c6ba93921f75f21e16a /lib/pleroma/web/router.ex | |
| parent | ca7b46fb3ba576fb7e67eba02654e6df9299392a (diff) | |
| parent | 1d531fd2f32a7f8fff562a3122b30b8ccdccead0 (diff) | |
| download | pleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.tar.gz | |
Merge develop
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index d6a9d5779..75d965c6d 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -198,6 +198,11 @@ defmodule Pleroma.Web.Router do put("/filters/:id", MastodonAPIController, :update_filter) delete("/filters/:id", MastodonAPIController, :delete_filter) + post("/push/subscription", MastodonAPIController, :create_push_subscription) + get("/push/subscription", MastodonAPIController, :get_push_subscription) + put("/push/subscription", MastodonAPIController, :update_push_subscription) + delete("/push/subscription", MastodonAPIController, :delete_push_subscription) + get("/suggestions", MastodonAPIController, :suggestions) get("/endorsements", MastodonAPIController, :empty_array) @@ -324,6 +329,7 @@ defmodule Pleroma.Web.Router do post("/statusnet/media/upload", TwitterAPI.Controller, :upload) post("/media/upload", TwitterAPI.Controller, :upload_json) + post("/media/metadata/create", TwitterAPI.Controller, :update_media) post("/favorites/create/:id", TwitterAPI.Controller, :favorite) post("/favorites/create", TwitterAPI.Controller, :favorite) |