logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: f775a1931b4f5625ad61fce8fabeb089375a80ac
parent 4e37cd85ef5b1134913441166219f09220fd4942
Author: lain <lain@soykaf.club>
Date:   Tue, 19 Mar 2024 12:44:13 +0000

Merge branch 'transient-validators-defaults' into 'develop'

Set defaults values on transient objects (attachment, poll options) validators

See merge request pleroma/pleroma!4090

Diffstat:

Achangelog.d/transient-validators-defaults.change1+
Mlib/pleroma/web/activity_pub/object_validators/attachment_validator.ex4++--
Mlib/pleroma/web/activity_pub/object_validators/question_options_validator.ex4++--
3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog.d/transient-validators-defaults.change b/changelog.d/transient-validators-defaults.change @@ -0,0 +1 @@ +Set default values on validators for transient objects (attachment, poll options) diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex @@ -12,13 +12,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do @primary_key false embedded_schema do field(:id, :string) - field(:type, :string) + field(:type, :string, default: "Link") field(:mediaType, ObjectValidators.MIME, default: "application/octet-stream") field(:name, :string) field(:blurhash, :string) embeds_many :url, UrlObjectValidator, primary_key: false do - field(:type, :string) + field(:type, :string, default: "Link") field(:href, ObjectValidators.Uri) field(:mediaType, ObjectValidators.MIME, default: "application/octet-stream") field(:width, :integer) diff --git a/lib/pleroma/web/activity_pub/object_validators/question_options_validator.ex b/lib/pleroma/web/activity_pub/object_validators/question_options_validator.ex @@ -14,10 +14,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionOptionsValidator do embeds_one :replies, Replies, primary_key: false do field(:totalItems, :integer) - field(:type, :string) + field(:type, :string, default: "Collection") end - field(:type, :string) + field(:type, :string, default: "Note") end def changeset(struct, data) do