projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validator.ex
b/lib/pleroma/web/activity_pub/object_validator.ex
index 539be11437f133b60b04cfa4ec50d8810e7dece3..dc4bce0595a12c409475206b2aed0e7222b7ce18 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidator do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidator do
@@
-17,20
+17,16
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidator do
def validate(object, meta)
def validate(%{"type" => "Like"} = object, meta) do
def validate(object, meta)
def validate(%{"type" => "Like"} = object, meta) do
- with {_, {:ok, object}} <-
- {:validate_object,
- object |> LikeValidator.cast_and_validate() |> Ecto.Changeset.apply_action(:insert)} 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}
object = stringify_keys(object |> Map.from_struct())
{:ok, object, meta}
- else
- e -> {:error, e}
end
end
def stringify_keys(object) do
object
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
end
def fetch_actor_and_object(object) do