X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub_controller.ex;h=a4472a8329667614f342d788091d0ee9abd0566c;hb=5682e48a253e40791b0b723f8cebf605c9cf7b63;hp=0f631dd4bef48d3ce7b4a664d8e9c24187ba38ee;hpb=888ec9e579169e899b58344b18fce860477d9bfc;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 0f631dd4b..a4472a832 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,9 +1,11 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
   alias Pleroma.{User, Repo, Object}
-  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
+  alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  action_fallback :errors
+
   def user(conn, %{"nickname" => nickname}) do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
@@ -18,9 +20,19 @@ 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
-    {:ok, activity} = ActivityPub.insert(params, false)
-    json(conn, "ok")
+    # File.write("/tmp/incoming.json", Poison.encode!(params))
+    with {:ok, activity} <- Transmogrifier.handle_incoming(params) do
+      json(conn, "ok")
+    else
+      e -> IO.inspect(e)
+    end
+  end
+
+  def errors(conn, _e) do
+    conn
+    |> put_status(500)
+    |> json("error")
   end
 end