@fsvreddit/bot-bouncer-evaluation 0.7.50 → 0.8.0

package/dist/allEvaluators.js

@@ -23,7 +23,6 @@ const EvaluateBadDisplaynameDefinedHandles_js_1 = require("./userEvaluation/Eval
 const EvaluatePostTitleMulti_js_1 = require("./userEvaluation/EvaluatePostTitleMulti.js");
 const EvaluateWarmupBot_js_1 = require("./userEvaluation/EvaluateWarmupBot.js");
 const EvaluateBotGroupAdvancedInternal_js_1 = require("./userEvaluation/EvaluateBotGroupAdvancedInternal.js");
-const EvaluateTitleCopyBot_js_1 = require("./userEvaluation/EvaluateTitleCopyBot.js");
 const EvaluateTextInNsfwImages_js_1 = require("./userEvaluation/EvaluateTextInNsfwImages.js");
 const EvaluateRepostBot_js_1 = require("./userEvaluation/EvaluateRepostBot.js");
 const EvaluateLinkReuse_js_1 = require("./userEvaluation/EvaluateLinkReuse.js");
@@ -62,7 +61,6 @@ exports.ALL_EVALUATORS = [
     EvaluateWarmupBot_js_1.EvaluateWarmupBot,
     EvaluateSocialLinks_js_1.EvaluateSocialLinks,
     EvaluateBotGroupAdvanced_js_1.EvaluateBotGroupAdvanced,
-    EvaluateTitleCopyBot_js_1.EvaluateTitleCopyBot,
     EvaluateLinkReuse_js_1.EvaluateLinkReuse,
     EvaluateTextInNsfwImages_js_1.EvaluateTextInNsfwImages,
     EvaluateRepostBot_js_1.EvaluateRepostBot,

package/dist/userEvaluation/EvaluateBadDisplayname.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateBadDisplayName extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluateBadDisplayName extends UserEvaluatorBase {
     private isBadDisplayName;
     gatherRegexes(): EvaluatorRegex[];
     validateVariables(): ValidationIssue[];
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(_: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateBadDisplaynameDefinedHandles.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -12,7 +12,7 @@ export declare class EvaluateBadDisplayNameDefinedHandles extends UserEvaluatorB
     private compiledRegexes;
     private getCompiledRegexes;
     validateVariables(): ValidationIssue[];
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(_: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateBadUsername.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateBadUsername extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluateBadUsername extends UserEvaluatorBase {
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;
     private getCompiledRegexes;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateBioText.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateBioText extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -13,7 +13,7 @@ export declare class EvaluateBioText extends UserEvaluatorBase {
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;
     private getCompiledRegexes;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(_: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateBioTextDefinedHandles.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateBioTextDefinedHandles extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateBioTextDefinedHandles extends UserEvaluatorBase {
     private getHandles;
     private compiledRegexes;
     private getCompiledRegexes;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
     preEvaluatePost(_: Post): boolean;

package/dist/userEvaluation/EvaluateBotGroupAdvanced.d.ts

@@ -1,7 +1,7 @@
-import { Comment, Post, TriggerContext, UserSocialLink } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Comment, Post, UserSocialLink } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 interface AgeRange {
     dateFrom: string;
     dateTo?: string;
@@ -88,7 +88,7 @@ export declare class EvaluateBotGroupAdvanced extends UserEvaluatorBase {
     private redis;
     allowNewFeatures: boolean;
     private evaluationError;
-    constructor(context: TriggerContext, history: (Post | Comment)[], socialLinks: UserSocialLink[] | undefined, variables: Record<string, unknown>);
+    constructor(history: (Post | Comment)[], socialLinks: UserSocialLink[] | undefined, variables: Record<string, unknown>);
     private compiledRegexes;
     private getCompiledRegex;
     private anyRegexMatches;
@@ -104,7 +104,7 @@ export declare class EvaluateBotGroupAdvanced extends UserEvaluatorBase {
     private postOrCommentMatchesCondition;
     collectCommentConditionsForPreEvalation(criteria: CriteriaGroup): CommentCondition[];
     collectNegatedCommentConditionsForPreEvaluation(criteria: CriteriaGroup): CommentCondition[];
-    preEvaluateComment(comment: CommentCreate): Promise<boolean>;
+    preEvaluateComment(comment: OnCommentCreateRequest): Promise<boolean>;
     private postMatchesCondition;
     private cachedPostProperties;
     private postPropertiesStatistics;

package/dist/userEvaluation/EvaluateBotGroupAdvanced.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateBotGroupAdvanced = void 0;
-const tid_js_1 = require("@devvit/public-api/types/tid.js");
+const server_1 = require("@devvit/web/server");
+const shared_1 = require("@devvit/web/shared");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const date_fns_1 = require("date-fns");
 const evaluatorHelpers_js_1 = require("./evaluatorHelpers.js");
@@ -452,8 +453,8 @@ function validateBotGroup(group, allowNewFeatures, evaluatorName) {
     return errors;
 }
 class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase {
-    constructor(context, history, socialLinks, variables) {
-        super(context, history, socialLinks, variables);
+    constructor(history, socialLinks, variables) {
+        super(history, socialLinks, variables);
         this.name = "Bot Group Advanced";
         this.shortname = "botgroupadvanced";
         this.banContentThreshold = 0; // No content ban threshold for this evaluator to support account properties only checks
@@ -467,7 +468,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
             cacheMisses: 0,
             errors: 0,
         };
-        this.redis = context.appSlug === constants_js_1.MAIN_APP_NAME ? context.redis.global : context.redis;
+        this.redis = server_1.context.appSlug === constants_js_1.MAIN_APP_NAME ? server_1.redis.global : server_1.redis;
     }
     getCompiledRegex(regex) {
         const result = this.compiledRegexes.get(regex);
@@ -616,9 +617,9 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
         return true;
     }
     anySubredditMatches(item, subredditNames) {
-        const subredditName = "subredditName" in item ? item.subredditName : this.context.subredditName;
+        const subredditName = "subredditName" in item ? item.subredditName : server_1.context.subredditName;
         const authorName = "authorName" in item ? item.authorName : undefined;
-        return subredditNames.some(subreddit => subredditName?.toLowerCase() === subreddit.toLowerCase())
+        return subredditNames.some(subreddit => subredditName.toLowerCase() === subreddit.toLowerCase())
             || subredditNames.some(subreddit => subreddit === "$profile" && subredditName === `u_${authorName}`);
     }
     postOrCommentMatchesCondition(item, condition) {
@@ -786,7 +787,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
                 continue;
             }
             if (group.age || group.displayNameRegex || group.nsfw || group.hasRedditPremium || group.hasVerifiedEmail || group.isSubredditModerator) {
-                userInfo ?? (userInfo = await (0, utility_js_1.getAdditionalUserInfo)(comment.author.name, this.context));
+                userInfo ?? (userInfo = await (0, utility_js_1.getAdditionalUserInfo)(comment.author.name));
                 if (!userInfo) {
                     continue;
                 }
@@ -890,7 +891,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
             return this.cachedPostProperties[postId];
         }
         try {
-            const postProperties = await this.context.reddit.getPostById(postId).then(post => ({
+            const postProperties = await server_1.reddit.getPostById(postId).then(post => ({
                 authorName: post.authorName,
                 title: post.title,
                 body: post.body,
@@ -920,7 +921,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
         if (condition.postId && !condition.postId.some(postId => comment.postId === `t3_${postId}`)) {
             return { matched: false };
         }
-        if (condition.isTopLevel !== undefined && condition.isTopLevel !== (0, tid_js_1.isLinkId)(comment.parentId)) {
+        if (condition.isTopLevel !== undefined && condition.isTopLevel !== (0, shared_1.isT3)(comment.parentId)) {
             return { matched: false };
         }
         if (condition.isCommentOnOwnPost !== undefined) {
@@ -1048,7 +1049,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
             }
             ;
             if (group.age || group.minCommentKarma || group.maxCommentKarma || group.minLinkKarma || group.maxLinkKarma || group.displayNameRegex || group.nsfw || group.hasRedditPremium || group.hasVerifiedEmail || group.isSubredditModerator) {
-                userInfo ?? (userInfo = await (0, utility_js_1.getAdditionalUserInfo)(post.authorName, this.context));
+                userInfo ?? (userInfo = await (0, utility_js_1.getAdditionalUserInfo)(post.authorName));
                 if (!userInfo) {
                     continue;
                 }
@@ -1268,7 +1269,6 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
             }
             else { // comments
                 const comments = this.getComments();
-                const currentSubreddit = this.context.subredditName ?? await this.context.reddit.getCurrentSubredditName();
                 for (const comment of comments) {
                     if (subredditsMatched.size >= distinctSubredditsNeeded && matches.length >= maxMatchesNeeded) {
                         break;
@@ -1279,7 +1279,7 @@ class EvaluateBotGroupAdvanced extends UserEvaluatorBase_js_1.UserEvaluatorBase
                     const matchResult = await this.commentMatchesCondition(comment, criteria, this.history);
                     if (matchResult.matched) {
                         matches.push(matchResult);
-                        const subredditName = "subredditName" in comment ? comment.subredditName : currentSubreddit;
+                        const subredditName = "subredditName" in comment ? comment.subredditName : server_1.context.subredditName;
                         subredditsMatched.add(subredditName);
                     }
                 }

package/dist/userEvaluation/EvaluateCommentPhrase.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateCommentPhrase extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluateCommentPhrase extends UserEvaluatorBase {
     private compiledRegexes;
     private getCompiledRegexes;
     private eligibleComment;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(_: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateDomainSharer.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateDomainSharer extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluateDomainSharer extends UserEvaluatorBase {
     private ignoredSubreddits;
     private ignoredSubredditRegexes;
     private domainsFromPost;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateInconsistentAgeBot.d.ts

@@ -1,7 +1,7 @@
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { Post } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateInconsistentAgeBot extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateInconsistentAgeBot extends UserEvaluatorBase {
     canAutoBan: boolean;
     gatherRegexes(): EvaluatorRegex[];
     validateVariables(): ValidationIssue[];
-    preEvaluateComment(_event: CommentCreate): boolean;
+    preEvaluateComment(_event: OnCommentCreateRequest): boolean;
     private getAgeFromPostTitle;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateInconsistentGenderBot.d.ts

@@ -1,13 +1,13 @@
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { Post } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateInconsistentGenderBot extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
     canAutoBan: boolean;
-    preEvaluateComment(_event: CommentCreate): boolean;
+    preEvaluateComment(_event: OnCommentCreateRequest): boolean;
     getGenderFromTitle(title: string): string | undefined;
     gatherRegexes(): EvaluatorRegex[];
     validateVariables(): ValidationIssue[];

package/dist/userEvaluation/EvaluateLinkReuse.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateLinkReuse extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateLinkReuse extends UserEvaluatorBase {
     private getLinkRegexes;
     validateVariables(): ValidationIssue[];
     preEvaluatePost(post: Post): boolean;
-    preEvaluateComment(_event: CommentCreate): Promise<boolean>;
+    preEvaluateComment(_event: OnCommentCreateRequest): Promise<boolean>;
     preEvaluateUser(user: UserExtended): boolean;
     private getDistinctUsersForLink;
     private isEligibleUserForEvaluator;

package/dist/userEvaluation/EvaluateLinkReuse.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateLinkReuse = void 0;
+const server_1 = require("@devvit/web/server");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const constants_js_1 = require("../constants.js");
 const date_fns_1 = require("date-fns");
@@ -62,19 +63,19 @@ class EvaluateLinkReuse extends UserEvaluatorBase_js_1.UserEvaluatorBase {
         return user.nsfw;
     }
     async getDistinctUsersForLink(link) {
-        const redis = this.context.appSlug === constants_js_1.MAIN_APP_NAME ? this.context.redis.global : this.context.redis;
+        const redisClient = server_1.context.appSlug === constants_js_1.MAIN_APP_NAME ? server_1.redis.global : server_1.redis;
         const cacheKey = `bbe:linkreuse:distinctUsers:${link}`;
-        const cachedResults = await redis.get(cacheKey);
+        const cachedResults = await redisClient.get(cacheKey);
         if (cachedResults !== undefined) {
             return JSON.parse(cachedResults);
         }
-        const results = await this.context.reddit.searchPosts({
+        const results = await server_1.reddit.searchPosts({
             query: `url:"${link}"`,
             sort: "new",
             limit: 100,
         }).all();
         const distinctUsers = Array.from(new Set(results.filter(post => post.url === link && post.authorName !== "[deleted]").map(post => post.authorName)));
-        await redis.set(cacheKey, JSON.stringify(distinctUsers), { expiration: (0, date_fns_1.addHours)(new Date(), 1) });
+        await redisClient.set(cacheKey, JSON.stringify(distinctUsers), { expiration: (0, date_fns_1.addHours)(new Date(), 1) });
         return distinctUsers;
     }
     async isEligibleUserForEvaluator(username, isSubject = false) {
@@ -83,7 +84,7 @@ class EvaluateLinkReuse extends UserEvaluatorBase_js_1.UserEvaluatorBase {
             socialLinks = await this.getSocialLinks(username);
         }
         else {
-            socialLinks = await (0, index_js_1.getSocialLinksWithCache)(username, this.context);
+            socialLinks = await (0, index_js_1.getSocialLinksWithCache)(username);
         }
         if (socialLinks.length === 0) {
             return false;

package/dist/userEvaluation/EvaluateObfuscatedBioKeywords.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateObfuscatedBioKeywords extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateObfuscatedBioKeywords extends UserEvaluatorBase {
     private getKeywords;
     private getAllowedTerms;
     private bioTextMatches;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(_: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_user: UserExtended): boolean;

package/dist/userEvaluation/EvaluatePinnedPostTitle.d.ts

@@ -1,14 +1,14 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluatePinnedPostTitles extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluatePostTitle.d.ts

@@ -1,14 +1,14 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluatePostTitle extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     private getTitles;
     private titleRegexes;
     private getTitleRegexes;

package/dist/userEvaluation/EvaluatePostTitleDefinedHandles.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluatePostTitleDefinedHandles extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluatePostTitleDefinedHandles extends UserEvaluatorBase {
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;
     private getCompiledRegexes;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluatePostTitleMulti.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluatePostTitleMulti extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -11,7 +11,7 @@ export declare class EvaluatePostTitleMulti extends UserEvaluatorBase {
     gatherRegexes(): EvaluatorRegex[];
     private compiledRegexes;
     private getCompiledRegexes;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateRedgifs.d.ts

@@ -1,14 +1,14 @@
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase";
-import { Post } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateRedgifs extends UserEvaluatorBase {
     name: string;
     shortname: string;
     evaluatorDisabled(): boolean;
     gatherRegexes(): EvaluatorRegex[];
     validateVariables(): ValidationIssue[];
-    preEvaluateComment(_: CommentCreate): boolean | Promise<boolean>;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean | Promise<boolean>;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     private getRedis;

package/dist/userEvaluation/EvaluateRedgifs.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateRedgifs = void 0;
+const server_1 = require("@devvit/web/server");
 const UserEvaluatorBase_1 = require("./UserEvaluatorBase");
 const evaluatorHelpers_1 = require("./evaluatorHelpers");
 const date_fns_1 = require("date-fns");
@@ -22,7 +23,7 @@ class EvaluateRedgifs extends UserEvaluatorBase_1.UserEvaluatorBase {
         const mainAppOnly = this.getVariable("mainAppOnly", false);
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (mainAppOnly) {
-            return this.context.appSlug === constants_1.MAIN_APP_NAME;
+            return server_1.context.appSlug === constants_1.MAIN_APP_NAME;
         }
         return false;
     }
@@ -62,7 +63,7 @@ class EvaluateRedgifs extends UserEvaluatorBase_1.UserEvaluatorBase {
         return user.createdAt < (0, date_fns_1.subDays)(new Date(), minAgeInDays);
     }
     getRedis() {
-        return this.context.appSlug === constants_1.MAIN_APP_NAME ? this.context.redis.global : this.context.redis;
+        return server_1.context.appSlug === constants_1.MAIN_APP_NAME ? server_1.redis.global : server_1.redis;
     }
     async getRedgifsBearerToken() {
         const cacheKey = "bbe:redgifs:bearerToken";

package/dist/userEvaluation/EvaluateRepostBot.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateRepostBot extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -10,7 +10,7 @@ export declare class EvaluateRepostBot extends UserEvaluatorBase {
     private minWordsInTitle;
     private isEligiblePost;
     preEvaluatePost(post: Post): boolean;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     private getImageUrl;
     private postIdToUrl;

package/dist/userEvaluation/EvaluateRepostBot.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateRepostBot = void 0;
+const server_1 = require("@devvit/web/server");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const evaluatorHelpers_js_1 = require("./evaluatorHelpers.js");
 const date_fns_1 = require("date-fns");
@@ -53,8 +54,8 @@ class EvaluateRepostBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
     }
     async getPostSimilarity(postA, postB) {
         const cacheKey = `bbe:RepostBot:similarity:${postA.id}:${postB.id}`;
-        const redis = this.context.appSlug === constants_js_1.MAIN_APP_NAME ? this.context.redis.global : this.context.redis;
-        const cachedResult = await redis.get(cacheKey);
+        const redisClient = server_1.context.appSlug === constants_js_1.MAIN_APP_NAME ? server_1.redis.global : server_1.redis;
+        const cachedResult = await redisClient.get(cacheKey);
         if (cachedResult) {
             console.log(`Repost Checks: Using cached similarity between ${this.postIdToUrl(postA.id)} and ${this.postIdToUrl(postB.id)}: ${cachedResult}`);
             return parseFloat(cachedResult);
@@ -96,7 +97,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.addWeeks)(new Date(), 1) });
+            await redisClient.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;
         }
@@ -130,7 +131,7 @@ class EvaluateRepostBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
         const sortedPosts = posts.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
         const latestPost = sortedPosts[0];
         // Look for duplicate posts.
-        let postDuplicates = await this.context.reddit.searchPosts({
+        let postDuplicates = await server_1.reddit.searchPosts({
             query: `title:"${latestPost.title}"`,
             subredditName: latestPost.subredditName,
             sort: "new",
@@ -139,7 +140,7 @@ class EvaluateRepostBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
         if (postDuplicates.length === 0) {
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             if (this.getVariable("allowSimilarTitles", false)) {
-                postDuplicates = await this.context.reddit.searchPosts({
+                postDuplicates = await server_1.reddit.searchPosts({
                     query: (0, commonWords_js_1.getLeastCommonWordsFromText)(latestPost.title, { take: 3 }).join(" "),
                     subredditName: latestPost.subredditName,
                     sort: "hot",

package/dist/userEvaluation/EvaluateSelfComment.d.ts

@@ -1,7 +1,7 @@
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase } from "./UserEvaluatorBase.js";
-import { Post } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateSelfComment extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateSelfComment extends UserEvaluatorBase {
     private isSubIgnored;
     private eligibleComment;
     private eligiblePost;
-    preEvaluateComment(event: CommentCreate): boolean;
+    preEvaluateComment(event: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(user: UserExtended): boolean;

package/dist/userEvaluation/EvaluateSelfComment.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateSelfComment = void 0;
+const server_1 = require("@devvit/web/server");
+const shared_1 = require("@devvit/web/shared");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const date_fns_1 = require("date-fns");
-const tid_js_1 = require("@devvit/public-api/types/tid.js");
 const evaluatorHelpers_js_1 = require("./evaluatorHelpers.js");
 class EvaluateSelfComment extends UserEvaluatorBase_js_1.UserEvaluatorBase {
     constructor() {
@@ -14,10 +15,10 @@ class EvaluateSelfComment extends UserEvaluatorBase_js_1.UserEvaluatorBase {
     }
     isSubIgnored() {
         const ignoredSubreddits = this.getVariable("ignoredsubs", []);
-        return this.context.subredditName && ignoredSubreddits.includes(this.context.subredditName);
+        return server_1.context.subredditName && ignoredSubreddits.includes(server_1.context.subredditName);
     }
     eligibleComment(comment) {
-        return (0, tid_js_1.isLinkId)(comment.parentId)
+        return (0, shared_1.isT3)(comment.parentId)
             && comment.body.split("\n\n").length <= 2;
     }
     eligiblePost(post) {

package/dist/userEvaluation/EvaluateSocialLinks.d.ts

@@ -1,14 +1,14 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateSocialLinks extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
     validateVariables(): ValidationIssue[];
     getVariableOverrides(): Record<string, unknown>;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(user: UserExtended): Promise<boolean>;

package/dist/userEvaluation/EvaluateSuspiciousFirstPost.d.ts

@@ -1,14 +1,14 @@
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase } from "./UserEvaluatorBase.js";
-import { Post } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateSuspiciousFirstPost extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
     private subList;
     private eligiblePost;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateTGGroup.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateTGGroup extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -9,7 +9,7 @@ export declare class EvaluateTGGroup extends UserEvaluatorBase {
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
     private eligiblePost;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateTextInNsfwImages.d.ts

@@ -1,6 +1,6 @@
 import { EvaluatorRegex, ValidationIssue } from "./UserEvaluatorBase";
 import { EvaluateBotGroupAdvanced } from "./EvaluateBotGroupAdvanced";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateTextInNsfwImages extends EvaluateBotGroupAdvanced {
     name: string;
     shortname: string;

package/dist/userEvaluation/EvaluateTextInNsfwImages.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateTextInNsfwImages = void 0;
+const server_1 = require("@devvit/web/server");
 const EvaluateBotGroupAdvanced_1 = require("./EvaluateBotGroupAdvanced");
 const date_fns_1 = require("date-fns");
 const evaluatorHelpers_1 = require("./evaluatorHelpers");
@@ -74,8 +75,8 @@ class EvaluateTextInNsfwImages extends EvaluateBotGroupAdvanced_1.EvaluateBotGro
             return;
         }
         const resultCacheKey = `bbe:imageText:${url}`;
-        const redis = this.context.subredditName === constants_1.MAIN_APP_NAME ? this.context.redis.global : this.context.redis;
-        const cachedResult = await redis.get(resultCacheKey);
+        const redisClient = server_1.context.subredditName === constants_1.MAIN_APP_NAME ? server_1.redis.global : server_1.redis;
+        const cachedResult = await redisClient.get(resultCacheKey);
         if (cachedResult) {
             console.log(`OpenAI Checks: Using cached result for image ${url}, Extracted Text: ${cachedResult}`);
             return JSON.parse(cachedResult);
@@ -122,7 +123,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.addWeeks)(new Date(), 1) });
+        await redisClient.set(resultCacheKey, JSON.stringify(result.extractedText), { expiration: (0, date_fns_1.addWeeks)(new Date(), 1) });
         if (!result.extractedText) {
             return;
         }

package/dist/userEvaluation/EvaluateWarmupBot.d.ts

@@ -1,15 +1,16 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { EvaluatorRegex, UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateWarmupBot extends UserEvaluatorBase {
     name: string;
     shortname: string;
     banContentThreshold: number;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     validateVariables(): ValidationIssue[];
     gatherRegexes(): EvaluatorRegex[];
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
+    private isModerator;
     evaluate(user: UserExtended): Promise<boolean>;
 }

package/dist/userEvaluation/EvaluateWarmupBot.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateWarmupBot = void 0;
+const server_1 = require("@devvit/web/server");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const lodash_1 = require("lodash");
-const devvit_helpers_1 = require("devvit-helpers");
 class EvaluateWarmupBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
     constructor() {
         super(...arguments);
@@ -51,6 +51,13 @@ class EvaluateWarmupBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
     preEvaluateUser(user) {
         return user.isModerator;
     }
+    async isModerator(subredditName, username) {
+        const modList = await server_1.reddit.getModerators({
+            subredditName,
+            username,
+        }).all();
+        return modList.length > 0;
+    }
     async evaluate(user) {
         const subredditRegexes = this.getVariable("subredditRegexes", []);
         if (subredditRegexes.length === 0) {
@@ -74,7 +81,7 @@ class EvaluateWarmupBot extends UserEvaluatorBase_js_1.UserEvaluatorBase {
         // Check to see if the user is a mod of any of the matched subreddits
         let moddedSubreddit;
         for (const subreddit of matchedSubreddits) {
-            if (await (0, devvit_helpers_1.isModerator)(this.context.reddit, subreddit, user.username)) {
+            if (await this.isModerator(subreddit, user.username)) {
                 moddedSubreddit = subreddit;
                 break;
             }

package/dist/userEvaluation/EvaluateWorldTraveller.d.ts

@@ -1,7 +1,7 @@
-import { Post } from "@devvit/public-api";
-import { CommentCreate } from "@devvit/protos";
+import { Post } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
 import { UserEvaluatorBase, ValidationIssue } from "./UserEvaluatorBase.js";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 export declare class EvaluateWorldTraveller extends UserEvaluatorBase {
     name: string;
     shortname: string;
@@ -13,7 +13,7 @@ export declare class EvaluateWorldTraveller extends UserEvaluatorBase {
     private subList;
     private getSubList;
     private isInEligibleSubreddit;
-    preEvaluateComment(_: CommentCreate): boolean;
+    preEvaluateComment(_: OnCommentCreateRequest): boolean;
     preEvaluatePost(post: Post): boolean;
     preEvaluateUser(user: UserExtended): boolean;
     evaluate(_: UserExtended): boolean;

package/dist/userEvaluation/EvaluateWorldTraveller.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluateWorldTraveller = void 0;
+const server_1 = require("@devvit/web/server");
 const UserEvaluatorBase_js_1 = require("./UserEvaluatorBase.js");
 const constants_js_1 = require("../constants.js");
 const lodash_1 = require("lodash");
@@ -45,10 +46,7 @@ class EvaluateWorldTraveller extends UserEvaluatorBase_js_1.UserEvaluatorBase {
         return this.subList;
     }
     isInEligibleSubreddit() {
-        if (!this.context.subredditName) {
-            return false;
-        }
-        return this.context.subredditName.startsWith(constants_js_1.CONTROL_SUBREDDIT) || this.getSubList().has(this.context.subredditName);
+        return server_1.context.subredditName.startsWith(constants_js_1.CONTROL_SUBREDDIT) || this.getSubList().has(server_1.context.subredditName);
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     preEvaluateComment(_) {

package/dist/userEvaluation/UserEvaluatorBase.d.ts

@@ -1,6 +1,6 @@
-import { CommentCreate, CommentUpdate } from "@devvit/protos";
-import { Comment, Post, TriggerContext, UserSocialLink } from "@devvit/public-api";
-import { UserExtended } from "@fsvreddit/fsv-devvit-helpers";
+import { Comment, Post, UserSocialLink } from "@devvit/web/server";
+import { OnCommentCreateRequest } from "@devvit/web/shared";
+import { UserExtended } from "@fsvreddit/fsv-devvit-web-helpers";
 interface HistoryOptions {
     since?: Date;
     omitRemoved?: boolean;
@@ -25,7 +25,6 @@ export interface HitReasonDetailed {
 }
 export type HitReason = string | HitReasonDetailed;
 export declare abstract class UserEvaluatorBase {
-    protected context: TriggerContext;
     private variables;
     abstract name: string;
     abstract shortname: string;
@@ -40,7 +39,7 @@ export declare abstract class UserEvaluatorBase {
     protected ignoredSubs: Set<string>;
     protected verboseLogging: boolean;
     protected regexWarnThreshold: number;
-    constructor(context: TriggerContext, history: (Post | Comment)[], socialLinks: UserSocialLink[] | undefined, variables: Record<string, unknown>);
+    constructor(history: (Post | Comment)[], socialLinks: UserSocialLink[] | undefined, variables: Record<string, unknown>);
     setHistory(history: (Post | Comment)[]): void;
     setSocialLinks(socialLinks: UserSocialLink[]): void;
     setOpenAiKey(key: string): void;
@@ -56,8 +55,8 @@ export declare abstract class UserEvaluatorBase {
     protected getSocialLinks(username: string): Promise<UserSocialLink[]>;
     protected addHitReason(reason: HitReason): void;
     hitReasons: HitReason[] | undefined;
-    abstract preEvaluateComment(event: CommentCreate): boolean | Promise<boolean>;
-    preEvaluateCommentEdit(event: CommentUpdate): boolean | Promise<boolean>;
+    abstract preEvaluateComment(event: OnCommentCreateRequest): boolean | Promise<boolean>;
+    preEvaluateCommentEdit(event: OnCommentCreateRequest): boolean | Promise<boolean>;
     abstract preEvaluatePost(post: Post): boolean | Promise<boolean>;
     preEvaluatePostEdit(post: Post): boolean | Promise<boolean>;
     abstract preEvaluateUser(user: UserExtended): boolean | Promise<boolean>;

package/dist/userEvaluation/UserEvaluatorBase.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserEvaluatorBase = void 0;
-const tid_js_1 = require("@devvit/public-api/types/tid.js");
+const server_1 = require("@devvit/web/server");
+const shared_1 = require("@devvit/web/shared");
 const evaluatorHelpers_js_1 = require("./evaluatorHelpers.js");
 const constants_js_1 = require("../constants.js");
 class UserEvaluatorBase {
-    constructor(context, history, socialLinks, variables) {
+    constructor(history, socialLinks, variables) {
         this.variables = {};
         this.needsOpenAiKey = false;
         this.banContentThreshold = 10;
         this.canAutoBan = true;
         this.hitReasons = undefined;
-        this.context = context;
         this.socialLinks = socialLinks;
         this.variables = variables;
-        this.verboseLogging = context.appSlug !== constants_js_1.MAIN_APP_NAME;
+        this.verboseLogging = server_1.context.appSlug !== constants_js_1.MAIN_APP_NAME;
         this.regexWarnThreshold = this.getVariable("regexWarnThreshold", 100);
         this.ignoredSubs = new Set(this.getGenericVariable("ignoredsubs", []));
         this.history = history;
@@ -65,7 +65,7 @@ class UserEvaluatorBase {
         return this.variables[`${module}:${name}`] ?? defaultValue;
     }
     async getSocialLinks(username) {
-        this.socialLinks ?? (this.socialLinks = await (0, evaluatorHelpers_js_1.getSocialLinksWithCache)(username, this.context));
+        this.socialLinks ?? (this.socialLinks = await (0, evaluatorHelpers_js_1.getSocialLinksWithCache)(username));
         return this.socialLinks;
     }
     addHitReason(reason) {
@@ -101,11 +101,11 @@ class UserEvaluatorBase {
         return filteredHistory;
     }
     getComments(options) {
-        this.userComments ?? (this.userComments = this.history.filter(item => (0, tid_js_1.isCommentId)(item.id) && !this.ignoredSubs.has(item.subredditName)));
+        this.userComments ?? (this.userComments = this.history.filter(item => (0, shared_1.isT1)(item.id) && !this.ignoredSubs.has(item.subredditName)));
         return this.getContent(this.userComments, options);
     }
     getPosts(options) {
-        this.userPosts ?? (this.userPosts = this.history.filter(item => (0, tid_js_1.isLinkId)(item.id) && !this.ignoredSubs.has(item.subredditName)));
+        this.userPosts ?? (this.userPosts = this.history.filter(item => (0, shared_1.isT3)(item.id) && !this.ignoredSubs.has(item.subredditName)));
         return this.getContent(this.userPosts, options);
     }
 }

package/dist/userEvaluation/evaluatorHelpers.d.ts

@@ -1,3 +1,3 @@
-import { TriggerContext, UserSocialLink } from "@devvit/public-api";
+import { UserSocialLink } from "@devvit/web/server";
 export declare function domainFromUrl(url: string): string | undefined;
-export declare function getSocialLinksWithCache(username: string, context: TriggerContext): Promise<UserSocialLink[]>;
+export declare function getSocialLinksWithCache(username: string): Promise<UserSocialLink[]>;

package/dist/userEvaluation/evaluatorHelpers.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.domainFromUrl = domainFromUrl;
 exports.getSocialLinksWithCache = getSocialLinksWithCache;
+const server_1 = require("@devvit/web/server");
+const fsv_devvit_web_helpers_1 = require("@fsvreddit/fsv-devvit-web-helpers");
 const date_fns_1 = require("date-fns");
-const devvit_helpers_1 = require("devvit-helpers");
 function domainFromUrl(url) {
     if (!url || url.startsWith("/")) {
         // Reddit internal link or crosspost
@@ -13,13 +14,13 @@ function domainFromUrl(url) {
     const trimmedHostname = hostname.startsWith("www.") ? hostname.substring(4) : hostname;
     return trimmedHostname;
 }
-async function getSocialLinksWithCache(username, context) {
+async function getSocialLinksWithCache(username) {
     const cacheKey = `socialLinks:${username}`;
-    const cachedValue = await context.redis.get(cacheKey);
+    const cachedValue = await server_1.redis.get(cacheKey);
     if (cachedValue) {
         return JSON.parse(cachedValue);
     }
-    const userSocialLinks = await (0, devvit_helpers_1.getUserSocialLinks)(username, context.metadata);
-    await context.redis.set(cacheKey, JSON.stringify(userSocialLinks), { expiration: (0, date_fns_1.addMinutes)(new Date(), 5) });
+    const userSocialLinks = await (0, fsv_devvit_web_helpers_1.getUserSocialLinks)(username);
+    await server_1.redis.set(cacheKey, JSON.stringify(userSocialLinks), { expiration: (0, date_fns_1.addMinutes)(new Date(), 5) });
     return userSocialLinks;
 }

package/dist/userEvaluation/index.d.ts

@@ -3,6 +3,9 @@ export * from "./EvaluateBadDisplaynameDefinedHandles.js";
 export * from "./EvaluateBadUsername.js";
 export * from "./EvaluateBioText.js";
 export * from "./EvaluateBioTextDefinedHandles.js";
+export * from "./EvaluateBotGroupAdvanced.js";
+export * from "./EvaluateBotGroupAdvancedInternal.js";
+export * from "./EvaluateBotGroupSubmitters.js";
 export * from "./EvaluateCommentPhrase.js";
 export * from "./EvaluateDomainSharer.js";
 export * from "./EvaluateInconsistentAgeBot.js";
@@ -13,15 +16,13 @@ export * from "./EvaluatePinnedPostTitle.js";
 export * from "./EvaluatePostTitle.js";
 export * from "./EvaluatePostTitleDefinedHandles.js";
 export * from "./EvaluatePostTitleMulti.js";
+export * from "./EvaluateRedgifs.js";
+export * from "./EvaluateRepostBot.js";
 export * from "./EvaluateSelfComment.js";
 export * from "./EvaluateSocialLinks.js";
 export * from "./EvaluateSuspiciousFirstPost.js";
+export * from "./EvaluateTextInNsfwImages.js";
 export * from "./EvaluateTGGroup.js";
 export * from "./EvaluateWarmupBot.js";
-export * from "./EvaluateBotGroupAdvanced.js";
-export * from "./EvaluateBotGroupAdvancedInternal.js";
-export * from "./EvaluateTitleCopyBot.js";
 export * from "./EvaluateWorldTraveller.js";
-export * from "./EvaluateBotGroupSubmitters.js";
-export * from "./EvaluateRedgifs.js";
 export * from "./UserEvaluatorBase.js";

package/dist/userEvaluation/index.js

@@ -19,6 +19,9 @@ __exportStar(require("./EvaluateBadDisplaynameDefinedHandles.js"), exports);
 __exportStar(require("./EvaluateBadUsername.js"), exports);
 __exportStar(require("./EvaluateBioText.js"), exports);
 __exportStar(require("./EvaluateBioTextDefinedHandles.js"), exports);
+__exportStar(require("./EvaluateBotGroupAdvanced.js"), exports);
+__exportStar(require("./EvaluateBotGroupAdvancedInternal.js"), exports);
+__exportStar(require("./EvaluateBotGroupSubmitters.js"), exports);
 __exportStar(require("./EvaluateCommentPhrase.js"), exports);
 __exportStar(require("./EvaluateDomainSharer.js"), exports);
 __exportStar(require("./EvaluateInconsistentAgeBot.js"), exports);
@@ -29,15 +32,13 @@ __exportStar(require("./EvaluatePinnedPostTitle.js"), exports);
 __exportStar(require("./EvaluatePostTitle.js"), exports);
 __exportStar(require("./EvaluatePostTitleDefinedHandles.js"), exports);
 __exportStar(require("./EvaluatePostTitleMulti.js"), exports);
+__exportStar(require("./EvaluateRedgifs.js"), exports);
+__exportStar(require("./EvaluateRepostBot.js"), exports);
 __exportStar(require("./EvaluateSelfComment.js"), exports);
 __exportStar(require("./EvaluateSocialLinks.js"), exports);
 __exportStar(require("./EvaluateSuspiciousFirstPost.js"), exports);
+__exportStar(require("./EvaluateTextInNsfwImages.js"), exports);
 __exportStar(require("./EvaluateTGGroup.js"), exports);
 __exportStar(require("./EvaluateWarmupBot.js"), exports);
-__exportStar(require("./EvaluateBotGroupAdvanced.js"), exports);
-__exportStar(require("./EvaluateBotGroupAdvancedInternal.js"), exports);
-__exportStar(require("./EvaluateTitleCopyBot.js"), exports);
 __exportStar(require("./EvaluateWorldTraveller.js"), exports);
-__exportStar(require("./EvaluateBotGroupSubmitters.js"), exports);
-__exportStar(require("./EvaluateRedgifs.js"), exports);
 __exportStar(require("./UserEvaluatorBase.js"), exports);

package/dist/utility.d.ts

@@ -1,6 +1,7 @@
-import { JSONValue, TriggerContext, User } from "@devvit/public-api";
+import { User } from "@devvit/web/server";
+import { JsonValue } from "@devvit/web/shared";
 import { Document } from "yaml";
-export declare function getUserOrUndefined(username: string, context: TriggerContext): Promise<User | undefined>;
+export declare function getUserOrUndefined(username: string): Promise<User | undefined>;
 export interface DuplicateKeyInfo {
     key: string;
     path: string;
@@ -8,7 +9,7 @@ export interface DuplicateKeyInfo {
     col: number;
 }
 export declare function findDuplicateKeysInDoc(doc: Document.Parsed): DuplicateKeyInfo[];
-export declare function yamlToVariables(input: string, extraSubstitutions?: Record<string, string | string[]>): Record<string, JSONValue>;
+export declare function yamlToVariables(input: string, extraSubstitutions?: Record<string, string | string[]>): Record<string, JsonValue>;
 export interface AdditionalUserInfo {
     createdAt: Date;
     userDescription?: string;
@@ -31,4 +32,4 @@ export interface AdditionalUserInfo {
     hasVerifiedEmail: boolean;
     isSubredditModerator: boolean;
 }
-export declare function getAdditionalUserInfo(username: string, context: TriggerContext): Promise<AdditionalUserInfo | undefined>;
+export declare function getAdditionalUserInfo(username: string): Promise<AdditionalUserInfo | undefined>;

package/dist/utility.js

@@ -4,13 +4,14 @@ exports.getUserOrUndefined = getUserOrUndefined;
 exports.findDuplicateKeysInDoc = findDuplicateKeysInDoc;
 exports.yamlToVariables = yamlToVariables;
 exports.getAdditionalUserInfo = getAdditionalUserInfo;
-const fsv_devvit_helpers_1 = require("@fsvreddit/fsv-devvit-helpers");
+const server_1 = require("@devvit/web/server");
+const fsv_devvit_web_helpers_1 = require("@fsvreddit/fsv-devvit-web-helpers");
 const date_fns_1 = require("date-fns");
 const yaml_1 = require("yaml");
-async function getUserOrUndefined(username, context) {
+async function getUserOrUndefined(username) {
     let user;
     try {
-        user = await context.reddit.getUserByUsername(username);
+        user = await server_1.reddit.getUserByUsername(username);
     }
     catch {
         //
@@ -117,9 +118,9 @@ function yamlToVariables(input, extraSubstitutions = {}) {
     variables.errors = errors;
     return variables;
 }
-async function getAdditionalUserInfo(username, context) {
+async function getAdditionalUserInfo(username) {
     const cacheKey = `bbe:additionalUserInfo:${username}`;
-    const cachedData = await context.redis.get(cacheKey);
+    const cachedData = await server_1.redis.get(cacheKey);
     if (cachedData) {
         const parsedData = JSON.parse(cachedData);
         return {
@@ -134,7 +135,7 @@ async function getAdditionalUserInfo(username, context) {
             isSubredditModerator: parsedData.isSubredditModerator,
         };
     }
-    const user = await (0, fsv_devvit_helpers_1.getUserExtended)(username, context);
+    const user = await (0, fsv_devvit_web_helpers_1.getUserExtended)(username);
     if (!user) {
         return;
     }
@@ -149,7 +150,7 @@ async function getAdditionalUserInfo(username, context) {
         hasVerifiedEmail: user.hasVerifiedEmail,
         isSubredditModerator: user.isModerator,
     };
-    await context.redis.set(cacheKey, JSON.stringify(dataToCache), { expiration: (0, date_fns_1.addMinutes)(new Date(), 10) });
+    await server_1.redis.set(cacheKey, JSON.stringify(dataToCache), { expiration: (0, date_fns_1.addMinutes)(new Date(), 10) });
     return {
         createdAt: user.createdAt,
         userDescription: user.userDescription,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fsvreddit/bot-bouncer-evaluation",
-    "version": "0.7.50",
+    "version": "0.8.0",
     "description": "Evaluation code for Bot Bouncer, a Dev Platform app designed to hunt bots on Reddit",
     "main": "dist/index.js",
     "scripts": {
@@ -20,10 +20,9 @@
     "author": "fsv",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@fsvreddit/fsv-devvit-helpers": "^0.1.13",
+        "@fsvreddit/fsv-devvit-web-helpers": "^0.2.3",
         "@wordpress/wordcount": "^4.53.0",
         "date-fns": "^4.1.0",
-        "devvit-helpers": "^0.11.0",
         "lodash": "^4.17.21",
         "markdown-escape": "^2.0.0",
         "openai": "^7.5.0",
@@ -44,7 +43,7 @@
         "devvit"
     ],
     "peerDependencies": {
-        "@devvit/protos": "^0.14.3",
-        "@devvit/public-api": "^0.14.3"
+        "@devvit/shared-types": "^0.14.7",
+        "@devvit/web": "^0.14.7"
     }
 }

package/tsconfig.build.json

@@ -1,14 +1,14 @@
-{
-    "extends": "./tsconfig.json",
-    "exclude": [
-        "vitest.config.ts",
-        "node_modules",
-        "tests",
-        "dist",
-        "eslint.config.mjs"
-    ],
-    "compilerOptions": {
-        "rootDir": "src",
-        "outDir": "dist",
-    }
-}
+{
+    "extends": "./tsconfig.json",
+    "exclude": [
+        "vitest.config.ts",
+        "node_modules",
+        "tests",
+        "dist",
+        "eslint.config.mjs"
+    ],
+    "compilerOptions": {
+        "rootDir": "src",
+        "outDir": "dist",
+    }
+}

package/tsconfig.json

@@ -1,5 +1,4 @@
 {
-    "extends": "@devvit/public-api/devvit.tsconfig.json",
     "compilerOptions": {
         "target": "ES2020",
         "lib": [
@@ -13,6 +12,7 @@
         "esModuleInterop": true,
         "module": "NodeNext",
         "moduleResolution": "NodeNext",
+        "skipLibCheck": true,
     },
     "exclude": [
         "**/node_modules",