X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fobject_validator.ex;h=dc4bce0595a12c409475206b2aed0e7222b7ce18;hb=12bb7fc0dc94068d8337f10fc337ab23c8c7e77e;hp=0048cc4ec3b3a29d2747fe7a6e674fce9cb545da;hpb=081e8206ab75e336a76b621508b3999170159ec6;p=akkoma
diff --git a/lib/pleroma/web/activity_pub/object_validator.ex b/lib/pleroma/web/activity_pub/object_validator.ex
index 0048cc4ec..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,50 +9,29 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
the system.
"""
- alias Pleroma.User
alias Pleroma.Object
- alias Pleroma.Web.ActivityPub.Utils
-
- def validate_id(object, meta) do
- with {_, true} <- {:id_presence, Map.has_key?(object, "id")} do
- {:ok, object, meta}
- else
- e -> {:error, e}
- end
- end
-
- def validate_actor(object, meta) do
- with {_, %User{}} <- {:actor_validation, User.get_cached_by_ap_id(object["actor"])} do
- {:ok, object, meta}
- else
- e -> {:error, e}
- end
- end
-
- def common_validations(object, meta) do
- with {_, {:ok, object, meta}} <- {:validate_id, validate_id(object, meta)},
- {_, {:ok, object, meta}} <- {:validate_actor, validate_actor(object, meta)} do
- {:ok, object, meta}
- else
- e -> {:error, e}
- end
- end
+ 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 {:ok, object, meta} <- common_validations(object, meta),
- {_, %Object{} = liked_object} <-
- {:find_liked_object, Object.normalize(object["object"])},
- {_, nil} <- {:existing_like, Utils.get_existing_like(object["actor"], liked_object)} do
+ 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 validate(object, meta) do
- common_validations(object, meta)
+ def stringify_keys(object) do
+ object
+ |> 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