2 files changed, 10 insertions, 4 deletions

diff --git a/src/mixins/post.pug b/src/mixins/post.pug
index 76fa1b8..4287801 100644
--- a/src/mixins/post.pug
+++ b/src/mixins/post.pug
@@ -26,7 +26,7 @@ mixin post(p)
           img(src=item.url onclick=`toggleDetails('${p.id}')`) 
         else if isPostImage(p)
           - var url = postThumbnail(p)
-          img(src=url onclick=`toggleDetails('${p.id}')`) 
+          img(src=url onclick=`toggleDetails('${p.id}')`)
         else if isPostVideo(p)
           - var url = p.secure_media.reddit_video.scrubber_media_url
           video(src=url data-dashjs-player width='100px' height='100px' onclick=`toggleDetails('${p.id}')`)
diff --git a/src/mixins/postUtils.pug b/src/mixins/postUtils.pug
index 555e388..816adf7 100644
--- a/src/mixins/postUtils.pug
+++ b/src/mixins/postUtils.pug
@@ -4,12 +4,18 @@
   }
 -
   function isPostImage(p) {
-    return (p.post_hint == "image" && p.thumbnail && p.thumbnail != "self" && p.thumbnail != "default");
+    const imgRe = /\.(png|jpg|jpeg|gif|webp|bmp|tiff|svg)$/i;
+    return (p.post_hint == "image" && p.thumbnail && p.thumbnail != "self" && p.thumbnail != "default")
+      || imgRe.test(p.url);
   }
 -
   function postThumbnail(p) {
-    if (p.thumbnail == "image") {
-        return p.url
+    if (p.thumbnail == "image" || p.thumbnail == "") {
+        return p.url;
+    } else if (p.over_18) {
+        return "/nsfw.svg";
+    } else if (p.thumbnail == "spoiler") {
+        return "/spoiler.svg";
     } else {
         return p.thumbnail;
     }