Create activity when client posts to outbox
This commit is contained in:
parent
26dc2dddab
commit
569bad8210
2 changed files with 42 additions and 5 deletions
|
@ -4,11 +4,12 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
|
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
alias Pleroma.{User, Object}
|
alias Pleroma.{Activity, User, Object}
|
||||||
alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
|
alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
|
||||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
alias Pleroma.Web.ActivityPub.Relay
|
alias Pleroma.Web.ActivityPub.Relay
|
||||||
alias Pleroma.Web.ActivityPub.Utils
|
alias Pleroma.Web.ActivityPub.Utils
|
||||||
|
alias Pleroma.Web.ActivityPub.Transmogrifier
|
||||||
alias Pleroma.Web.Federator
|
alias Pleroma.Web.Federator
|
||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
|
@ -166,11 +167,33 @@ def read_inbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = par
|
||||||
|
|
||||||
def update_outbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = params) do
|
def update_outbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = params) do
|
||||||
if nickname == user.nickname do
|
if nickname == user.nickname do
|
||||||
Logger.info("update outbox #{inspect(params)}")
|
actor = user.ap_id()
|
||||||
|
|
||||||
conn
|
params =
|
||||||
|> put_status(:created)
|
params
|
||||||
|> json("ok!")
|
|> Map.drop(["id"])
|
||||||
|
|> Map.put("actor", actor)
|
||||||
|
|> Transmogrifier.fix_addressing()
|
||||||
|
|
||||||
|
object =
|
||||||
|
params["object"]
|
||||||
|
|> Map.merge(Map.take(params, ["to", "cc"]))
|
||||||
|
|> Map.put("attributedTo", actor)
|
||||||
|
|> Transmogrifier.fix_object()
|
||||||
|
|
||||||
|
with {:ok, %Activity{} = activity} <-
|
||||||
|
ActivityPub.create(%{
|
||||||
|
to: params["to"],
|
||||||
|
actor: user,
|
||||||
|
context: object["context"],
|
||||||
|
object: object,
|
||||||
|
additional: Map.take(params, ["cc"])
|
||||||
|
}) do
|
||||||
|
conn
|
||||||
|
|> put_status(:created)
|
||||||
|
|> put_resp_header("location", activity.data["id"])
|
||||||
|
|> json(%{"id" => activity.data["id"]})
|
||||||
|
end
|
||||||
else
|
else
|
||||||
conn
|
conn
|
||||||
|> put_status(:forbidden)
|
|> put_status(:forbidden)
|
||||||
|
|
|
@ -178,6 +178,20 @@ test "it rejects posts from other users", %{conn: conn} do
|
||||||
|
|
||||||
assert json_response(conn, 403)
|
assert json_response(conn, 403)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it inserts an incoming activity into the database", %{conn: conn} do
|
||||||
|
data = File.read!("test/fixtures/activitypub-client-post-activity.json") |> Poison.decode!()
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> put_req_header("content-type", "application/activity+json")
|
||||||
|
|> post("/users/#{user.nickname}/outbox", data)
|
||||||
|
|
||||||
|
result = json_response(conn, 201)
|
||||||
|
assert Activity.get_by_ap_id(result["id"])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "/users/:nickname/followers" do
|
describe "/users/:nickname/followers" do
|
||||||
|
|
Loading…
Reference in a new issue