squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Roman Chvanikov 2020-12-09 00:11:38 +03:00
parent 8553df904a
commit 07e80e39b1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View File

@ -271,7 +271,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
end end
end end
def inbox(%{assigns: %{valid_signature: true}} = conn, %{"nickname" => nickname} = params) do def inbox(conn, params) do
IO.inspect(%{conn: conn, params: params})
inbox2(conn, params)
end
def inbox2(%{assigns: %{valid_signature: true}} = conn, %{"nickname" => nickname} = params) do
with %User{} = recipient <- User.get_cached_by_nickname(nickname), with %User{} = recipient <- User.get_cached_by_nickname(nickname),
{:ok, %User{} = actor} <- User.get_or_fetch_by_ap_id(params["actor"]), {:ok, %User{} = actor} <- User.get_or_fetch_by_ap_id(params["actor"]),
true <- Utils.recipient_in_message(recipient, actor, params), true <- Utils.recipient_in_message(recipient, actor, params),
@ -281,13 +286,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
end end
end end
def inbox(%{assigns: %{valid_signature: true}} = conn, params) do def inbox2(%{assigns: %{valid_signature: true}} = conn, params) do
Federator.incoming_ap_doc(params) Federator.incoming_ap_doc(params)
json(conn, "ok") json(conn, "ok")
end end
# POST /relay/inbox -or- POST /internal/fetch/inbox # POST /relay/inbox -or- POST /internal/fetch/inbox
def inbox(conn, params) do def inbox2(conn, params) do
if params["type"] == "Create" && FederatingPlug.federating?() do if params["type"] == "Create" && FederatingPlug.federating?() do
post_inbox_relayed_create(conn, params) post_inbox_relayed_create(conn, params)
else else