From b9d998bdbe8b12aaff6f813b17c28397df791fe5 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 25 Oct 2022 17:41:18 +0200
Subject: [PATCH] use imagemagick in all cases

---
 files/helpers/media.py | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/files/helpers/media.py b/files/helpers/media.py
index a3460f8ee..e9e457c79 100644
--- a/files/helpers/media.py
+++ b/files/helpers/media.py
@@ -130,28 +130,13 @@ def process_image(filename=None, resize=0, trim=False, uploader=None, patron=Fal
 		os.remove(filename)
 		abort(413, f"Max image/audio size is {MAX_IMAGE_AUDIO_SIZE_MB} MB ({MAX_IMAGE_AUDIO_SIZE_MB_PATRON} MB for paypigs)")
 
-	i = Image.open(filename)
+	with Image.open(filename) as i:
+		params = ["convert", filename, "-coalesce"]
+		if trim and len(list(Iterator(i))) == 1: params.append("-trim")
+		if resize and i.width > resize: params.extend(["-resize", f"{resize}>"])
 
-	if resize and i.width > resize:
-		if trim and len(list(Iterator(i))) == 1:
-			subprocess.run(["convert", filename, "-coalesce", "-trim", "-resize", f"{resize}>", filename])
-		else:
-			try: subprocess.run(["convert", filename, "-coalesce", "-resize", f"{resize}>", filename])
-			except: pass
-	elif i.format.lower() != "webp":
-
-		exif = i.getexif()
-		for k in exif.keys():
-			if k != 0x0112:
-				exif[k] = None
-				del exif[k]
-		i.info["exif"] = exif.tobytes()
-
-		if i.format.lower() == "gif":
-			gifwebp(input_image=filename, output_image=filename, option="-mixed -metadata none -f 100 -mt -m 6")
-		else:
-			i = ImageOps.exif_transpose(i)
-			i.save(filename, format="WEBP", method=6, quality=88)
+	params.append(filename)
+	subprocess.run(params)
 
 
 	if resize: