Page MenuHomePhorge

No OneTemporary

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None
diff --git a/changelog.d/media-preview-avif-accept.fix b/changelog.d/media-preview-avif-accept.fix
new file mode 100644
index 000000000..33f5acb1e
--- /dev/null
+++ b/changelog.d/media-preview-avif-accept.fix
@@ -0,0 +1 @@
+Media preview proxy: honor the AVIF Accept quality value; `image/avif;q=0` no longer selects AVIF.
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index 0e40b069c..25b718df6 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -86,7 +86,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
accepts_avif? =
conn
|> get_req_header("accept")
- |> Enum.any?(&String.contains?(&1, "image/avif"))
+ |> Enum.flat_map(&Plug.Conn.Utils.list/1)
+ |> Enum.any?(&accepts_avif?/1)
conn
|> put_resp_header("vary", "accept")
@@ -96,6 +97,15 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
end
end
+ defp accepts_avif?(media_range) do
+ with {:ok, "image", "avif", params} <- Plug.Conn.Utils.media_type(media_range),
+ {quality, ""} <- Float.parse(Map.get(params, "q", "1")) do
+ quality > 0 and quality <= 1
+ else
+ _ -> false
+ end
+ end
+
defp handle_preview(conn, url, dimensions) do
media_proxy_url = MediaProxy.url(url)
http_client_opts = Pleroma.Config.get([:media_proxy, :proxy_opts, :http], pool: :media)
diff --git a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
index 420f1e8a5..596d5909d 100644
--- a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
+++ b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
@@ -421,7 +421,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
response =
conn
- |> put_req_header("accept", "image/avif,image/webp,*/*")
+ |> put_req_header("accept", "IMAGE/AVIF; q=0.5,image/webp,*/*")
|> get(url <> "?size=300")
assert response.status == 200
@@ -468,6 +468,33 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
assert Conn.get_resp_header(response, "vary") == ["accept"]
end
+ @tag skip: @avif_skip
+ test "AVIF requires an explicit media range with positive quality", %{
+ conn: conn,
+ url: url,
+ media_proxy_url: media_proxy_url
+ } do
+ clear_config([:media_preview_proxy, :image_sizes], [300])
+ clear_config([:media_preview_proxy, :avif], true)
+ mock_image(media_proxy_url, "image/jpeg", "test/fixtures/image.jpg")
+
+ for accept <- [
+ "image/avif;q=0,image/jpeg,*/*",
+ "image/avif; q=0.000, image/*;q=1",
+ "image/avif;q=invalid",
+ "image/avif;q=0.5invalid",
+ "image/avif;q=1.1",
+ "image/avif-sequence,*/*",
+ "image/jpeg; note=\"image/avif\""
+ ] do
+ response = conn |> put_req_header("accept", accept) |> get(url <> "?size=300")
+
+ assert response.status == 200
+ assert Conn.get_resp_header(response, "content-type") == ["image/jpeg"], accept
+ assert Conn.get_resp_header(response, "vary") == ["accept"]
+ end
+ end
+
test "with AVIF off, a size stays JPEG and does not vary", %{
conn: conn,
url: url,

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 17, 10:19 PM (17 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1839836
Default Alt Text
(3 KB)

Event Timeline