X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=cecf5527c82a1b26cac0dad0867a6d2bd8c6ee2b;hb=a7a40bb8f1eaf30f0f0d581089ff3ef45de4087c;hp=8f63fdc7072a163c5693b41108974add56b416c9;hpb=62a2287bba87932339321dae944408781387fa2c;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 8f63fdc70..cecf5527c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -5,6 +5,8 @@ defmodule Pleroma.Web.Router do
 
   @instance Application.get_env(:pleroma, :instance)
   @federating Keyword.get(@instance, :federating)
+  @public Keyword.get(@instance, :public)
+  @registrations_open Keyword.get(@instance, :registrations_open)
 
   def user_fetcher(username) do
     {:ok, Repo.get_by(User, %{nickname: username})}
@@ -160,21 +162,9 @@ defmodule Pleroma.Web.Router do
     get("/statusnet/version", TwitterAPI.UtilController, :version)
   end
 
-  @instance Application.get_env(:pleroma, :instance)
-  @registrations_open Keyword.get(@instance, :registrations_open)
-
   scope "/api", Pleroma.Web do
     pipe_through(:api)
 
-    get("/statuses/public_timeline", TwitterAPI.Controller, :public_timeline)
-
-    get(
-      "/statuses/public_and_external_timeline",
-      TwitterAPI.Controller,
-      :public_and_external_timeline
-    )
-
-    get("/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline)
     get("/statuses/user_timeline", TwitterAPI.Controller, :user_timeline)
     get("/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline)
     get("/users/show", TwitterAPI.Controller, :show_user)
@@ -192,6 +182,24 @@ defmodule Pleroma.Web.Router do
     get("/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline)
   end
 
+  scope "/api", Pleroma.Web do
+    if @public do
+      pipe_through(:api)
+    else
+      pipe_through(:authenticated_api)
+    end
+
+    get("/statuses/public_timeline", TwitterAPI.Controller, :public_timeline)
+
+    get(
+      "/statuses/public_and_external_timeline",
+      TwitterAPI.Controller,
+      :public_and_external_timeline
+    )
+
+    get("/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline)
+  end
+
   scope "/api", Pleroma.Web do
     pipe_through(:authenticated_api)