ActivityPubController: Handle inbox data.

This commit is contained in:
lain 2018-02-15 20:00:43 +01:00
parent ef0300889d
commit 5454ec6a6c
3 changed files with 21 additions and 7 deletions

View file

@ -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 @@ 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))
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

View file

@ -205,7 +205,6 @@ defmodule Pleroma.Web.ActivityPub.Utils do
def make_create_data(params, additional) do
published = params.published || make_date()
%{
"type" => "Create",
"to" => params.to |> Enum.uniq,

View file

@ -32,8 +32,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest 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