projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'preload-data' into 'develop'
[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 034f25492d5affab99bda6d113bc58c29c950419..493e4c24704cf72498ddd4a37a4e03e51ca7c7f8 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/like_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/like_validator.ex
@@
-5,8
+5,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
use Ecto.Schema
defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
use Ecto.Schema
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.Object
- alias Pleroma.Web.ActivityPub.ObjectValidators.Types
alias Pleroma.Web.ActivityPub.Utils
import Ecto.Changeset
alias Pleroma.Web.ActivityPub.Utils
import Ecto.Changeset
@@
-15,13
+15,13
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id,
Type
s.ObjectID, primary_key: true)
+ field(:id,
ObjectValidator
s.ObjectID, primary_key: true)
field(:type, :string)
field(:type, :string)
- field(:object,
Type
s.ObjectID)
- field(:actor,
Type
s.ObjectID)
+ field(:object,
ObjectValidator
s.ObjectID)
+ field(:actor,
ObjectValidator
s.ObjectID)
field(:context, :string)
field(:context, :string)
- field(:to,
Type
s.Recipients, default: [])
- field(:cc,
Type
s.Recipients, default: [])
+ field(:to,
ObjectValidator
s.Recipients, default: [])
+ field(:cc,
ObjectValidator
s.Recipients, default: [])
end
def cast_and_validate(data) do
end
def cast_and_validate(data) do
@@
-67,7
+67,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
with {[], []} <- {to, cc},
%Object{data: %{"actor" => actor}} <- Object.get_cached_by_ap_id(object),
with {[], []} <- {to, cc},
%Object{data: %{"actor" => actor}} <- Object.get_cached_by_ap_id(object),
- {:ok, actor} <-
Type
s.ObjectID.cast(actor) do
+ {:ok, actor} <-
ObjectValidator
s.ObjectID.cast(actor) do
cng
|> put_change(:to, [actor])
else
cng
|> put_change(:to, [actor])
else