X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fobject_validator.ex;h=dc4bce0595a12c409475206b2aed0e7222b7ce18;hb=33f29760200e00305be20350898ebfd2b3ce21af;hp=33e67dbb9a30e3bd143c3c599bd5230f2d514edc;hpb=203d61b95012fd2cb8a8618f6f51a3748c940cc1;p=akkoma
diff --git a/lib/pleroma/web/activity_pub/object_validator.ex b/lib/pleroma/web/activity_pub/object_validator.ex
index 33e67dbb9..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
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidator do
@@ -9,27 +9,24 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
the system.
"""
- alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator
- alias Pleroma.User
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
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