X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub_controller.ex;h=a4472a8329667614f342d788091d0ee9abd0566c;hb=77c6c424a66b4bfc418e43054eaa695ae3e22231;hp=738e4ba336e7f0f509723fab89c3d930d75f6f29;hpb=5599c5920c293ac993146e21a73520213bbe2a8a;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 738e4ba33..a4472a832 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,17 +1,38 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo}
-  alias Pleroma.Web.ActivityPub.UserView
+  alias Pleroma.{User, Repo, Object}
+  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) do
+    with %User{} = user <- User.get_cached_by_nickname(nickname),
+         {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
       json(conn, UserView.render("user.json", %{user: user}))
     end
   end
 
-  def inbox(conn, params) do
-    {:ok, activity} = ActivityPub.insert(params, false)
-    json(conn, "ok")
+  def object(conn, %{"uuid" => uuid}) do
+    with ap_id <- o_status_url(conn, :object, uuid),
+         %Object{} = object <- Object.get_cached_by_ap_id(ap_id) do
+      json(conn, ObjectView.render("object.json", %{object: object}))
+    end
+  end
+
+  # TODO: Ensure that this inbox is a recipient of the message
+  def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
+    # 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