a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Rename to make it obvious this is for images not videos

This commit is contained in:
Mark Felder 2020-08-26 16:40:13 -05:00
parent 2cfe2dc81b
commit 9567b96c79
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/helpers/media_helper.ex
View File

@ -11,7 +11,7 @@ defmodule Pleroma.Helpers.MediaHelper do
def image_resize(url, options) do
with executable when is_binary(executable) <- System.find_executable("convert"),
{:ok, args} <- prepare_resize_args(options),
{:ok, args} <- prepare_image_resize_args(options),
url = Pleroma.Web.MediaProxy.url(url),
{:ok, env} <- Pleroma.HTTP.get(url),
{:ok, fifo_path} <- mkfifo()
@ -23,7 +23,7 @@ defmodule Pleroma.Helpers.MediaHelper do
end
end
defp prepare_resize_args(%{max_width: max_width, max_height: max_height} = options) do
defp prepare_image_resize_args(%{max_width: max_width, max_height: max_height} = options) do
quality = options[:quality] || 85
resize = Enum.join([max_width, "x", max_height, ">"])
args = [
@ -34,7 +34,7 @@ defmodule Pleroma.Helpers.MediaHelper do
{:ok, args}
end
defp prepare_resize_args(_), do: {:error, :missing_options}
defp prepare_image_resize_args(_), do: {:error, :missing_options}
defp run_fifo(fifo_path, env, executable, args) do
args = List.flatten([fifo_path, args, "jpg:-"])