github-mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-04-24 05:47:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add AttachmentValidator for NoteValidator

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-05-06 03:35:58 +02:00
parent 7612d9403d
commit a1fd83164d
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 77 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

73
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex Normal file
View file

@ -0,0 +1,73 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
use Ecto.Schema
alias Pleroma.Web.ActivityPub.ObjectValidators
alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
@primary_key false
embedded_schema do
embeds_one(:url, ObjectValidators.AttachmentURLValidator)
field(:mediaType, :string)
field(:type, :string)
field(:name, :string)
end
def cast_and_validate(data) do
data
|> cast_data()
|> validate_data()
end
def cast_data(data) do
%__MODULE__{}
|> cast(data, __schema__(:fields))
end
def validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Audio", "Video", "Image", "Document", "Link"])
|> validate_format(:mediaType, ~r[.+/.+])
|> validate_required([:url])
end
end
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentURLValidator do
use Ecto.Schema
alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
@primary_key false
embedded_schema do
field(:href, Types.Uri)
field(:mediaType, :string)
field(:type, :string)
end
def cast_and_validate(data) do
data
|> cast_data()
|> validate_data()
end
def cast_data(data) do
%__MODULE__{}
|> cast(data, __schema__(:fields))
end
def validate_data(data_cng) do
data_cng
|> validate_inclusion(:type, ["Audio", "Video", "Image", "Link"])
|> validate_format(:mediaType, ~r[.+/.+])
|> validate_required([:href])
end
end

7
lib/pleroma/web/activity_pub/object_validators/note_validator.ex
View file

@ -5,6 +5,7 @@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator do
use Ecto.Schema
alias Pleroma.Web.ActivityPub.ObjectValidators
alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
@ -29,8 +30,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator do
# TODO: Write type
field(:emoji, :map, default: %{})
field(:sensitive, :boolean, default: false)
# TODO: Write type
field(:attachment, {:array, :map}, default: [])
embeds_many(:attachment, ObjectValidators.AttachmentValidator)
field(:replies_count, :integer, default: 0)
field(:like_count, :integer, default: 0)
field(:announcement_count, :integer, default: 0)
@ -53,7 +53,8 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator do
def cast_data(data) do
%__MODULE__{}
|> cast(data, __schema__(:fields))
|> cast(data, __schema__(:fields) -- [:attachment])
|> cast_embed(:attachment)
end
def validate_data(data_cng) do