From f659c9c60ed487f7c8473428f6222293b169fcde Mon Sep 17 00:00:00 2001
From: Anonymous <Anonymous@localhost>
Date: Wed, 12 Jan 2022 21:57:13 +0100
Subject: [PATCH] Added second null guard

---
 main.meta.js |  2 +-
 main.user.js | 10 +++++-----
 src/main.ts  |  5 ++---
 src/utils.ts |  5 +++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main.meta.js b/main.meta.js
index 5405f53..70503e4 100644
--- a/main.meta.js
+++ b/main.meta.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         PNGExtraEmbed2
 // @namespace    https://coom.tech/
-// @version      0.143
+// @version      0.144
 // @description  uhh
 // @author       You
 // @match        https://boards.4channel.org/*
diff --git a/main.user.js b/main.user.js
index 632fb85..95a1588 100644
--- a/main.user.js
+++ b/main.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         PNGExtraEmbed2
 // @namespace    https://coom.tech/
-// @version      0.143
+// @version      0.144
 // @description  uhh
 // @author       You
 // @match        https://boards.4channel.org/*
@@ -11435,7 +11435,7 @@
           thumb = import_buffer2.Buffer.from(await (await GM_fetch(pee, { headers: { "user-agent": "", range: `bytes=${ptr + 4}-${ptr + 4 + thumbsize}` } })).arrayBuffer());
         }
         return {
-          embed_type: 2 /* MEDIA_EMBED */,
+          embed_type: 1 /* EXTERNAL_POMF */,
           filename: fn,
           tags: tags.length > 0 ? tags : void 0,
           data: async (lsn) => import_buffer2.Buffer.from(await (await GM_fetch(pee, { headers: { "user-agent": "", range: `bytes=${ptr + 4 + thumbsize}-${size - 1}` } }, lsn)).arrayBuffer()),
@@ -11444,6 +11444,7 @@
       } catch (e) {
         console.warn(e);
       }
+      console.warn("Returning empty: failed fetching media from 'utils.ts'.");
       return;
     }))).map((e) => e);
   };
@@ -17139,10 +17140,9 @@
     res2 = res2?.filter((e) => e);
     if (!res2 || res2.length == 0)
       return;
-    let filtered = res2?.filter((e) => e != null);
+    let filtered = res2?.filter((e) => e != null && e[0] != null);
     if (filtered.length === 0) {
-      console.warn("ImageProcessors returned empty for post.");
-      console.warn(post);
+      console.debug(`ImageProcessors returned empty for post: '${post.dataset.fullID}'`);
       return;
     }
     processAttachments(post, filtered.flatMap((e) => e[0].map((k) => {
diff --git a/src/main.ts b/src/main.ts
index a98baf9..4d141d2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -180,10 +180,9 @@ const processPost = async (post: HTMLDivElement) => {
         return;
 
     // processAttachments(post, res2?.flatMap(e => e![0].map(k => [k, e![1]] as [EmbeddedFile, boolean])));
-    let filtered = res2?.filter(e => e != null) as [EmbeddedFile[], EMBED_TYPES][];
+    let filtered = res2?.filter(e => (e != null && e[0] != null)) as [EmbeddedFile[], EMBED_TYPES][]
     if(filtered.length === 0){
-        console.warn("ImageProcessors returned empty for post.")
-        console.warn(post)
+        console.debug(`ImageProcessors returned empty for post: '${post.dataset.fullID}'`);
         return;
     }
     processAttachments(post, filtered.flatMap(e =>
diff --git a/src/utils.ts b/src/utils.ts
index 5853550..346d1fb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -113,7 +113,7 @@ export const decodeCoom3Payload = async (buff: Buffer) : Promise<(EmbeddedFile |
                 thumb = Buffer.from(await (await GM_fetch(pee, { headers: { 'user-agent': '', range: `bytes=${ptr + 4}-${ptr + 4 + thumbsize}` } })).arrayBuffer());
             }
             return {
-                embed_type: EMBED_TYPES.MEDIA_EMBED,
+                embed_type: EMBED_TYPES.EXTERNAL_POMF,
                 filename: fn,
                 tags: tags.length > 0 ? tags : undefined,
                 data: async (lsn) =>
@@ -124,7 +124,8 @@ export const decodeCoom3Payload = async (buff: Buffer) : Promise<(EmbeddedFile |
             // niggers trying to fuck with bad links
             console.warn(e);
         }
-        return;
+        console.warn("Returning empty: failed fetching media from 'utils.ts'.")
+        return; // void
     }))).map(e => e);
 };