From 5454ec6a6ccedb2647cb765251e4cef3df2fcaf3 Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 15 Feb 2018 20:00:43 +0100 Subject: [PATCH] ActivityPubController: Handle inbox data. --- .../web/activity_pub/activity_pub_controller.ex | 16 ++++++++++++---- lib/pleroma/web/activity_pub/utils.ex | 1 - .../activity_pub_controller_test.exs | 11 +++++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index 35723f75c..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,13 +20,19 @@ def object(conn, %{"uuid" => uuid}) 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)) + 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 diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index ac20a2822..b32b7240e 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -205,7 +205,6 @@ def make_unfollow_data(follower, followed, follow_activity) do def make_create_data(params, additional) do published = params.published || make_date() - %{ "type" => "Create", "to" => params.to |> Enum.uniq, diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 21ed28cf2..957687c43 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -32,8 +32,15 @@ test "it returns a json representation of the object", %{conn: conn} do end describe "/users/:nickname/inbox" do - test "it inserts an incoming activity into the database" do - assert false + test "it inserts an incoming activity into the database", %{conn: conn} do + data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode! + + conn = conn + |> assign(:valid_signature, true) + |> put_req_header("content-type", "application/activity+json") + |> post("/users/doesntmatter/inbox", data) + + assert "ok" == json_response(conn, 200) end end end