hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#468] Merged upstream/develop.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-02-19 19:10:55 +03:00
commit c0ecbf6669
39 changed files with 775 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/router.ex
View file

@ -230,6 +230,8 @@ defmodule Pleroma.Web.Router do
get("/suggestions", MastodonAPIController, :suggestions)
get("/endorsements", MastodonAPIController, :empty_array)
get("/pleroma/flavour", MastodonAPIController, :get_flavour)
end
scope [] do
@ -265,6 +267,8 @@ defmodule Pleroma.Web.Router do
get("/filters/:id", MastodonAPIController, :get_filter)
put("/filters/:id", MastodonAPIController, :update_filter)
delete("/filters/:id", MastodonAPIController, :delete_filter)
post("/pleroma/flavour/:flavour", MastodonAPIController, :set_flavour)
end
scope [] do
@ -402,6 +406,9 @@ defmodule Pleroma.Web.Router do
scope "/api", Pleroma.Web, as: :authenticated_twitter_api do
pipe_through(:authenticated_api)
get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens)
delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token)
scope [] do
pipe_through(:oauth_read)