X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub_controller.ex;h=835e8bd9de586cb206a115a9cdc9751d48d99c69;hb=297a2c7d3f2f4e79d05ed799e7bb20ed27b35a9c;hp=35723f75c064f12ef8f8720d19a22b0a644db3a3;hpb=8cf97ee8e15a36cbbf0964d5be53c88d29798163;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..835e8bd9d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,9 +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
 
+  require Logger
+
+  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,13 +22,44 @@ 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
+    # File.write("/tmp/incoming.json", Poison.encode!(params))
+    # Logger.info(Poison.encode!(params, [pretty: 2]))
+    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
+         nil <- Activity.get_by_ap_id(params["id"]),
+         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
       json(conn, "ok")
     else
-      e -> IO.inspect(e)
+      %Activity{} ->
+        Logger.info("Already had #{params["id"]}")
+        json(conn, "ok")
+      e ->
+        # Just drop those for now
+        Logger.info("Unhandled activity")
+        Logger.info(Poison.encode!(params, [pretty: 2]))
+        json(conn, "ok")
+    end
+  end
+
+  def inbox(conn, params) do
+    Logger.info("Signature error.")
+    Logger.info(inspect(conn.req_headers))
+    json(conn, "ok")
+  end
+
+  def ap_enabled_actor(id) do
+    user = User.get_by_ap_id(id)
+    if User.ap_enabled?(user) do
+      {:ok, user}
+    else
+      ActivityPub.make_user_from_ap_id(id)
     end
   end
+
+  def errors(conn, _e) do
+    conn
+    |> put_status(500)
+    |> json("error")
+  end
 end