sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Transmogrifier: Correctly save incoming ids for Accept/Reject.

Browse Source
This commit is contained in:
lain 2019-10-11 11:48:58 +02:00
parent 9b963064eb
commit 37812740c4
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -269,22 +269,21 @@ def listen(%{to: to, actor: actor, context: context, object: object} = params) d
end end
end end
def accept(%{to: to, actor: actor, object: object} = params) do def accept(params) do
# only accept false as false value accept_or_reject("Accept", params)
local = !(params[:local] == false)
with data <- %{"to" => to, "type" => "Accept", "actor" => actor.ap_id, "object" => object},
{:ok, activity} <- insert(data, local),
:ok <- maybe_federate(activity) do
{:ok, activity}
end
end end
def reject(%{to: to, actor: actor, object: object} = params) do def reject(params) do
# only accept false as false value accept_or_reject("Reject", params)
local = !(params[:local] == false) end
with data <- %{"to" => to, "type" => "Reject", "actor" => actor.ap_id, "object" => object}, def accept_or_reject(type, %{to: to, actor: actor, object: object} = params) do
local = Map.get(params, :local, true)
activity_id = Map.get(params, :activity_id, nil)
with data <-
%{"to" => to, "type" => type, "actor" => actor.ap_id, "object" => object}
|> Utils.maybe_put("id", activity_id),
{:ok, activity} <- insert(data, local), {:ok, activity} <- insert(data, local),
:ok <- maybe_federate(activity) do :ok <- maybe_federate(activity) do
{:ok, activity} {:ok, activity}

10
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -514,7 +514,7 @@ def handle_incoming(
end end
def handle_incoming( def handle_incoming(
%{"type" => "Accept", "object" => follow_object, "actor" => _actor, "id" => _id} = data, %{"type" => "Accept", "object" => follow_object, "actor" => _actor, "id" => id} = data,
_options _options
) do ) do
with actor <- Containment.get_actor(data), with actor <- Containment.get_actor(data),
@ -528,7 +528,8 @@ def handle_incoming(
type: "Accept", type: "Accept",
actor: followed, actor: followed,
object: follow_activity.data["id"], object: follow_activity.data["id"],
local: false local: false,
activity_id: id
}) })
else else
_e -> :error _e -> :error
@ -536,7 +537,7 @@ def handle_incoming(
end end
def handle_incoming( def handle_incoming(
%{"type" => "Reject", "object" => follow_object, "actor" => _actor, "id" => _id} = data, %{"type" => "Reject", "object" => follow_object, "actor" => _actor, "id" => id} = data,
_options _options
) do ) do
with actor <- Containment.get_actor(data), with actor <- Containment.get_actor(data),
@ -550,7 +551,8 @@ def handle_incoming(
type: "Reject", type: "Reject",
actor: followed, actor: followed,
object: follow_activity.data["id"], object: follow_activity.data["id"],
local: false local: false,
activity_id: id
}) do }) do
User.unfollow(follower, followed) User.unfollow(follower, followed)

3
test/web/activity_pub/transmogrifier_test.exs
View File

@ -909,6 +909,8 @@ test "it works for incoming accepts which were pre-accepted" do
assert activity.data["object"] == follow_activity.data["id"] assert activity.data["object"] == follow_activity.data["id"]
assert activity.data["id"] == accept_data["id"]
follower = User.get_cached_by_id(follower.id) follower = User.get_cached_by_id(follower.id)
assert User.following?(follower, followed) == true assert User.following?(follower, followed) == true
@ -1013,6 +1015,7 @@ test "it works for incoming rejects which are orphaned" do
{:ok, activity} = Transmogrifier.handle_incoming(reject_data) {:ok, activity} = Transmogrifier.handle_incoming(reject_data)
refute activity.local refute activity.local
assert activity.data["id"] == reject_data["id"]
follower = User.get_cached_by_id(follower.id) follower = User.get_cached_by_id(follower.id)