summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-06-30 09:28:17 +0000
committerlain <lain@soykaf.club>2024-06-30 09:28:17 +0000
commitccbbee7963c8d67b99a44849000f7ac7d6b19109 (patch)
treeb1a614d8aaddbd985d8c52bf4e316c762ad9746b /lib
parent801a9367d00c0e036d1c157d6ca5c4e46bd0d95f (diff)
parentabbc5b6e480ae7f376d5a75931ff03d95178c38d (diff)
downloadpleroma-ccbbee7963c8d67b99a44849000f7ac7d6b19109.tar.gz
pleroma-ccbbee7963c8d67b99a44849000f7ac7d6b19109.zip
Merge branch 'exif' into 'develop'
Ensure StripLocation works for PNGs See merge request pleroma/pleroma!4167
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/upload/filter/exiftool/strip_location.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/upload/filter/exiftool/strip_location.ex b/lib/pleroma/upload/filter/exiftool/strip_location.ex
index 8becee712..1744a286d 100644
--- a/lib/pleroma/upload/filter/exiftool/strip_location.ex
+++ b/lib/pleroma/upload/filter/exiftool/strip_location.ex
@@ -16,7 +16,9 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do
- case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true) do
+ case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", "-png:all=", file],
+ parallelism: true
+ ) do
{_response, 0} -> {:ok, :filtered}
{error, 1} -> {:error, error}
end