X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub_controller.ex;h=f0dc86a7fbcf053ede85342edc7e8c78c62a9ca4;hb=541a4cbbb6c075ebdd50023ed99243e9eca2001a;hp=35723f75c064f12ef8f8720d19a22b0a644db3a3;hpb=b331cb449a46bbead19fea4fba59762c1a2e3a10;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 35723f75c..f0dc86a7f 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,8 +1,13 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo, Object}
-  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
+  alias Pleroma.{User, Repo, Object, Activity}
+  alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.Federator
+
+  require Logger
+
+  action_fallback :errors
 
   def user(conn, %{"nickname" => nickname}) do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
@@ -18,13 +23,21 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     end
   end
 
-  # TODO: Move signature failure halt into plug
+  # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    with {:ok, data} <- ActivityPub.prepare_incoming(params),
-         {:ok, activity} <- ActivityPub.insert(data, false) do
-      json(conn, "ok")
-    else
-      e -> IO.inspect(e)
-    end
+    Federator.enqueue(:incoming_ap_doc, params)
+    json(conn, "ok")
+  end
+
+  def inbox(conn, params) do
+    Logger.info("Signature error.")
+    Logger.info(inspect(conn.req_headers))
+    json(conn, "ok")
+  end
+
+  def errors(conn, _e) do
+    conn
+    |> put_status(500)
+    |> json("error")
   end
 end