@joliegg/moderation 0.4.1 → 0.4.2

package/dist/index.js

@@ -152,6 +152,13 @@ class ModerationClient {
     }
     async moderateLink(url, allowShorteners = false) {
         const blacklisted = this.urlBlackList?.some(b => url.indexOf(b) > -1);
+        if (blacklisted) {
+            return { source: url, moderation: [{ category: 'CUSTOM_BLACK_LIST', confidence: 100 }] };
+        }
+        const globallyBlacklisted = url_blacklist_json_1.default.some(b => url.indexOf(b) > -1);
+        if (globallyBlacklisted) {
+            return { source: url, moderation: [{ category: 'BLACK_LIST', confidence: 100 }] };
+        }
         if (!allowShorteners) {
             try {
                 const domain = new URL(url).hostname;
@@ -160,20 +167,11 @@ class ModerationClient {
                     return { source: url, moderation: [{ category: 'URL_SHORTENER', confidence: 100 }] };
                 }
             }
-            catch (e) {
-                const isShortened = url_shorteners_json_1.default.some(s => url.indexOf(s) > -1);
-                if (isShortened) {
-                    return { source: url, moderation: [{ category: 'URL_SHORTENER', confidence: 100 }] };
-                }
+            catch (error) {
+                // Invalid URL
+                return { source: url, moderation: [] };
             }
         }
-        if (blacklisted) {
-            return { source: url, moderation: [{ category: 'CUSTOM_BLACK_LIST', confidence: 100 }] };
-        }
-        const globallyBlacklisted = url_blacklist_json_1.default.some(b => url.indexOf(b) > -1);
-        if (globallyBlacklisted) {
-            return { source: url, moderation: [{ category: 'BLACK_LIST', confidence: 100 }] };
-        }
         if (typeof this.googleAPIKey !== 'string') {
             return { source: url, moderation: [] };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joliegg/moderation",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A set of tools for chat moderation",
   "author": "Diana Islas Ocampo",
   "main": "dist/index.js",

package/src/index.ts

@@ -189,6 +189,16 @@ class ModerationClient {
   async moderateLink (url: string, allowShorteners = false): Promise<ModerationResult> {
     const blacklisted = this.urlBlackList?.some(b => url.indexOf(b) > -1);
 
+    if (blacklisted) {
+      return { source: url, moderation: [{ category: 'CUSTOM_BLACK_LIST', confidence: 100 }] };
+    }
+
+    const globallyBlacklisted = URLBlackList.some(b => url.indexOf(b) > -1);
+
+    if (globallyBlacklisted) {
+      return { source: url, moderation: [{ category: 'BLACK_LIST', confidence: 100 }] };
+    }
+
     if (!allowShorteners) {
       try {
         const domain = new URL(url).hostname;
@@ -197,25 +207,12 @@ class ModerationClient {
         if (isShortened) {
           return { source: url, moderation: [{ category: 'URL_SHORTENER', confidence: 100 }] };
         }
-      } catch (e) {
-        const isShortened = URLShortenerList.some(s => url.indexOf(s) > -1);
-
-        if (isShortened) {
-          return { source: url, moderation: [{ category: 'URL_SHORTENER', confidence: 100 }] };
-        }
+      } catch (error) {
+        // Invalid URL
+        return { source: url, moderation: [] };
       }
     }
 
-    if (blacklisted) {
-      return { source: url, moderation: [{ category: 'CUSTOM_BLACK_LIST', confidence: 100 }] };
-    }
-
-    const globallyBlacklisted = URLBlackList.some(b => url.indexOf(b) > -1);
-
-    if (globallyBlacklisted) {
-      return { source: url, moderation: [{ category: 'BLACK_LIST', confidence: 100 }] };
-    }
-
     if (typeof this.googleAPIKey !== 'string') {
       return { source: url, moderation: [] };
     }