PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-03-31 00:37:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

continually trying to add webp

Browse source
This commit is contained in:
Chaska 2024-04-26 01:42:10 -05:00
parent 92bdeefb9a
commit fc4529a3e0
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena/adverts/advert.ex
View file

@ -59,7 +59,7 @@ defmodule Philomena.Adverts.Advert do
:removed_image :removed_image
]) ])
|> validate_required([:image]) |> validate_required([:image])
|> validate_inclusion(:image_mime_type, ["image/png", "image/jpeg", "image/gif"]) |> validate_inclusion(:image_mime_type, ["image/png", "image/jpeg", "image/webp", "image/gif"])
|> validate_inclusion(:image_width, 699..729) |> validate_inclusion(:image_width, 699..729)
|> validate_inclusion(:image_height, 79..91) |> validate_inclusion(:image_height, 79..91)
|> validate_inclusion(:image_size, 0..950_000) |> validate_inclusion(:image_size, 0..950_000)

2
lib/philomena/images/image.ex
View file

@ -166,7 +166,7 @@ defmodule Philomena.Images.Image do
|> validate_length(:image_name, max: 255, count: :bytes) |> validate_length(:image_name, max: 255, count: :bytes)
|> validate_inclusion( |> validate_inclusion(
:image_mime_type, :image_mime_type,
~W(image/gif image/jpeg image/png image/svg+xml video/webm), ~W(image/gif image/jpeg image/png image/svg+xml image/webp video/webm),
message: "(#{attrs["image_mime_type"]}) is invalid" message: "(#{attrs["image_mime_type"]}) is invalid"
) )
|> check_dimensions() |> check_dimensions()

2
lib/philomena/mime.ex
View file

@ -30,7 +30,7 @@ defmodule Philomena.Mime do
def true_mime("audio/webm"), do: {:ok, "video/webm"} def true_mime("audio/webm"), do: {:ok, "video/webm"}
def true_mime(mime) def true_mime(mime)
when mime in ~W(image/gif image/jpeg image/png image/svg+xml video/webm), when mime in ~W(image/gif image/jpeg image/png image/webp image/svg+xml video/webm),
do: {:ok, mime} do: {:ok, mime}
def true_mime(mime), do: {:unsupported_mime, mime} def true_mime(mime), do: {:unsupported_mime, mime}

2
lib/philomena/scrapers/raw.ex
View file

@ -1,5 +1,5 @@
defmodule Philomena.Scrapers.Raw do defmodule Philomena.Scrapers.Raw do
@mime_types ["image/gif", "image/jpeg", "image/png", "image/svg", "image/svg+xml", "video/webm"] @mime_types ["image/gif", "image/jpeg", "image/png", "image/svg", "image/webp", "image/svg+xml", "video/webm"]
@spec can_handle?(URI.t(), String.t()) :: true | false @spec can_handle?(URI.t(), String.t()) :: true | false
def can_handle?(_uri, url) do def can_handle?(_uri, url) do

2
lib/philomena/tags/tag.ex
View file

@ -118,7 +118,7 @@ defmodule Philomena.Tags.Tag do
tag tag
|> cast(attrs, [:image, :image_format, :image_mime_type, :uploaded_image]) |> cast(attrs, [:image, :image_format, :image_mime_type, :uploaded_image])
|> validate_required([:image, :image_format, :image_mime_type]) |> validate_required([:image, :image_format, :image_mime_type])
|> validate_inclusion(:image_mime_type, ~W(image/gif image/jpeg image/png image/svg+xml)) |> validate_inclusion(:image_mime_type, ~W(image/gif image/jpeg image/png image/webp image/svg+xml))
end end
def remove_image_changeset(tag) do def remove_image_changeset(tag) do

2
lib/philomena/users/user.ex
View file

@ -410,7 +410,7 @@ defmodule Philomena.Users.User do
|> validate_number(:avatar_size, greater_than: 0, less_than_or_equal_to: 300_000) |> validate_number(:avatar_size, greater_than: 0, less_than_or_equal_to: 300_000)
|> validate_number(:avatar_width, greater_than: 0, less_than_or_equal_to: 1000) |> validate_number(:avatar_width, greater_than: 0, less_than_or_equal_to: 1000)
|> validate_number(:avatar_height, greater_than: 0, less_than_or_equal_to: 1000) |> validate_number(:avatar_height, greater_than: 0, less_than_or_equal_to: 1000)
|> validate_inclusion(:avatar_mime_type, ~W(image/gif image/jpeg image/png)) |> validate_inclusion(:avatar_mime_type, ~W(image/gif image/jpeg image/png image/webp))
end end
def remove_avatar_changeset(user) do def remove_avatar_changeset(user) do

2
lib/philomena_web/views/duplicate_report_view.ex
View file

@ -3,7 +3,7 @@ defmodule PhilomenaWeb.DuplicateReportView do
alias PhilomenaWeb.ImageView alias PhilomenaWeb.ImageView
@formats_order ~W(video/webm image/svg+xml image/png image/gif image/jpeg other) @formats_order ~W(video/webm image/svg+xml image/png image/gif image/jpeg image/webp other)
def comparison_url(conn, image), def comparison_url(conn, image),
do: ImageView.thumb_url(image, can?(conn, :show, image), :full) do: ImageView.thumb_url(image, can?(conn, :show, image), :full)