X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=ec06e2ffd64b8becfc14661bbafc20c6a5e62550;hb=3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b;hp=6455ff108aaeb1b08ff6424d81d5e1832d3917d0;hpb=52200998c997576c9008cbe50b0a7b9f0e6134cc;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6455ff108..ec06e2ffd 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -3,6 +3,9 @@ defmodule Pleroma.Web.Router do
 
   alias Pleroma.{Repo, User, Web.Router}
 
+  @instance Application.get_env(:pleroma, :instance)
+  @federating Keyword.get(@instance, :federating)
+
   def user_fetcher(username) do
     {:ok, Repo.get_by(User, %{nickname: username})}
   end
@@ -129,6 +132,7 @@ defmodule Pleroma.Web.Router do
 
     get "/statuses/:id", MastodonAPIController, :get_status
     get "/statuses/:id/context", MastodonAPIController, :get_context
+    get "/statuses/:id/card", MastodonAPIController, :empty_object
     get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
     get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by
 
@@ -228,13 +232,16 @@ defmodule Pleroma.Web.Router do
     get "/objects/:uuid", OStatus.OStatusController, :object
     get "/activities/:uuid", OStatus.OStatusController, :activity
     get "/notice/:id", OStatus.OStatusController, :notice
-
     get "/users/:nickname/feed", OStatus.OStatusController, :feed
     get "/users/:nickname", OStatus.OStatusController, :feed_redirect
-    post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
-    post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
-    get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
-    post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
+
+    if @federating do
+      post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
+      post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
+      get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
+      post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
+    end
+
   end
 
   pipeline :activitypub do
@@ -243,15 +250,27 @@ defmodule Pleroma.Web.Router do
   end
 
   scope "/", Pleroma.Web.ActivityPub do
-    pipe_through :activitypub
-    post "/users/:nickname/inbox", ActivityPubController, :inbox
+    # XXX: not really ostatus
+    pipe_through :ostatus
+
+    get "/users/:nickname/followers", ActivityPubController, :followers
+    get "/users/:nickname/following", ActivityPubController, :following
+    get "/users/:nickname/outbox", ActivityPubController, :outbox
   end
 
-  scope "/.well-known", Pleroma.Web do
-    pipe_through :well_known
+  if @federating do
+    scope "/", Pleroma.Web.ActivityPub do
+      pipe_through :activitypub
+      post "/users/:nickname/inbox", ActivityPubController, :inbox
+      post "/inbox", ActivityPubController, :inbox
+    end
 
-    get "/host-meta", WebFinger.WebFingerController, :host_meta
-    get "/webfinger", WebFinger.WebFingerController, :webfinger
+    scope "/.well-known", Pleroma.Web do
+      pipe_through :well_known
+
+      get "/host-meta", WebFinger.WebFingerController, :host_meta
+      get "/webfinger", WebFinger.WebFingerController, :webfinger
+    end
   end
 
   scope "/", Pleroma.Web.MastodonAPI do