a1batross/pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

ChatMessageValidator: Require published field

Browse Source
This commit is contained in:
lain 2020-04-20 13:14:59 +02:00
parent 139b9d1338
commit b836d3d104
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/builder.ex
View File

@ -17,7 +17,8 @@ defmodule Pleroma.Web.ActivityPub.Builder do
"actor" => actor.ap_id, "actor" => actor.ap_id,
"to" => recipients, "to" => recipients,
"object" => object_id, "object" => object_id,
"type" => "Create" "type" => "Create",
"published" => DateTime.utc_now() |> DateTime.to_iso8601()
}, []} }, []}
end end
@ -28,7 +29,8 @@ defmodule Pleroma.Web.ActivityPub.Builder do
"actor" => actor.ap_id, "actor" => actor.ap_id,
"type" => "ChatMessage", "type" => "ChatMessage",
"to" => [recipient], "to" => [recipient],
"content" => content "content" => content,
"published" => DateTime.utc_now() |> DateTime.to_iso8601()
}, []} }, []}
end end

2
lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
View File

@ -54,7 +54,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ChatMessageValidator do
def validate_data(data_cng) do def validate_data(data_cng) do
data_cng data_cng
|> validate_inclusion(:type, ["ChatMessage"]) |> validate_inclusion(:type, ["ChatMessage"])
|> validate_required([:id, :actor, :to, :type, :content]) |> validate_required([:id, :actor, :to, :type, :content, :published])
|> validate_length(:to, is: 1) |> validate_length(:to, is: 1)
|> validate_length(:content, max: Pleroma.Config.get([:instance, :remote_limit])) |> validate_length(:content, max: Pleroma.Config.get([:instance, :remote_limit]))
|> validate_local_concern() |> validate_local_concern()