Merge branch 'develop' into feld-2168-media-preview-proxy

[akkoma] / lib / pleroma / web / media_proxy / media_proxy_controller.ex

diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index b925973ba6cf587683a781da759b2c93397e4d20..d465ce8d10e530b036bbf789e986ffdc3bf7bcab 100644 (file)
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -65,10 +65,22 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
     end
   end
 
+  defp handle_preview("image/gif" = _content_type, conn, url) do
+    mediaproxy_url = url |> MediaProxy.url()
+
+    redirect(conn, external: mediaproxy_url)
+  end
+
   defp handle_preview("image/" <> _ = _content_type, conn, url) do
     handle_image_preview(conn, url)
   end
 
+  defp handle_preview("video/" <> _ = _content_type, conn, url) do
+    mediaproxy_url = url |> MediaProxy.url()
+
+    redirect(conn, external: mediaproxy_url)
+  end
+
   defp handle_preview(content_type, conn, _url) do
     send_resp(conn, :unprocessable_entity, "Unsupported content type: #{content_type}.")
   end