Merge pull request #524 from aternosorg/safe-search

catch no data being returned from the safe search api
aternosorg · Nov 2, 2022 · 0f5ace9 · 0f5ace9
2 parents 98bfdab + f14c7f6
commit 0f5ace9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "modbot",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Discord Bot for the Aternos Discord server",
   "main": "index.js",
   "type": "module",

diff --git a/src/automod/SafeSearch.js b/src/automod/SafeSearch.js
@@ -51,6 +51,10 @@ export default class SafeSearch {
         let maxType = null, maxValue = null;
         for (const image of images.values()) {
             const safeSearchAnnotation = await this.request(image);
+            if (!safeSearchAnnotation) {
+                continue;
+            }
+
             for (const type of ['adult', 'medical', 'violence', 'racy']) {
                 const likelihood = this.getLikelihoodAsNumber(safeSearchAnnotation[type]);
                 if (!maxValue || likelihood > maxValue) {
@@ -76,8 +80,10 @@ export default class SafeSearch {
         }
 
         const [{safeSearchAnnotation}] = await this.annotatorClient.safeSearchDetection(image.url);
-        this.#cache.set(hash, safeSearchAnnotation, CACHE_DURATION);
-        await database.query('INSERT INTO safeSearch (hash, data) VALUES (?, ?)', hash, JSON.stringify(safeSearchAnnotation));
+        if (safeSearchAnnotation) {
+            this.#cache.set(hash, safeSearchAnnotation, CACHE_DURATION);
+            await database.query('INSERT INTO safeSearch (hash, data) VALUES (?, ?)', hash, JSON.stringify(safeSearchAnnotation));
+        }
         return safeSearchAnnotation;
     }