@fsvreddit/bot-bouncer-evaluation 0.7.44 → 0.7.46

package/dist/userEvaluation/EvaluateBadDisplaynameDefinedHandles.d.ts

@@ -6,6 +6,7 @@ export declare class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorB
     name: string;
     shortname: string;
     banContentThreshold: number;
+    private getHandles;
     private isBadDisplayName;
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;

package/dist/userEvaluation/EvaluateBadDisplaynameDefinedHandles.js

@@ -11,6 +11,17 @@ class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorBase_js_1.UserEv
         this.shortname = "baddisplaynamedefinedhandles";
         this.banContentThreshold = 0;
     }
+    getHandles() {
+        const definedHandles = this.getModuleVariable("substitutions", "definedhandles", "");
+        if (!definedHandles) {
+            return [];
+        }
+        const parsed = (0, regjsparser_1.parse)(definedHandles, "u");
+        if (parsed.type !== "disjunction") {
+            return [];
+        }
+        return parsed.body.map(part => part.raw);
+    }
     isBadDisplayName(displayName) {
         if (!displayName) {
             return false;
@@ -25,15 +36,8 @@ class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorBase_js_1.UserEv
     gatherRegexes() {
         const prefix = this.getVariable("prefix", "");
         const suffix = this.getVariable("suffix", "");
-        const definedHandles = this.getModuleVariable("substitutions", "definedhandles", "");
-        if (!definedHandles) {
-            return [];
-        }
-        const parsed = (0, regjsparser_1.parse)(definedHandles, "u");
-        if (parsed.type !== "disjunction") {
-            return [];
-        }
-        const regexes = parsed.body.map(part => `${prefix}${part.raw}${suffix}`);
+        const handles = this.getHandles();
+        const regexes = handles.map(handle => `${prefix}${handle}${suffix}`);
         return (0, lodash_1.uniq)(regexes.map(regex => ({
             evaluatorName: this.name,
             regex,
@@ -56,17 +60,16 @@ class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorBase_js_1.UserEv
             return results;
         }
         for (const regexVal of regexes) {
-            let regex;
             try {
-                regex = new RegExp(regexVal, "u");
+                new RegExp(regexVal, "u");
             }
             catch {
                 results.push({ severity: "error", message: `Invalid regex in baddisplaynamedefinedhandles: ${regexVal}` });
                 continue;
             }
-            if (regex.test("")) {
-                results.push({ severity: "error", message: `Display name defined handle regex is too greedy: ${regexVal}` });
-            }
+        }
+        if (this.getHandles().some(handle => handle === "")) {
+            results.push({ severity: "error", message: `Empty handle found in baddisplaynamedefinedhandles` });
         }
         return results;
     }

package/dist/userEvaluation/EvaluateBioTextDefinedHandles.js

@@ -44,17 +44,17 @@ class EvaluateBioTextDefinedHandles extends UserEvaluatorBase_js_1.UserEvaluator
             return results;
         }
         for (const regexVal of regexes) {
-            let regex;
             try {
-                regex = new RegExp(regexVal);
+                new RegExp(regexVal);
             }
             catch {
                 results.push({ severity: "error", message: `Invalid regex in biotextdefinedhandles: ${regexVal}` });
                 continue;
             }
-            if (regex.test("")) {
-                results.push({ severity: "error", message: `Bio Text Defined Handles regex is too greedy: ${regexVal}` });
-            }
+        }
+        const handles = this.getHandles();
+        if (handles.some(handle => handle === "")) {
+            results.push({ severity: "error", message: `Empty handle found in biotextdefinedhandles` });
         }
         return results;
     }

package/dist/userEvaluation/EvaluatePostTitleDefinedHandles.d.ts

@@ -6,6 +6,7 @@ export declare class EvaluatePostTitleDefinedHandles extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
+    private getHandles;
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;

package/dist/userEvaluation/EvaluatePostTitleDefinedHandles.js

@@ -16,6 +16,17 @@ class EvaluatePostTitleDefinedHandles extends UserEvaluatorBase_js_1.UserEvaluat
         this.shortname = "posttitledefinedhandles";
         this.banContentThreshold = 1;
     }
+    getHandles() {
+        const definedHandles = this.getModuleVariable("substitutions", "definedhandles", "");
+        if (!definedHandles) {
+            return [];
+        }
+        const parsed = (0, regjsparser_1.parse)(definedHandles, "u");
+        if (parsed.type !== "disjunction") {
+            return [];
+        }
+        return parsed.body.map(part => part.raw);
+    }
     validateVariables() {
         const results = [];
         let regexes;
@@ -28,32 +39,25 @@ class EvaluatePostTitleDefinedHandles extends UserEvaluatorBase_js_1.UserEvaluat
             return results;
         }
         for (const regexVal of regexes) {
-            let regex;
             try {
-                regex = new RegExp(regexVal, "u");
+                new RegExp(regexVal, "u");
             }
             catch {
                 results.push({ severity: "error", message: `Invalid regex in post title: ${regexVal}` });
                 continue;
             }
-            if (regex.test("")) {
-                results.push({ severity: "error", message: `Post title regex is too greedy: ${regexVal}` });
-            }
+        }
+        const handles = this.getHandles();
+        if (handles.some(handle => handle === "")) {
+            results.push({ severity: "error", message: `Empty handle found in posttitledefinedhandles` });
         }
         return results;
     }
     gatherRegexes() {
         const prefix = this.getVariable("prefix", "");
         const suffix = this.getVariable("suffix", "");
-        const definedHandles = this.getModuleVariable("substitutions", "definedhandles", "");
-        if (!definedHandles) {
-            return [];
-        }
-        const parsed = (0, regjsparser_1.parse)(definedHandles, "u");
-        if (parsed.type !== "disjunction") {
-            return [];
-        }
-        const regexes = parsed.body.map(part => `${prefix}${part.raw}${suffix}`);
+        const handles = this.getHandles();
+        const regexes = handles.map(handle => `${prefix}${handle}${suffix}`);
         return (0, lodash_1.uniq)(regexes.map(regex => ({
             evaluatorName: this.name,
             regex,

package/dist/userEvaluation/EvaluateRepostBot.js

@@ -95,7 +95,7 @@ class EvaluateRepostBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
                 },
             });
             const result = JSON.parse(response.output_text);
-            await redis.set(cacheKey, result.similarity.toString(), { expiration: (0, date_fns_1.addHours)(new Date(), 1) });
+            await redis.set(cacheKey, result.similarity.toString(), { expiration: (0, date_fns_1.addWeeks)(new Date(), 1) });
             console.log(`Repost Checks: Tokens used: ${response.usage?.total_tokens}, Similarity between ${this.postIdToUrl(postA.id)} and ${this.postIdToUrl(postB.id)}: ${result.similarity}`);
             return result.similarity;
         }

package/dist/userEvaluation/EvaluateTextInNsfwImages.js

@@ -122,7 +122,7 @@ class EvaluateTextInNsfwImages extends EvaluateBotGroupAdvanced_1.EvaluateBotGro
         }
         const result = JSON.parse(response.output_text);
         console.log(`OpenAI Checks: Tokens used: ${response.usage?.total_tokens}, Model: ${model}, Image URL: ${url}, Extracted Text: ${result.extractedText}`);
-        await redis.set(resultCacheKey, JSON.stringify(result.extractedText), { expiration: (0, date_fns_1.addHours)(new Date(), 1) });
+        await redis.set(resultCacheKey, JSON.stringify(result.extractedText), { expiration: (0, date_fns_1.addWeeks)(new Date(), 1) });
         if (!result.extractedText) {
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fsvreddit/bot-bouncer-evaluation",
-    "version": "0.7.44",
+    "version": "0.7.46",
     "description": "Evaluation code for Bot Bouncer, a Dev Platform app designed to hunt bots on Reddit",
     "main": "dist/index.js",
     "scripts": {