projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into attachment-meta
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
create_generic_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
index 60868eae08ac83c1fd326227bdae9548d97b777f..e06e442f41a0bf49fc330ea57eccc06984f75b18 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/create_generic_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
# Code based on CreateChatMessageValidator
# SPDX-License-Identifier: AGPL-3.0-only
# Code based on CreateChatMessageValidator
@@
-10,9
+10,10
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
+ alias Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes
+ alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
import Ecto.Changeset
import Ecto.Changeset
- import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@primary_key false
@primary_key false
@@
-61,17
+62,29
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
end
end
end
end
+ defp fix_addressing(data, meta) do
+ if object = meta[:object_data] do
+ data
+ |> Map.put_new("to", object["to"] || [])
+ |> Map.put_new("cc", object["cc"] || [])
+ else
+ data
+ end
+ end
+
defp fix(data, meta) do
data
|> fix_context(meta)
defp fix(data, meta) do
data
|> fix_context(meta)
+ |> fix_addressing(meta)
+ |> CommonFixes.fix_actor()
end
end
- def
validate_data(cng, meta \\ []
) do
+ def
p validate_data(cng, meta
) do
cng
|> validate_required([:actor, :type, :object])
|> validate_inclusion(:type, ["Create"])
cng
|> validate_required([:actor, :type, :object])
|> validate_inclusion(:type, ["Create"])
- |> validate_actor_presence()
- |> validate_any_presence([:to, :cc])
+ |>
CommonValidations.
validate_actor_presence()
+ |>
CommonValidations.
validate_any_presence([:to, :cc])
|> validate_actors_match(meta)
|> validate_context_match(meta)
|> validate_object_nonexistence()
|> validate_actors_match(meta)
|> validate_context_match(meta)
|> validate_object_nonexistence()