aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-09-01 21:21:58 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-09-01 21:21:58 +0300
commit6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b (patch)
treefb890c7e5d5a169543218fac2b678f311a22f452 /lib
parent0a839d51a7adb034d6514ea647d90546c829813d (diff)
downloadpleroma-6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b.tar.gz
[#2497] Fix for png media proxy preview response headers (content-type & content-disposition).
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/media_proxy/media_proxy_controller.ex10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index 2afcd861a..961c73666 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -67,7 +67,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
end
end
- # TODO: find a workaround so avatar_static and banner_static can work.
+ # TODO: find a workaround so avatar_static and header_static can work.
# Those only permit GIFs for animation, so we have to permit a way to
# allow those to get real static variants.
defp handle_preview("image/gif" = _content_type, conn, url) do
@@ -107,7 +107,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
}
) do
conn
- |> put_preview_response_headers()
+ |> put_preview_response_headers("image/png", "preview.png")
|> send_resp(200, thumbnail_binary)
else
_ ->
@@ -145,10 +145,10 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
end
end
- defp put_preview_response_headers(conn) do
+ defp put_preview_response_headers(conn, content_type \\ "image/jpeg", filename \\ "preview.jpg") do
conn
- |> put_resp_header("content-type", "image/jpeg")
- |> put_resp_header("content-disposition", "inline; filename=\"preview.jpg\"")
+ |> put_resp_header("content-type", content_type)
+ |> put_resp_header("content-disposition", "inline; filename=\"#{filename}\"")
|> put_resp_header("cache-control", "max-age=0, private, must-revalidate")
end