X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fobject_validator.ex;h=dc4bce0595a12c409475206b2aed0e7222b7ce18;hb=a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7;hp=adcb53c65c9ef1ce0f5b7bab902b5887fe4f5bda;hpb=66452f518faa1f079f02006943b0c2cdc830b47f;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/object_validator.ex b/lib/pleroma/web/activity_pub/object_validator.ex
index adcb53c65..dc4bce059 100644
--- a/lib/pleroma/web/activity_pub/object_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validator.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.ObjectValidator do
@@ -9,24 +9,29 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
   the system.
   """
 
+  alias Pleroma.Object
+  alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator
 
   @spec validate(map(), keyword()) :: {:ok, map(), keyword()} | {:error, any()}
   def validate(object, meta)
 
   def validate(%{"type" => "Like"} = object, meta) do
-    with {_, %{valid?: true, changes: object}} <-
-           {:validate_object, LikeValidator.cast_and_validate(object)} do
-      object = stringify_keys(object)
+    with {:ok, object} <-
+           object |> LikeValidator.cast_and_validate() |> Ecto.Changeset.apply_action(:insert) do
+      object = stringify_keys(object |> Map.from_struct())
       {:ok, object, meta}
-    else
-      e -> {:error, e}
     end
   end
 
-  defp stringify_keys(object) do
+  def stringify_keys(object) do
     object
-    |> Enum.map(fn {key, val} -> {to_string(key), val} end)
-    |> Enum.into(%{})
+    |> Map.new(fn {key, val} -> {to_string(key), val} end)
+  end
+
+  def fetch_actor_and_object(object) do
+    User.get_or_fetch_by_ap_id(object["actor"])
+    Object.normalize(object["object"])
+    :ok
   end
 end