logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 8f3d0ed11bb145c524551624abffb40a329f834f
parent 6b8aedea48e9578ef53df065bd475863aff7e705
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Mon,  1 Mar 2021 22:02:07 +0100

Revert "Transmogrifier: Check object/activity existance for incoming Delete/Undo"

This reverts commit 686453917fdbea9cd23c3d7ba73af8f888b07286.

Diffstat:

Mlib/pleroma/web/activity_pub/transmogrifier.ex17+++++------------
1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -488,13 +488,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do %{"type" => "Delete"} = data, _options ) do - with {_, %Object{}} <- {:normalize, Object.normalize(data["object"], false)}, - {:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do + with {:ok, activity, _} <- + Pipeline.common_pipeline(data, local: false) do {:ok, activity} else - {:normalize, nil} -> - {:error, "Unknown object to Delete"} - {:error, {:validate, _}} = e -> # Check if we have a create activity for this with {:ok, object_id} <- ObjectValidators.ObjectID.cast(data["object"]), @@ -532,17 +529,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def handle_incoming( %{ "type" => "Undo", - "object" => %{"type" => type, "id" => act_id} + "object" => %{"type" => type} } = data, _options ) when type in ["Like", "EmojiReact", "Announce", "Block"] do - with {_, %Activity{}} <- {:normalize, Activity.get_by_id(act_id)}, - {:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do + with {:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do {:ok, activity} - else - {:normalize, nil} -> {:error, "Unknown activity to Undo"} - e -> e end end @@ -560,7 +553,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("object", data) |> handle_incoming(options) else - nil -> {:error, "Unknown activity to Undo"} + _e -> :error end end