summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2023-01-05 16:50:02 +0000
committerlain <lain@soykaf.club>2023-01-05 16:50:02 +0000
commit2a244b391d8c1d9d8e960532758110928cb5ef7c (patch)
tree6bd87bfbb785577ebbe661a3e5590e2489f98bf6 /lib
parent51b4513258890e68294603f6f3dc432f12d2b383 (diff)
parentfe00fbfd548f0564170ac124e3d8b9574036c303 (diff)
downloadpleroma-2a244b391d8c1d9d8e960532758110928cb5ef7c.tar.gz
pleroma-2a244b391d8c1d9d8e960532758110928cb5ef7c.zip
Merge branch '2768-strip-location' into 'develop'
Resolve "Exiftool may conflict with SVG files" Closes #2768 See merge request pleroma/pleroma!3829
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/upload/filter/exiftool/strip_location.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/upload/filter/exiftool/strip_location.ex b/lib/pleroma/upload/filter/exiftool/strip_location.ex
index 6100527d3..f2bcc4622 100644
--- a/lib/pleroma/upload/filter/exiftool/strip_location.ex
+++ b/lib/pleroma/upload/filter/exiftool/strip_location.ex
@@ -14,6 +14,7 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
# Formats not compatible with exiftool at this time
def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
+ def filter(%Pleroma.Upload{content_type: "image/svg" <> _}), do: {:ok, :noop}
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do