expanding AddRemoveValidator

lib/pleroma/web/activity_pub/object_validator.ex

@@ -238,7 +238,7 @@ def validate(%{"type" => "Announce"} = object, meta) do
   def validate(%{"type" => type} = object, meta) when type in ~w(Add Remove) do
     with {:ok, object} <-
            object
-           |> AddRemoveValidator.cast_and_validate(meta)
+           |> AddRemoveValidator.cast_and_validate()
            |> Ecto.Changeset.apply_action(:insert) do
       object = stringify_keys(object)
       {:ok, object, meta}

lib/pleroma/web/activity_pub/object_validators/add_remove_validator.ex

@@ -8,6 +8,8 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
   import Ecto.Changeset
   import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
 
+  require Pleroma.Constants
+
   alias Pleroma.EctoType.ActivityPub.ObjectValidators
 
   @primary_key false
@@ -22,28 +24,40 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
     field(:cc, ObjectValidators.Recipients, default: [])
   end
 
-  def cast_and_validate(data, meta) do
+  def cast_and_validate(data) do
     data
+    |> maybe_fix_data_for_mastodon()
     |> cast_data()
-    |> validate_data(meta)
+    |> validate_data()
+  end
+
+  defp maybe_fix_data_for_mastodon(data) do
+    {:ok, actor} = Pleroma.User.get_or_fetch_by_ap_id(data["actor"])
+    # Mastodon sends pin/unpin objects without id, to, cc fields
+    data
+    |> Map.put_new("id", Pleroma.Web.ActivityPub.Utils.generate_activity_id())
+    |> Map.put_new("to", [Pleroma.Constants.as_public()])
+    |> Map.put_new("cc", [actor.follower_address])
   end
 
   defp cast_data(data) do
     cast(%__MODULE__{}, data, __schema__(:fields))
   end
 
-  defp validate_data(changeset, meta) do
+  defp validate_data(changeset) do
     changeset
     |> validate_required([:id, :target, :object, :actor, :type, :to, :cc])
     |> validate_inclusion(:type, ~w(Add Remove))
     |> validate_actor_presence()
-    |> validate_collection_belongs_to_actor(meta)
+    |> validate_collection_belongs_to_actor()
     |> validate_object_presence()
   end
 
-  defp validate_collection_belongs_to_actor(changeset, meta) do
+  defp validate_collection_belongs_to_actor(changeset) do
+    {:ok, actor} = Pleroma.User.get_or_fetch_by_ap_id(changeset.changes[:actor])
+
     validate_change(changeset, :target, fn :target, target ->
-      if target == meta[:featured_address] do
+      if target == actor.featured_address do
         []
       else
         [target: "collection doesn't belong to actor"]

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -557,24 +557,12 @@ def handle_incoming(
   end
 
   def handle_incoming(%{"type" => type} = data, _options) when type in ~w(Add Remove) do
-    with {:ok, %User{} = user} <- ObjectValidator.fetch_actor(data),
+    with :ok <- ObjectValidator.fetch_actor_and_object(data),
+         {:ok, actor} <- Pleroma.User.get_or_fetch_by_ap_id(data["actor"]),
          # maybe locally user doesn't have featured_address
-         {:ok, user} <- maybe_refetch_user(user),
-         %Object{} <- Object.normalize(data["object"], fetch: true) do
-      # Mastodon sends pin/unpin objects without id, to, cc fields
-      data =
-        data
-        |> Map.put_new("id", Utils.generate_activity_id())
-        |> Map.put_new("to", [Pleroma.Constants.as_public()])
-        |> Map.put_new("cc", [user.follower_address])
-
-      case Pipeline.common_pipeline(data,
-             local: false,
-             featured_address: user.featured_address
-           ) do
-        {:ok, activity, _meta} -> {:ok, activity}
-        error -> error
-      end
+         {:ok, _} <- maybe_refetch_user(actor),
+         {:ok, activity, _meta} <- Pipeline.common_pipeline(data, local: false) do
+      {:ok, activity}
     end
   end
 

lib/pleroma/web/common_api.ex

@@ -421,8 +421,7 @@ def pin(id, %User{} = user) do
          {:ok, _pin, _} <-
            Pipeline.common_pipeline(pin_data,
              local: true,
-             activity_id: id,
-             featured_address: user.featured_address
+             activity_id: id
            ) do
       {:ok, activity}
     else