aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-11-07 18:58:22 +0000
committerlambda <pleromagit@rogerbraun.net>2017-11-07 18:58:22 +0000
commitd761b1543af537fb6f1013c0930449c7c6a26941 (patch)
tree61fa46bbafd9eacd0ea1d853a2ff050f93922936 /lib
parentf801b695d796f3708d44497fa698cfb11e9d83c7 (diff)
parentf85566324ec7cf20f070850d0cd5bd3fec25445d (diff)
downloadpleroma-d761b1543af537fb6f1013c0930449c7c6a26941.tar.gz
Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only. Closes #54 See merge request pleroma/pleroma!7
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/router.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index f96ec7213..514320fd6 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -138,7 +138,6 @@ defmodule Pleroma.Web.Router do
get "/search", TwitterAPI.Controller, :search
get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
- get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end
scope "/api", Pleroma.Web do
@@ -176,6 +175,8 @@ defmodule Pleroma.Web.Router do
get "/statuses/followers", TwitterAPI.Controller, :followers
get "/statuses/friends", TwitterAPI.Controller, :friends
+
+ get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end
pipeline :ostatus do