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

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 63dbd6245..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
@@ -62,6 +65,7 @@ defmodule Pleroma.Web.Router do
     pipe_through :pleroma_html
     get "/ostatus_subscribe", UtilController, :remote_follow
     post "/ostatus_subscribe", UtilController, :do_remote_follow
+    post "/main/ostatus", UtilController, :remote_subscribe
   end
 
   scope "/api/pleroma", Pleroma.Web.TwitterAPI do
@@ -128,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
 
@@ -218,7 +223,7 @@ defmodule Pleroma.Web.Router do
   end
 
   pipeline :ostatus do
-    plug :accepts, ["xml", "atom", "html"]
+    plug :accepts, ["xml", "atom", "html", "activity+json"]
   end
 
   scope "/", Pleroma.Web do
@@ -227,20 +232,45 @@ 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
 
-  scope "/.well-known", Pleroma.Web do
-    pipe_through :well_known
+  pipeline :activitypub do
+    plug :accepts, ["activity+json"]
+    plug Pleroma.Web.Plugs.HTTPSignaturePlug
+  end
 
-    get "/host-meta", WebFinger.WebFingerController, :host_meta
-    get "/webfinger", WebFinger.WebFingerController, :webfinger
+  scope "/", Pleroma.Web.ActivityPub do
+    # 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
+
+  if @federating do
+    scope "/", Pleroma.Web.ActivityPub do
+      pipe_through :activitypub
+      post "/users/:nickname/inbox", ActivityPubController, :inbox
+      post "/inbox", ActivityPubController, :inbox
+    end
+
+    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