X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=8d93e1ea631b4ca5aa4e71310e71ba9b5d4f1c9c;hb=01faa7c555061aed79ec932c0065bf77818f3125;hp=6e9f40955a929a0b93e7d356dfa3d516fbd0c439;hpb=9a9766d6489024fb725197af1461944252aae9ed;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6e9f40955..8d93e1ea6 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -219,7 +219,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
@@ -237,6 +237,17 @@ defmodule Pleroma.Web.Router do
     post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
   end
 
+  pipeline :activitypub do
+    plug :accepts, ["activity+json"]
+    plug Pleroma.Web.Plugs.HTTPSignaturePlug
+  end
+
+  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