diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-10-30 19:25:32 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-10-30 19:25:32 +0100 |
| commit | f23edd2d6b67ee30ccd16b7a27d9e07a9f928574 (patch) | |
| tree | 7f8516e81ff6d1aa188904dab044fec01488bc70 /lib/pleroma/web/router.ex | |
| parent | 261ec824515c1de6d93ad1c4ca7d3cf73faa58a4 (diff) | |
| parent | 502cb38cd69f9f8c15a0ee597584364f9d36bdf1 (diff) | |
| download | pleroma-f23edd2d6b67ee30ccd16b7a27d9e07a9f928574.tar.gz | |
Merge branch 'feld/pleroma-feld-mastodon-usersearch' into develop
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 cb818b3cc..1fb5eadf6 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -55,6 +55,7 @@ defmodule Pleroma.Web.Router do get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials get "/accounts/relationships", MastodonAPIController, :relationships + get "/accounts/search", MastodonAPIController, :account_search post "/accounts/:id/follow", MastodonAPIController, :follow post "/accounts/:id/unfollow", MastodonAPIController, :unfollow post "/accounts/:id/block", MastodonAPIController, :relationship_noop @@ -62,6 +63,8 @@ defmodule Pleroma.Web.Router do post "/accounts/:id/mute", MastodonAPIController, :relationship_noop post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop + post "/follows", MastodonAPIController, :follow + get "/blocks", MastodonAPIController, :empty_array get "/domain_blocks", MastodonAPIController, :empty_array get "/follow_requests", MastodonAPIController, :empty_array |