projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix multi-after-transaction
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
create_chat_message_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/create_chat_message_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/create_chat_message_validator.ex
index fc582400b5ff7dc2831b90165e2eb4e85f748a9a..6551f64cac69d66d5a5a46f9558d3004f3c05532 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/create_chat_message_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/create_chat_message_validator.ex
@@
-1,5
+1,5
@@
# 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
# NOTES
# SPDX-License-Identifier: AGPL-3.0-only
# NOTES
@@
-7,9
+7,9
@@
# - doesn't embed, will only get the object id
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
use Ecto.Schema
# - doesn't embed, will only get the object id
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
use Ecto.Schema
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.Object
- alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@@
-17,11
+17,16
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id, Types.ObjectID, primary_key: true)
- field(:actor, Types.ObjectID)
+ quote do
+ unquote do
+ import Elixir.Pleroma.Web.ActivityPub.ObjectValidators.CommonFields
+ activity_fields()
+ end
+ end
+
+ field(:id, ObjectValidators.ObjectID, primary_key: true)
field(:type, :string)
field(:type, :string)
- field(:to, Types.Recipients, default: [])
- field(:object, Types.ObjectID)
+ field(:to, ObjectValidators.Recipients, default: [])
end
def cast_and_apply(data) do
end
def cast_and_apply(data) do
@@
-39,7
+44,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
|> validate_data(meta)
end
|> validate_data(meta)
end
- def
validate_data(cng, meta \\ []
) do
+ def
p validate_data(cng, meta
) do
cng
|> validate_required([:id, :actor, :to, :type, :object])
|> validate_inclusion(:type, ["Create"])
cng
|> validate_required([:id, :actor, :to, :type, :object])
|> validate_inclusion(:type, ["Create"])