aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-11-16 18:13:47 +0000
committerlambda <pleromagit@rogerbraun.net>2018-11-16 18:13:47 +0000
commit2f639ea1292b1dee01b10fc78bbbe253a4592f2d (patch)
tree826a84d81ea2b1ece77eeae72f52615da59bf162 /lib/pleroma/web/router.ex
parent38f76d964f62f03f01abc8beeeddaac97a91d751 (diff)
parente8d8c84f795152a0522e6848e75b47dcbce5aa89 (diff)
downloadpleroma-2f639ea1292b1dee01b10fc78bbbe253a4592f2d.tar.gz
Merge branch 'feature/pleromafe-usersearch' into 'develop'
Add Twitter / Pleroma API user search See merge request pleroma/pleroma!452
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 5e81db00b..462369806 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -250,7 +250,12 @@ defmodule Pleroma.Web.Router do
get("/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline)
end
- scope "/api", Pleroma.Web do
+ scope "/api", Pleroma.Web, as: :twitter_api_search do
+ pipe_through(:api)
+ get("/pleroma/search_user", TwitterAPI.Controller, :search_user)
+ end
+
+ scope "/api", Pleroma.Web, as: :authenticated_twitter_api do
pipe_through(:authenticated_api)
get("/account/verify_credentials", TwitterAPI.Controller, :verify_credentials)