diff options
| author | lain <lain@soykaf.club> | 2021-12-09 16:05:06 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-12-09 16:05:06 +0000 |
| commit | fb0aa0661c0a2a8da85973e2c3f9567e83cba587 (patch) | |
| tree | 620a5c8b71e99cf4f4ad548ae3cd9506f3d52a97 /lib/pleroma | |
| parent | 60295b58f9ce8937136f6922ca3b7a8aa584d86e (diff) | |
| parent | 01cc099c8ef40efe72b611bc0925a62e5dfd057d (diff) | |
| download | pleroma-2795-small-fix-for-elixir-1-13.tar.gz | |
Merge branch 'fix-attachment-dimensions' into 'develop'2795-small-fix-for-elixir-1-13
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex | 10 |
1 files changed, 6 insertions, 4 deletions
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 837787b9f..59fef42d6 100644 --- a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex @@ -68,12 +68,14 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do end end - defp handle_href(href, mediaType) do + defp handle_href(href, mediaType, data) do [ %{ "href" => href, "type" => "Link", - "mediaType" => mediaType + "mediaType" => mediaType, + "width" => data["width"], + "height" => data["height"] } ] end @@ -81,10 +83,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do 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 -> - Map.put(data, "url", handle_href(data["href"], data["mediaType"])) + Map.put(data, "url", handle_href(data["href"], data["mediaType"], data)) true -> data |