projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
37a7f52
)
object_validators: Mark validate_data as private
author
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Tue, 12 Jan 2021 10:14:09 +0000
(11:14 +0100)
committer
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Thu, 1 Apr 2021 12:18:41 +0000
(14:18 +0200)
18 files changed:
lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/block_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/create_chat_message_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/follow_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/like_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/update_validator.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
index d31e780c393ee2e3985a19cdf0f7c6877374c182..b577a1044d852baab57fa189f47f78af65d3b6cd 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
@@
-27,7
+27,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AcceptRejectValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Accept", "Reject"])
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Accept", "Reject"])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
index b08a33e6869a01e8af4675d31f81432998bb6a85..5763417903056c2f79f994bf4cc806f049276a20 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
@@
-50,7
+50,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
cng
end
cng
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Announce"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
data_cng
|> validate_inclusion(:type, ["Announce"])
|> validate_required([:id, :type, :object, :actor, :to, :cc])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
index 15e4413cde58b90bd6ad94adb0d0b921ba6bab6e..c9bd9e42d9700d95c10d56340d353a90fa78c3a9 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
@@
-50,7
+50,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnswerValidator 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, ["Answer"])
|> validate_required([:id, :inReplyTo, :name, :attributedTo, :actor])
data_cng
|> validate_inclusion(:type, ["Answer"])
|> validate_required([:id, :inReplyTo, :name, :attributedTo, :actor])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
index 5910f4060639e0eb787891f4eb7e01f6908b4818..39ef6dc293cc484bf0df9fbf306e155724c55a6e 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
@@
-95,7
+95,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNoteValidator do
|> cast_embed(:tag)
end
|> cast_embed(:tag)
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Article", "Note"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
data_cng
|> validate_inclusion(:type, ["Article", "Note"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
index e7b3a39222a0cf04c150bb2a615dddb57d722ec9..4a0d1473de8e755f9def08c247641f7a21036e6e 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@
-89,7
+89,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
end
end
end
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
|> validate_required([:mediaType, :url, :type])
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
|> validate_required([:mediaType, :url, :type])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
index a04c95f4b1bf8b88428ad4a5a7e99dc032ff0282..8a5a605266d700d6ceb365db51fb0ed0664691af 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
@@
-137,7
+137,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AudioVideoValidator do
|> cast_embed(:tag)
end
|> cast_embed(:tag)
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Audio", "Video"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :attachment])
data_cng
|> validate_inclusion(:type, ["Audio", "Video"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :attachment])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/block_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/block_validator.ex
index c5f77bb76edb8c8cb485e59fdc08d8e00e81b803..88948135fc2f19fee402c5c6a5b9ad9a732927e0 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/block_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/block_validator.ex
@@
-26,7
+26,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.BlockValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Block"])
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Block"])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
index 1189778f20ff7ef06766f43546e6bdc72c8ee0fa..b153156b031cbe71e77bac71ea725366e5a66434 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/chat_message_validator.ex
@@
-67,7
+67,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.ChatMessageValidator do
|> cast_embed(:attachment)
end
|> cast_embed(:attachment)
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["ChatMessage"])
|> validate_required([:id, :actor, :to, :type, :published])
data_cng
|> validate_inclusion(:type, ["ChatMessage"])
|> validate_required([:id, :actor, :to, :type, :published])
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 8384c16a7ee5002a2e9ed3599e7d9627382f2747..7a31a99bfeb8be15b0947886c24cff31a2f2d65a 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
@@
-39,7
+39,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"])
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 bf56a918cfd0242a81e93833e1956b1ff9ae2991..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
@@
-79,7
+79,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
|> CommonFixes.fix_actor()
end
|> CommonFixes.fix_actor()
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"])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
index fc1a79a729486baf040a011f46acd5374d87d66e..7da67bf16bf6d845ca53fa007d8fc444e2f9fa47 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/delete_validator.ex
@@
-53,7
+53,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do
Tombstone
Video
}
Tombstone
Video
}
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Delete"])
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Delete"])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
index 1906e597e84beafdf0ad9c404dfc380659e82cd1..ec75665158b864a811f1283b48ff1bcd6a238f03 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
@@
-70,7
+70,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
end
end
end
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["EmojiReact"])
|> validate_required([:id, :type, :object, :actor, :context, :to, :cc, :content])
data_cng
|> validate_inclusion(:type, ["EmojiReact"])
|> validate_required([:id, :type, :object, :actor, :context, :to, :cc, :content])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/event_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/event_validator.ex
index 0112a074d477ec4c82ddb3f8561e28b6888134c1..d42458ef5c063551be246376a177155a5ad10c4d 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
@@
-86,7
+86,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EventValidator do
|> cast_embed(:tag)
end
|> cast_embed(:tag)
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Event"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
data_cng
|> validate_inclusion(:type, ["Event"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/follow_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/follow_validator.ex
index 6e428bacc991f6b670719ae03c8c1b29f7d1a802..239cee5e7a3f5ad97da792026127ad45a8d79157 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/follow_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/follow_validator.ex
@@
-27,7
+27,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.FollowValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Follow"])
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Follow"])
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 30c40b2380ad9f18b6d323aaf4bce83e86f83ec8..509da507b3493677b995881ece6b9e6591728bb4 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/like_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/like_validator.ex
@@
-76,7
+76,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
end
end
end
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Like"])
|> validate_required([:id, :type, :object, :actor, :context, :to, :cc])
data_cng
|> validate_inclusion(:type, ["Like"])
|> validate_required([:id, :type, :object, :actor, :context, :to, :cc])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
index 7acb1e9283104106515eb408fa67099aa64e7c6f..7012e2e1d922624b01f941527a6b51a9a56cf69c 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
@@
-100,7
+100,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
|> cast_embed(:tag)
end
|> cast_embed(:tag)
end
- def validate_data(data_cng) do
+ def
p
validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Question"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
data_cng
|> validate_inclusion(:type, ["Question"])
|> validate_required([:id, :actor, :attributedTo, :type, :context, :context_id])
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 783a79ddb98a5618791c5cb80b5cc1ba2f6e2e72..e8af60ffa9667bc79ecb0f9514a0804635a1b988 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/undo_validator.ex
@@
-38,7
+38,7
@@
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])
diff --git
a/lib/pleroma/web/activity_pub/object_validators/update_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/update_validator.ex
index a66d4140076925d9fc819989832faebe2b4960ae..6bb1dc7fa1f2c80d978296515d11446277b88634 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/update_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/update_validator.ex
@@
-28,7
+28,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.UpdateValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Update"])
cng
|> validate_required([:id, :type, :actor, :to, :cc, :object])
|> validate_inclusion(:type, ["Update"])