projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
object_validators: Group common fields in CommonValidations
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
undo_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
index d0ba418e8c289a91fa8e131b297a136fc7806d05..703643e3f1d841ff53b8e87957a6a3eb049c5166 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
@@
-1,12
+1,12
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UndoValidator do
use Ecto.Schema
alias Pleroma.Activity
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UndoValidator do
use Ecto.Schema
alias Pleroma.Activity
- alias Pleroma.
Web.ActivityPub.ObjectValidators.Types
+ alias Pleroma.
User
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@@
-14,12
+14,13
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UndoValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id, Types.ObjectID, primary_key: true)
- field(:type, :string)
- field(:object, Types.ObjectID)
- field(:actor, Types.ObjectID)
- field(:to, {:array, :string}, default: [])
- field(:cc, {:array, :string}, default: [])
+ quote do
+ unquote do
+ import Elixir.Pleroma.Web.ActivityPub.ObjectValidators.CommonFields
+ message_fields()
+ activity_fields()
+ end
+ end
end
def cast_and_validate(data) do
end
def cast_and_validate(data) do
@@
-38,11
+39,11
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UndoValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Undo"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
data_cng
|> validate_inclusion(:type, ["Undo"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
- |> validate_
actor_presence(
)
+ |> validate_
undo_actor(:actor
)
|> validate_object_presence()
|> validate_undo_rights()
end
|> validate_object_presence()
|> validate_undo_rights()
end
@@
-59,4
+60,13
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UndoValidator do
_ -> cng
end
end
_ -> cng
end
end
+
+ defp validate_undo_actor(cng, field_name) do
+ validate_change(cng, field_name, fn field_name, actor ->
+ case User.get_cached_by_ap_id(actor) do
+ %User{} -> []
+ _ -> [{field_name, "can't find user"}]
+ end
+ end)
+ end
end
end