projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maintenance: dependency upgrade (#81)
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
attachment_validator.ex
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 3175427adc981fd87d7743f6da10a374fbe26078..ffdb16976f30263fc71b7f7dea9592eff4d5b4e3 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@
-6,7
+6,6
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
use Ecto.Schema
alias Pleroma.EctoType.ActivityPub.ObjectValidators
use Ecto.Schema
alias Pleroma.EctoType.ActivityPub.ObjectValidators
- alias Pleroma.Web.ActivityPub.ObjectValidators.UrlObjectValidator
import Ecto.Changeset
import Ecto.Changeset
@@
-21,6
+20,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
field(:type, :string)
field(:href, ObjectValidators.Uri)
field(:mediaType, :string, default: "application/octet-stream")
field(:type, :string)
field(:href, ObjectValidators.Uri)
field(:mediaType, :string, default: "application/octet-stream")
+ field(:width, :integer)
+ field(:height, :integer)
end
end
end
end
@@
-43,16
+44,16
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
struct
|> cast(data, [:type, :mediaType, :name, :blurhash])
struct
|> cast(data, [:type, :mediaType, :name, :blurhash])
- |> cast_embed(:url, with: &url_changeset/2)
+ |> cast_embed(:url, with: &url_changeset/2
, required: true
)
|> validate_inclusion(:type, ~w[Link Document Audio Image Video])
|> validate_inclusion(:type, ~w[Link Document Audio Image Video])
- |> validate_required([:type, :mediaType
, :url
])
+ |> validate_required([:type, :mediaType])
end
def url_changeset(struct, data) do
data = fix_media_type(data)
struct
end
def url_changeset(struct, data) do
data = fix_media_type(data)
struct
- |> cast(data, [:type, :href, :mediaType])
+ |> cast(data, [:type, :href, :mediaType
, :width, :height
])
|> validate_inclusion(:type, ["Link"])
|> validate_required([:type, :href, :mediaType])
end
|> validate_inclusion(:type, ["Link"])
|> validate_required([:type, :href, :mediaType])
end
@@
-60,19
+61,21
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
def fix_media_type(data) do
data = Map.put_new(data, "mediaType", data["mimeType"])
def fix_media_type(data) do
data = Map.put_new(data, "mediaType", data["mimeType"])
- if
MIME.valid?(data["mediaType"])
do
+ if
is_bitstring(data["mediaType"]) && MIME.extensions(data["mediaType"]) != []
do
data
else
Map.put(data, "mediaType", "application/octet-stream")
end
end
data
else
Map.put(data, "mediaType", "application/octet-stream")
end
end
- defp handle_href(href, mediaType) do
+ defp handle_href(href, mediaType
, data
) do
[
%{
"href" => href,
"type" => "Link",
[
%{
"href" => href,
"type" => "Link",
- "mediaType" => mediaType
+ "mediaType" => mediaType,
+ "width" => data["width"],
+ "height" => data["height"]
}
]
end
}
]
end
@@
-80,19
+83,19
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
defp fix_url(data) do
cond do
is_binary(data["url"]) ->
defp fix_url(data) do
cond do
is_binary(data["url"]) ->
- Map.put(data, "url", handle_href(data["url"], data["mediaType"]))
+ Map.put(data, "url", handle_href(data["url"], data["mediaType"]
, data
))
is_binary(data["href"]) and data["url"] == nil ->
is_binary(data["href"]) and data["url"] == nil ->
- Map.put(data, "url", handle_href(data["href"], data["mediaType"]))
+ Map.put(data, "url", handle_href(data["href"], data["mediaType"]
, data
))
true ->
data
end
end
true ->
data
end
end
- def validate_data(cng) do
+ def
p
validate_data(cng) do
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
- |> validate_required([:mediaType, :
url, :
type])
+ |> validate_required([:mediaType, :type])
end
end
end
end