Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake...

[akkoma] / lib / pleroma / web / activity_pub / object_validators / like_validator.ex

diff --git a/lib/pleroma/web/activity_pub/object_validators/like_validator.ex b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
index d5a2f7202aefeefaaa6e70f926077c4e72eb675d..49546ceaaa22c33d331e5c5f9cb9818fa147da1c 100644 (file)
--- a/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
@@ -1,16 +1,20 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
   use Ecto.Schema
-  import Ecto.Changeset
 
   alias Pleroma.Web.ActivityPub.ObjectValidators.Types
   alias Pleroma.Web.ActivityPub.Utils
-  alias Pleroma.User
-  alias Pleroma.Object
+
+  import Ecto.Changeset
+  import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
 
   @primary_key false
 
   embedded_schema do
-    field(:id, :string, primary_key: true)
+    field(:id, Types.ObjectID, primary_key: true)
     field(:type, :string)
     field(:object, Types.ObjectID)
     field(:actor, Types.ObjectID)
@@ -33,9 +37,9 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
   def validate_data(data_cng) do
     data_cng
     |> validate_inclusion(:type, ["Like"])
-    |> validate_required([:id, :type, :object, :actor, :context])
-    |> validate_change(:actor, &actor_valid?/2)
-    |> validate_change(:object, &object_valid?/2)
+    |> validate_required([:id, :type, :object, :actor, :context, :to, :cc])
+    |> validate_actor_presence()
+    |> validate_object_presence()
     |> validate_existing_like()
   end
 
@@ -50,20 +54,4 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
   end
 
   def validate_existing_like(cng), do: cng
-
-  def actor_valid?(field_name, actor) do
-    if User.get_cached_by_ap_id(actor) do
-      []
-    else
-      [{field_name, "can't find user"}]
-    end
-  end
-
-  def object_valid?(field_name, object) do
-    if Object.get_cached_by_ap_id(object) do
-      []
-    else
-      [{field_name, "can't find object"}]
-    end
-  end
 end