From 3cc3a365c1949317f778315db4585c36d73c8409 Mon Sep 17 00:00:00 2001
From: lza_menace <lza_menace@protonmail.com>
Date: Fri, 2 Dec 2022 16:38:29 -0800
Subject: [PATCH] troubleshooting nsfw filter for gif

---
 nerochan/models.py                   |  8 +++-----
 nerochan/templates/artwork/show.html | 21 +++++++++------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/nerochan/models.py b/nerochan/models.py
index f68a801..ee4097d 100644
--- a/nerochan/models.py
+++ b/nerochan/models.py
@@ -114,20 +114,18 @@ class Artwork(pw.Model):
                 _frames = thumbnails(frames)
                 _image = next(_frames)
                 _image.info = image.info
-                
-                _image.save(t, format=image.format, save_all=True, append_images=list(_frames), disposal=2)
+                _image.save(t, save_all=True, append_images=list(_frames), disposal=2)
             else:
                 image.thumbnail(size, Image.ANTIALIAS)
                 if self.nsfw:
                     image = image.filter(ImageFilter.GaussianBlur(radius = 4))
                 image.save(t, format=image.format)
-            
-            
             image.close()
             self.thumbnail = _t
             self.save()
             return True
-        except:
+        except Exception as e:
+            print(e)
             return False
 
     class Meta:
diff --git a/nerochan/templates/artwork/show.html b/nerochan/templates/artwork/show.html
index deb3e80..7c5b813 100644
--- a/nerochan/templates/artwork/show.html
+++ b/nerochan/templates/artwork/show.html
@@ -11,19 +11,16 @@
 		</h6>
 		<p class="artworkDescription">{{ artwork.description }}</p>
 		<div class="row">
-			{% if not artwork.approved %}
-					{% if artwork.hidden %}
-						<a href="{{ url_for('artwork.manage', id=artwork.id, action='delete') }}"><button class="button-secondary">Delete</button></a>
-					{% else %}
-						<a href="{{ url_for('artwork.manage', id=artwork.id, action='reject') }}"><button class="button">Reject</button></a>
-					{% endif %}
-					<a href="{{ url_for('artwork.manage', id=artwork.id, action='approve') }}"><button class="button-primary">Approve</button></a>
-					
-			{% endif %}
 			{% if current_user.is_authenticated and current_user.is_admin %}
-				<span class="ml-4">
-					<a href="{{ url_for('artwork.manage', id=artwork.id, action='regenerate_thumbnail') }}"><button class="button">Regen Thumbnail</button></a>
-				</span>
+				<a href="{{ url_for('artwork.manage', id=artwork.id, action='regenerate_thumbnail') }}"><button class="button">Regen Thumbnail</button></a>
+			{% endif %}
+			{% if not artwork.approved %}
+				{% if artwork.hidden %}
+					<a href="{{ url_for('artwork.manage', id=artwork.id, action='delete') }}"><button class="button-secondary">Delete</button></a>
+				{% else %}
+					<a href="{{ url_for('artwork.manage', id=artwork.id, action='reject') }}"><button class="button">Reject</button></a>
+				{% endif %}
+				<a href="{{ url_for('artwork.manage', id=artwork.id, action='approve') }}"><button class="button-primary">Approve</button></a>
 			{% endif %}
 		</div>
 	</div>