feat: Add dns lookup caching

Reduces dns traffic by 95%

docs/operator/configuration.md

@@ -36,7 +36,7 @@ configuration.
 * **FILE** -- Values specified in a YAML/JSON configuration file using the structure [in the schema](https://json-schema.app/view/%23?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fcontext-mod%2Fmaster%2Fsrc%2FSchema%2FOperatorConfig.json)
   * When reading the **schema** if the variable is available at a level of configuration other than **FILE** it will be
     noted with the same symbol as above. The value shown is the default.
-* **ARG** -- Values specified as CLI arguments to the program (see [ClI Usage](#cli-usage) below)
+* **ARG** -- Values specified as CLI arguments to the program (see [CLI Usage](#cli-usage) below)
 
 ## File Configuration (Recommended)
 

package-lock.json

@@ -31,6 +31,7 @@
         "body-parser": "^1.19.0",
         "cache-manager": "^3.4.4",
         "cache-manager-redis-store": "^2.0.0",
+        "cacheable-lookup": "^6.1.0",
         "command-exists": "^1.2.9",
         "commander": "^8.0.0",
         "comment-json": "^4.1.1",
@@ -2395,9 +2396,9 @@
       }
     },
     "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz",
+      "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww==",
       "engines": {
         "node": ">=10.6.0"
       }
@@ -4421,6 +4422,14 @@
         "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
+    "node_modules/got/node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -12324,9 +12333,9 @@
       }
     },
     "cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz",
+      "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww=="
     },
     "cacheable-request": {
       "version": "7.0.2",
@@ -13900,6 +13909,13 @@
         "lowercase-keys": "^2.0.0",
         "p-cancelable": "^2.0.0",
         "responselike": "^2.0.0"
+      },
+      "dependencies": {
+        "cacheable-lookup": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+          "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="
+        }
       }
     },
     "graceful-fs": {

package.json

@@ -53,6 +53,7 @@
     "body-parser": "^1.19.0",
     "cache-manager": "^3.4.4",
     "cache-manager-redis-store": "^2.0.0",
+    "cacheable-lookup": "^6.1.0",
     "command-exists": "^1.2.9",
     "commander": "^8.0.0",
     "comment-json": "^4.1.1",

src/Action/ModNoteAction.ts

@@ -57,8 +57,18 @@ export class ModNoteAction extends Action {
             // nothing to do!
             noteCheckResult = 'existingNoteCheck=false so no existing note checks were performed.';
         } else {
+            const contextualCheck = {...this.existingNoteCheck};
+            let contextualNotes: string[] | undefined = undefined;
+            if(this.existingNoteCheck.note !== undefined && this.existingNoteCheck.note !== null) {
+                contextualNotes = [];
+                const notes = Array.isArray(this.existingNoteCheck.note) ? this.existingNoteCheck.note : [this.existingNoteCheck.note];
+                for(const n of notes) {
+                    contextualNotes.push((await this.renderContent(n, item, ruleResults, actionResults) as string))
+                }
+                contextualCheck.note = contextualNotes;
+            }
             const noteCheckCriteriaResult = await this.resources.isAuthor(item, {
-                modActions: [this.existingNoteCheck]
+                modActions: [contextualCheck]
             });
             noteCheckPassed = noteCheckCriteriaResult.passed;
             const {details} = buildFilterCriteriaSummary(noteCheckCriteriaResult);

src/Action/UserNoteAction.ts

@@ -54,8 +54,18 @@ export class UserNoteAction extends Action {
             // nothing to do!
             noteCheckResult = 'existingNoteCheck=false so no existing note checks were performed.';
         } else {
+            const contextualCheck = {...this.existingNoteCheck};
+            let contextualNotes: string[] | undefined = undefined;
+            if(this.existingNoteCheck.note !== undefined && this.existingNoteCheck.note !== null) {
+                contextualNotes = [];
+                const notes = Array.isArray(this.existingNoteCheck.note) ? this.existingNoteCheck.note : [this.existingNoteCheck.note];
+                for(const n of notes) {
+                    contextualNotes.push((await this.renderContent(n, item, ruleResults, actionResults) as string))
+                }
+                contextualCheck.note = contextualNotes;
+            }
             const noteCheckCriteriaResult = await this.resources.isAuthor(item, {
-                userNotes: [this.existingNoteCheck]
+                userNotes: [contextualCheck]
             });
             noteCheckPassed = noteCheckCriteriaResult.passed;
             const {details} = buildFilterCriteriaSummary(noteCheckCriteriaResult);

src/Common/Infrastructure/Filters/FilterCriteria.ts

@@ -289,57 +289,7 @@ export const toFullModLogCriteria = (val: ModLogCriteria): FullModLogCriteria =>
     }, {});
 }
 
-export const authorCriteriaProperties = ['name', 'flairCssClass', 'flairText', 'flairTemplate', 'isMod', 'userNotes', 'modActions', 'age', 'linkKarma', 'commentKarma', 'totalKarma', 'verified', 'shadowBanned', 'description', 'isContributor', 'banned'];
-
-export interface BanCriteria {
-    /**
-     * Test when the Author was banned against this comparison
-     *
-     * The syntax is `(< OR > OR <= OR >=) <number> <unit>`
-     *
-     * * EX `> 100 days` => Passes if Author was banned more than 100 days ago
-     * * EX `<= 2 months` => Passes if Author was banned less than or equal to 2 months ago
-     *
-     * Unit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)
-     *
-     * [See] https://regexr.com/609n8 for example
-     *
-     * @pattern ^\s*(>|>=|<|<=)\s*(\d+)\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\s*$
-     * */
-    bannedAt?: DurationComparor
-
-    /**
-     * A string or list of strings to match ban note against.
-     *
-     * If a list then ANY matched string makes this pass.
-     *
-     * String may be a regular expression enclosed in forward slashes. If it is not a regular expression then it is matched case-insensitive.
-     * */
-    note?: string | string[]
-
-    /**
-     * Test how many days are left for Author's ban against this comparison
-     *
-     * If the ban is permanent then the number of days left is equivalent to **INFINITY**
-     *
-     * The syntax is `(< OR > OR <= OR >=) <number> <unit>`
-     *
-     * * EX `> 100 days` => Passes if the Author's ban has more than 100 days left
-     * * EX `<= 2 months` => Passes if Author's ban has equal to or less than 2 months left
-     *
-     * Unit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)
-     *
-     * [See] https://regexr.com/609n8 for example
-     *
-     * @pattern ^\s*(>|>=|<|<=)\s*(\d+)\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\s*$
-     * */
-    daysLeft?: DurationComparor
-
-    /**
-     * Is the ban permanent?
-     * */
-    permanent?: boolean
-}
+export const authorCriteriaProperties = ['name', 'flairCssClass', 'flairText', 'flairTemplate', 'isMod', 'userNotes', 'modActions', 'age', 'linkKarma', 'commentKarma', 'totalKarma', 'verified', 'shadowBanned', 'description', 'isContributor'];
 
 /**
  * Criteria with which to test against the author of an Activity. The outcome of the test is based on:
@@ -478,19 +428,6 @@ export interface AuthorCriteria {
      * Is the author an approved user (contributor)?
      * */
     isContributor?: boolean
-
-    /**
-     * Is the Author banned or not?
-     *
-     * If user is not banned but BanCriteria(s) is present the test will fail
-     *
-     * * Use a boolean true/false for a simple yes or no
-     * * Or use a BanCriteria to test for specifics of an existing ban
-     * * Or use a list of BanCriteria -- if ANY BanCriteria passes the test passes
-     *
-     * NOTE: USE WITH CARE! This criteria usually incurs 1 API call
-     * */
-    banned?: boolean | BanCriteria | BanCriteria[]
 }
 
 /**
@@ -518,7 +455,6 @@ export const orderedAuthorCriteriaProps: (keyof AuthorCriteria)[] = [
     'isMod', // requires fetching mods for subreddit
     'isContributor', // requires fetching contributors for subreddit
     'modActions', // requires fetching mod notes/actions for author (shortest cache TTL)
-    'banned', // requires fetching /about/banned for every user not cached
 ];
 
 export interface ActivityState {

src/Common/Infrastructure/Reddit.ts

@@ -2,8 +2,6 @@ import {Comment, RedditUser, Submission, Subreddit} from "snoowrap/dist/objects"
 import { BannedUser } from "snoowrap/dist/objects/Subreddit";
 import { ValueOf } from "ts-essentials";
 import {CMError} from "../../Utils/Errors";
-import {Dayjs} from "dayjs";
-import {Duration} from "dayjs/plugin/duration.js";
 
 export type ActivityType = 'submission' | 'comment';
 export type MaybeActivityType = ActivityType | false;
@@ -170,10 +168,8 @@ export interface RedditRemovalMessageOptions {
     lock?: boolean
 }
 
-export interface CMBannedUser extends Omit<SnoowrapBannedUser, 'days_left' | 'date'> {
+export interface CMBannedUser extends SnoowrapBannedUser {
     user: RedditUser
-    date: Dayjs
-    days_left: undefined | Duration
 }
 
 export interface SnoowrapBannedUser extends Omit<BannedUser, 'id'> {

src/Rule/HistoryRule.ts

@@ -311,21 +311,24 @@ export class HistoryRule extends Rule {
 
         let criteriaMet = false;
         let failCriteriaResult: string = '';
+
+        const criteriaResultsSummary = criteriaResults.map(x => this.generateResultDataFromCriteria(x, true).result).join(this.condition === 'OR' ? ' OR ' : ' AND ');
+
         if (this.condition === 'OR') {
             criteriaMet = criteriaResults.some(x => x.triggered);
             if(!criteriaMet) {
-                failCriteriaResult = `${FAIL} No criteria was met`;
+                failCriteriaResult = `${FAIL} No criteria was met => ${criteriaResultsSummary}`;
             }
         } else {
             criteriaMet = criteriaResults.every(x => x.triggered);
             if(!criteriaMet) {
                 if(criteriaResults.some(x => x.triggered)) {
                     const met = criteriaResults.filter(x => x.triggered);
-                    failCriteriaResult = `${FAIL} ${met.length} out of ${criteriaResults.length} criteria met but Rule required all be met. Set log level to debug to see individual results`;
+                    failCriteriaResult = `${FAIL} ${met.length} out of ${criteriaResults.length} criteria met but Rule required all be met => ${criteriaResultsSummary}`;
                     const results = criteriaResults.map(x => this.generateResultDataFromCriteria(x, true));
                     this.logger.debug(`\r\n ${results.map(x => x.result).join('\r\n')}`);
                 } else {
-                    failCriteriaResult = `${FAIL} No criteria was met`;
+                    failCriteriaResult = `${FAIL} No criteria was met => ${criteriaResultsSummary}`;
                 }
             }
         }
@@ -335,8 +338,8 @@ export class HistoryRule extends Rule {
             const refCriteriaResults = criteriaResults.find(x => x.triggered);
             const resultData = this.generateResultDataFromCriteria(refCriteriaResults);
 
-            this.logger.verbose(`${PASS} ${resultData.result}`);
-            return Promise.resolve([true, this.getResult(true, resultData)]);
+            this.logger.verbose(`${PASS} ${criteriaResultsSummary}`);
+            return Promise.resolve([true, this.getResult(true, {data: resultData.data, result: criteriaResultsSummary})]);
         } else {
             // log failures for easier debugging
             for(const res of criteriaResults) {

src/Rule/MHSRule.ts

@@ -241,6 +241,8 @@ export class MHSRule extends Rule {
             res = await this.callMHS(content);
             if(res.response.toLowerCase() === 'success') {
                 await this.resources.cache.set(key, res, {ttl: this.resources.ttl.wikiTTL});
+            } else if(res.response.toLowerCase().includes('authentication failure')) {
+                throw new CMError(`MHS Request failed with Authentication failure. You most likely need to generate a new API key.`);
             }
             return res;
         }

src/Schema/Action.json

@@ -59,12 +59,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -83,9 +77,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -109,15 +100,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -139,9 +121,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -201,23 +180,6 @@
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
                     "type": "string"
                 },
-                "banned": {
-                    "anyOf": [
-                        {
-                            "$ref": "#/definitions/BanCriteria"
-                        },
-                        {
-                            "items": {
-                                "$ref": "#/definitions/BanCriteria"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ],
-                    "description": "Is the Author banned or not?\n\nIf user is not banned but BanCriteria(s) is present the test will fail\n\n* Use a boolean true/false for a simple yes or no\n* Or use a BanCriteria to test for specifics of an existing ban\n* Or use a list of BanCriteria -- if ANY BanCriteria passes the test passes\n\nNOTE: USE WITH CARE! This criteria usually incurs 1 API call"
-                },
                 "commentKarma": {
                     "description": "A string containing a comparison operator and a value to compare karma against\n\nThe syntax is `(< OR > OR <= OR >=) <number>[percent sign]`\n\n* EX `> 100`  => greater than 100 comment karma\n* EX `<= 75%` => comment karma is less than or equal to 75% of **all karma**",
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(%?)(.*)$",
@@ -383,12 +345,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -407,9 +363,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -456,15 +409,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -486,9 +430,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -537,50 +478,11 @@
             ],
             "type": "object"
         },
-        "BanCriteria": {
-            "properties": {
-                "bannedAt": {
-                    "description": "Test when the Author was banned against this comparison\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if Author was banned more than 100 days ago\n* EX `<= 2 months` => Passes if Author was banned less than or equal to 2 months ago\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "daysLeft": {
-                    "description": "Test how many days are left for Author's ban against this comparison\n\nIf the ban is permanent then the number of days left is equivalent to **INFINITY**\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if the Author's ban has more than 100 days left\n* EX `<= 2 months` => Passes if Author's ban has equal to or less than 2 months left\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "note": {
-                    "anyOf": [
-                        {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "string"
-                        }
-                    ],
-                    "description": "A string or list of strings to match ban note against.\n\nIf a list then ANY matched string makes this pass.\n\nString may be a regular expression enclosed in forward slashes. If it is not a regular expression then it is matched case-insensitive."
-                },
-                "permanent": {
-                    "description": "Is the ban permanent?",
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
         "CancelDispatchActionJson": {
             "description": "Remove the Activity",
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -599,9 +501,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -641,15 +540,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -671,9 +561,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -726,18 +613,8 @@
         "CommentActionJson": {
             "description": "Reply to the Activity. For a submission the reply will be a top-level comment.",
             "properties": {
-                "asModTeam": {
-                    "description": "Comment \"as subreddit\" using the \"/u/subreddit-ModTeam\" account\n\nRESTRICTIONS:\n\n* Target activity must ALREADY BE REMOVED\n* Will always distinguish and sticky the created comment",
-                    "type": "boolean"
-                },
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -756,9 +633,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -804,15 +678,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -834,9 +699,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -1107,12 +969,6 @@
                 },
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1131,9 +987,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1157,15 +1010,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1187,9 +1031,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -1228,12 +1069,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1252,9 +1087,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1340,15 +1172,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1370,9 +1193,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -1605,12 +1425,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1629,9 +1443,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1663,15 +1474,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1693,9 +1495,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -1765,12 +1564,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1789,9 +1582,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1815,15 +1605,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1845,9 +1626,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -1882,12 +1660,6 @@
                 },
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1906,9 +1678,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1950,15 +1719,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1980,9 +1740,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2146,12 +1903,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2170,9 +1921,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2220,15 +1968,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2250,9 +1989,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2486,12 +2222,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2510,9 +2240,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2536,15 +2263,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2566,9 +2284,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2611,12 +2326,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2635,9 +2344,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2670,15 +2376,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2700,9 +2397,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2733,12 +2427,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2757,9 +2445,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2818,15 +2503,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2848,9 +2524,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3212,12 +2885,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3236,9 +2903,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3270,15 +2934,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3300,9 +2955,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3345,12 +2997,6 @@
                 },
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3369,9 +3015,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3419,15 +3062,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3449,9 +3083,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"

src/Schema/OperatorConfig.json

@@ -24,23 +24,6 @@
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
                     "type": "string"
                 },
-                "banned": {
-                    "anyOf": [
-                        {
-                            "$ref": "#/definitions/BanCriteria"
-                        },
-                        {
-                            "items": {
-                                "$ref": "#/definitions/BanCriteria"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ],
-                    "description": "Is the Author banned or not?\n\nIf user is not banned but BanCriteria(s) is present the test will fail\n\n* Use a boolean true/false for a simple yes or no\n* Or use a BanCriteria to test for specifics of an existing ban\n* Or use a list of BanCriteria -- if ANY BanCriteria passes the test passes\n\nNOTE: USE WITH CARE! This criteria usually incurs 1 API call"
-                },
                 "commentKarma": {
                     "description": "A string containing a comparison operator and a value to compare karma against\n\nThe syntax is `(< OR > OR <= OR >=) <number>[percent sign]`\n\n* EX `> 100`  => greater than 100 comment karma\n* EX `<= 75%` => comment karma is less than or equal to 75% of **all karma**",
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(%?)(.*)$",
@@ -201,39 +184,6 @@
             },
             "type": "object"
         },
-        "BanCriteria": {
-            "properties": {
-                "bannedAt": {
-                    "description": "Test when the Author was banned against this comparison\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if Author was banned more than 100 days ago\n* EX `<= 2 months` => Passes if Author was banned less than or equal to 2 months ago\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "daysLeft": {
-                    "description": "Test how many days are left for Author's ban against this comparison\n\nIf the ban is permanent then the number of days left is equivalent to **INFINITY**\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if the Author's ban has more than 100 days left\n* EX `<= 2 months` => Passes if Author's ban has equal to or less than 2 months left\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "note": {
-                    "anyOf": [
-                        {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "string"
-                        }
-                    ],
-                    "description": "A string or list of strings to match ban note against.\n\nIf a list then ANY matched string makes this pass.\n\nString may be a regular expression enclosed in forward slashes. If it is not a regular expression then it is matched case-insensitive."
-                },
-                "permanent": {
-                    "description": "Is the ban permanent?",
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
         "BotConnection": {
             "description": "Configuration required to connect to a CM Server",
             "properties": {

src/Schema/Rule.json

@@ -432,10 +432,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -461,12 +461,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -485,9 +479,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -510,15 +501,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -540,9 +522,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -591,23 +570,6 @@
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
                     "type": "string"
                 },
-                "banned": {
-                    "anyOf": [
-                        {
-                            "$ref": "#/definitions/BanCriteria"
-                        },
-                        {
-                            "items": {
-                                "$ref": "#/definitions/BanCriteria"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ],
-                    "description": "Is the Author banned or not?\n\nIf user is not banned but BanCriteria(s) is present the test will fail\n\n* Use a boolean true/false for a simple yes or no\n* Or use a BanCriteria to test for specifics of an existing ban\n* Or use a list of BanCriteria -- if ANY BanCriteria passes the test passes\n\nNOTE: USE WITH CARE! This criteria usually incurs 1 API call"
-                },
                 "commentKarma": {
                     "description": "A string containing a comparison operator and a value to compare karma against\n\nThe syntax is `(< OR > OR <= OR >=) <number>[percent sign]`\n\n* EX `> 100`  => greater than 100 comment karma\n* EX `<= 75%` => comment karma is less than or equal to 75% of **all karma**",
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(%?)(.*)$",
@@ -772,12 +734,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -796,9 +752,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -833,15 +786,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -863,9 +807,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -891,39 +832,6 @@
             ],
             "type": "object"
         },
-        "BanCriteria": {
-            "properties": {
-                "bannedAt": {
-                    "description": "Test when the Author was banned against this comparison\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if Author was banned more than 100 days ago\n* EX `<= 2 months` => Passes if Author was banned less than or equal to 2 months ago\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "daysLeft": {
-                    "description": "Test how many days are left for Author's ban against this comparison\n\nIf the ban is permanent then the number of days left is equivalent to **INFINITY**\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if the Author's ban has more than 100 days left\n* EX `<= 2 months` => Passes if Author's ban has equal to or less than 2 months left\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "note": {
-                    "anyOf": [
-                        {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "string"
-                        }
-                    ],
-                    "description": "A string or list of strings to match ban note against.\n\nIf a list then ANY matched string makes this pass.\n\nString may be a regular expression enclosed in forward slashes. If it is not a regular expression then it is matched case-insensitive."
-                },
-                "permanent": {
-                    "description": "Is the ban permanent?",
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
         "CommentState": {
             "description": "Different attributes a `Comment` can be in. Only include a property if you want to check it.",
             "examples": [
@@ -1618,10 +1526,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1672,10 +1580,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1722,10 +1630,10 @@
                         "window": {
                             "anyOf": [
                                 {
-                                    "$ref": "#/definitions/FullActivityWindowConfig"
+                                    "$ref": "#/definitions/DurationObject"
                                 },
                                 {
-                                    "$ref": "#/definitions/DurationObject"
+                                    "$ref": "#/definitions/FullActivityWindowConfig"
                                 },
                                 {
                                     "type": [
@@ -1759,10 +1667,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1812,12 +1720,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1836,9 +1738,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1909,15 +1808,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1939,9 +1829,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2112,12 +1999,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2136,9 +2017,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2153,15 +2031,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2183,9 +2052,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2691,12 +2557,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2715,9 +2575,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2728,15 +2585,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2758,9 +2606,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2812,10 +2657,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -2957,10 +2802,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -2985,12 +2830,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3009,9 +2848,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3041,15 +2877,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3071,9 +2898,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3108,12 +2932,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3132,9 +2950,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3198,15 +3013,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3228,9 +3034,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3294,10 +3097,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3429,10 +3232,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3454,12 +3257,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3478,9 +3275,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3510,15 +3304,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3540,9 +3325,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3653,10 +3435,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3681,12 +3463,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3705,9 +3481,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3736,15 +3509,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3766,9 +3530,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"

src/Schema/RuleSet.json

@@ -397,10 +397,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -426,12 +426,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -450,9 +444,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -475,15 +466,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -505,9 +487,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -556,23 +535,6 @@
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
                     "type": "string"
                 },
-                "banned": {
-                    "anyOf": [
-                        {
-                            "$ref": "#/definitions/BanCriteria"
-                        },
-                        {
-                            "items": {
-                                "$ref": "#/definitions/BanCriteria"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ],
-                    "description": "Is the Author banned or not?\n\nIf user is not banned but BanCriteria(s) is present the test will fail\n\n* Use a boolean true/false for a simple yes or no\n* Or use a BanCriteria to test for specifics of an existing ban\n* Or use a list of BanCriteria -- if ANY BanCriteria passes the test passes\n\nNOTE: USE WITH CARE! This criteria usually incurs 1 API call"
-                },
                 "commentKarma": {
                     "description": "A string containing a comparison operator and a value to compare karma against\n\nThe syntax is `(< OR > OR <= OR >=) <number>[percent sign]`\n\n* EX `> 100`  => greater than 100 comment karma\n* EX `<= 75%` => comment karma is less than or equal to 75% of **all karma**",
                     "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(%?)(.*)$",
@@ -737,12 +699,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -761,9 +717,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -798,15 +751,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -828,9 +772,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -856,39 +797,6 @@
             ],
             "type": "object"
         },
-        "BanCriteria": {
-            "properties": {
-                "bannedAt": {
-                    "description": "Test when the Author was banned against this comparison\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if Author was banned more than 100 days ago\n* EX `<= 2 months` => Passes if Author was banned less than or equal to 2 months ago\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "daysLeft": {
-                    "description": "Test how many days are left for Author's ban against this comparison\n\nIf the ban is permanent then the number of days left is equivalent to **INFINITY**\n\nThe syntax is `(< OR > OR <= OR >=) <number> <unit>`\n\n* EX `> 100 days` => Passes if the Author's ban has more than 100 days left\n* EX `<= 2 months` => Passes if Author's ban has equal to or less than 2 months left\n\nUnit must be one of [DayJS Duration units](https://day.js.org/docs/en/durations/creating)\n\n[See] https://regexr.com/609n8 for example",
-                    "pattern": "^\\s*(>|>=|<|<=)\\s*(\\d+)\\s*(days?|weeks?|months?|years?|hours?|minutes?|seconds?|milliseconds?)\\s*$",
-                    "type": "string"
-                },
-                "note": {
-                    "anyOf": [
-                        {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        {
-                            "type": "string"
-                        }
-                    ],
-                    "description": "A string or list of strings to match ban note against.\n\nIf a list then ANY matched string makes this pass.\n\nString may be a regular expression enclosed in forward slashes. If it is not a regular expression then it is matched case-insensitive."
-                },
-                "permanent": {
-                    "description": "Is the ban permanent?",
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
         "CommentState": {
             "description": "Different attributes a `Comment` can be in. Only include a property if you want to check it.",
             "examples": [
@@ -1583,10 +1491,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1637,10 +1545,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1687,10 +1595,10 @@
                         "window": {
                             "anyOf": [
                                 {
-                                    "$ref": "#/definitions/FullActivityWindowConfig"
+                                    "$ref": "#/definitions/DurationObject"
                                 },
                                 {
-                                    "$ref": "#/definitions/DurationObject"
+                                    "$ref": "#/definitions/FullActivityWindowConfig"
                                 },
                                 {
                                     "type": [
@@ -1724,10 +1632,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -1777,12 +1685,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1801,9 +1703,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -1874,15 +1773,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -1904,9 +1794,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2077,12 +1964,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2101,9 +1982,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2118,15 +1996,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2148,9 +2017,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2656,12 +2522,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2680,9 +2540,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -2693,15 +2550,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2723,9 +2571,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -2777,10 +2622,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -2922,10 +2767,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -2950,12 +2795,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -2974,9 +2813,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3006,15 +2842,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3036,9 +2863,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3073,12 +2897,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3097,9 +2915,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3163,15 +2978,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3193,9 +2999,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3259,10 +3062,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3394,10 +3197,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3419,12 +3222,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3443,9 +3240,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3475,15 +3269,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3505,9 +3290,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"
@@ -3618,10 +3400,10 @@
                 "window": {
                     "anyOf": [
                         {
-                            "$ref": "#/definitions/FullActivityWindowConfig"
+                            "$ref": "#/definitions/DurationObject"
                         },
                         {
-                            "$ref": "#/definitions/DurationObject"
+                            "$ref": "#/definitions/FullActivityWindowConfig"
                         },
                         {
                             "type": [
@@ -3646,12 +3428,6 @@
             "properties": {
                 "authorIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/AuthorCriteria"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<AuthorCriteria>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3670,9 +3446,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<AuthorCriteria>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "If present then these Author criteria are checked before running the Check. If criteria fails then the Check will fail."
@@ -3701,15 +3474,6 @@
                 },
                 "itemIs": {
                     "anyOf": [
-                        {
-                            "$ref": "#/definitions/SubmissionState"
-                        },
-                        {
-                            "$ref": "#/definitions/CommentState"
-                        },
-                        {
-                            "$ref": "#/definitions/NamedCriteria<TypedActivityState>"
-                        },
                         {
                             "items": {
                                 "anyOf": [
@@ -3731,9 +3495,6 @@
                         },
                         {
                             "$ref": "#/definitions/FilterOptionsJson<TypedActivityState>"
-                        },
-                        {
-                            "type": "string"
                         }
                     ],
                     "description": "A list of criteria to test the state of the `Activity` against before running the check.\n\nIf any set of criteria passes the Check will be run. If the criteria fails then the Check will fail.\n\n* @examples [[{\"over_18\": true, \"removed': false}]]"

src/Subreddit/ModNotes/ModNote.ts

@@ -167,7 +167,15 @@ export class ModNote {
             if (referenceItem === undefined) {
                 throw new CMError('Criteria wants to check if mod note references activity but not activity was given.');
             }
-            const isCurrentActivity = this.action.actedOn !== undefined && referenceItem !== undefined && this.action.actedOn.name === referenceItem.name;
+            let isCurrentActivity = false;
+            if(referenceItem !== undefined) {
+                if(this.action.actedOn !== undefined) {
+                    isCurrentActivity = this.action.actedOn.name === referenceItem.name;
+                }
+                if(isCurrentActivity === false && this.note !== undefined && this.note.actedOn !== undefined) {
+                    isCurrentActivity = this.note.actedOn.name === referenceItem.name;
+                }
+            }
             if ((referencesCurrentActivity === true && !isCurrentActivity) || (referencesCurrentActivity === false && isCurrentActivity)) {
                 return false;
             }

src/Subreddit/ModNotes/ModUserNote.ts

@@ -33,9 +33,19 @@ export class ModUserNote {
     }
 
     toRaw(): ModUserNoteRaw {
+        let id = undefined;
+        if(this.actedOn !== undefined) {
+            if(this.actedOn instanceof Submission) {
+                id = `t3_${this.actedOn.id}`;
+            } else if(this.actedOn instanceof Comment) {
+                id = `t1_${this.actedOn.id}`;
+            } else if(this.actedOn instanceof RedditUser) {
+                id = `t2_${this.actedOn.id}`;
+            }
+        }
         return {
             note: this.note,
-            reddit_id: this.actedOn !== undefined ? this.actedOn.id : undefined,
+            reddit_id: id,
             label: this.label
         }
     }

src/Subreddit/SubredditResources.ts

@@ -29,7 +29,7 @@ import {
     generateFullWikiUrl,
     generateItemFilterHelpers,
     getActivityAuthorName,
-    getActivitySubredditName, humanizeBanDetails,
+    getActivitySubredditName,
     isComment,
     isCommentState,
     isRuleSetResult,
@@ -88,7 +88,7 @@ import cloneDeep from "lodash/cloneDeep";
 import {
     asModLogCriteria,
     asModNoteCriteria,
-    AuthorCriteria, BanCriteria,
+    AuthorCriteria,
     cmToSnoowrapActivityMap, cmToSnoowrapAuthorMap,
     CommentState,
     ModLogCriteria,
@@ -163,7 +163,6 @@ import {SubredditResourceOptions} from "../Common/Subreddit/SubredditResourceInt
 import {SubredditStats} from "./Stats";
 import {CMCache, createCacheManager} from "../Common/Cache";
 import {BannedUser, BanOptions} from "snoowrap/dist/objects/Subreddit";
-import {testBanCriteria} from "../Utils/Criteria/AuthorCritUtils";
 
 export const DEFAULT_FOOTER = '\r\n*****\r\nThis action was performed by [a bot.]({{botLink}}) Mention a moderator or [send a modmail]({{modmailLink}}) if you have any ideas, questions, or concerns about this action.';
 
@@ -882,7 +881,7 @@ export class SubredditResources {
                 if(cachedBanData === false) {
                     return undefined;
                 }
-                return {...cachedBanData, date: dayjs.unix(cachedBanData.date), days_left: cachedBanData.days_left === null ? undefined : dayjs.duration({days: cachedBanData.days_left}), user: new RedditUser({name: cachedBanData.name}, this.client, false)};
+                return {...cachedBanData, user: new RedditUser({name: cachedBanData.name}, this.client, false)};
             }
         }
 
@@ -890,7 +889,7 @@ export class SubredditResources {
         let bannedUser: CMBannedUser | undefined;
         if(bannedUsers.length > 0) {
             const banData = bannedUsers[0] as SnoowrapBannedUser;
-            bannedUser = {...banData, date: dayjs.unix(banData.date), days_left: banData.days_left === null ? undefined : dayjs.duration({days: banData.days_left}),  user: new RedditUser({name: banData.name}, this.client, false)};
+            bannedUser = {...banData,  user: new RedditUser({name: banData.name}, this.client, false)};
         }
 
         if (this.ttl.authorTTL !== false) {
@@ -1288,7 +1287,7 @@ export class SubredditResources {
                     }
                     preFilteredPrefetchedActivities = await this.filterListingWithHistoryOptions(preFilteredPrefetchedActivities, user, options.filterOn?.pre);
                 }
-                let unFilteredItems: SnoowrapActivity[] | undefined = [...preFilteredPrefetchedActivities];
+                let unFilteredItems: SnoowrapActivity[] | undefined = undefined;
                 pre = pre.concat(preFilteredPrefetchedActivities);
 
                 const { func: listingFunc } = listingData;
@@ -1347,7 +1346,7 @@ export class SubredditResources {
 
                     if(satisfiedPreEndtime !== undefined || satisfiedPreCount !== undefined) {
                         if(unFilteredItems === undefined) {
-                            unFilteredItems = [];
+                            unFilteredItems = [...preFilteredPrefetchedActivities];
                         }
                         // window has pre filtering, need to check if fallback max would be hit
                         if(satisfiedPreEndtime !== undefined) {
@@ -2788,33 +2787,6 @@ export class SubredditResources {
                                 shouldContinue = false;
                             }
                             break;
-                        case 'banned':
-                            const banDetails = await this.getSubredditBannedUser(item.author);
-                            const isBanned = banDetails !== undefined;
-                            propResultsMap.banned!.found = humanizeBanDetails(banDetails);
-
-                            if(typeof authorOpts.banned === 'boolean') {
-                                propResultsMap.banned!.passed = criteriaPassWithIncludeBehavior(isBanned === authorOpts.banned, include);
-                            } else if(!isBanned) {
-                                // since banned criteria is not boolean it must be criteria(s)
-                                // and if user is not banned then no criteria will pass
-                                propResultsMap.banned!.passed = criteriaPassWithIncludeBehavior(false, include);
-                            } else {
-                                const bCritVal = authorOpts.banned as BanCriteria | BanCriteria[];
-                                const bCritArr = !Array.isArray(bCritVal) ? [bCritVal] : bCritVal;
-                                let anyBanCritPassed = false;
-                                for(const bCrit of bCritArr) {
-                                    anyBanCritPassed = testBanCriteria(bCrit, banDetails);
-                                    if(anyBanCritPassed) {
-                                        break;
-                                    }
-                                }
-                                propResultsMap.banned!.passed = criteriaPassWithIncludeBehavior(anyBanCritPassed, include);
-                            }
-                            if (!propResultsMap.banned!.passed) {
-                                shouldContinue = false;
-                            }
-                            break;
                         case 'userNotes':
                             const unCriterias = (authorOpts[k] as UserNoteCriteria[]).map(x => toFullUserNoteCriteria(x));
                             const notes = await this.userNotes.getUserNotes(item.author);

src/Utils/Criteria/AuthorCritUtils.ts

@@ -1,79 +0,0 @@
-import {BanCriteria} from "../../Common/Infrastructure/Filters/FilterCriteria";
-import {boolToString, testMaybeStringRegex} from "../../util";
-import {CMBannedUser} from "../../Common/Infrastructure/Reddit";
-import {compareDurationValue, parseDurationComparison} from "../../Common/Infrastructure/Comparisons";
-import dayjs from "dayjs";
-
-export const humanizeBanCriteria = (crit: BanCriteria): string => {
-    const parts: string[] = [];
-    for (const [k, v] of Object.entries(crit)) {
-        switch (k.toLowerCase()) {
-            case 'note':
-                parts.push(`has notes matching: "${Array.isArray(v) ? v.join(' || ') : v}"`);
-                break;
-            default:
-                parts.push(`${k}: ${typeof v === 'boolean' ? boolToString(v) : v.toString()}`);
-                break;
-        }
-    }
-    return parts.join(' AND ');
-}
-
-export const testBanCriteria = (crit: BanCriteria, banUser: CMBannedUser): boolean => {
-    if (crit.permanent !== undefined) {
-        // easiest to test for
-        if ((banUser.days_left === undefined && !crit.permanent) || (banUser.days_left !== undefined && crit.permanent)) {
-            return false;
-        }
-    }
-    if (crit.note !== undefined) {
-        let anyPassed = false;
-        const expectedValues = Array.isArray(crit.note) ? crit.note : [crit.note];
-        for (const expectedVal of expectedValues) {
-            try {
-                const [regPassed] = testMaybeStringRegex(expectedVal, banUser.note);
-                if (regPassed) {
-                    anyPassed = true;
-                }
-            } catch (err: any) {
-                if (err.message.includes('Could not convert test value')) {
-                    // fallback to simple comparison
-                    anyPassed = expectedVal.toLowerCase() === banUser.note.toLowerCase();
-                } else {
-                    throw err;
-                }
-            }
-            if (anyPassed) {
-                break;
-            }
-        }
-        if (!anyPassed) {
-            return false;
-        }
-    }
-
-    if (crit.bannedAt !== undefined) {
-        const ageTest = compareDurationValue(parseDurationComparison(crit.bannedAt), banUser.date);
-        if (!ageTest) {
-            return false;
-        }
-    }
-
-    if (crit.daysLeft !== undefined) {
-        const daysLeftCompare = parseDurationComparison(crit.daysLeft);
-        if (banUser.days_left === undefined) {
-            if (daysLeftCompare.operator.includes('<')) {
-                // permaban, will never be less than some finite duration
-                return false;
-            }
-            // otherwise will always pass since any finite duration is less than infinity
-        } else {
-            const dayTest = compareDurationValue(daysLeftCompare, dayjs().add(banUser.days_left));
-            if (!dayTest) {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}

src/index.ts

@@ -1,6 +1,9 @@
 import winston from 'winston';
 import 'winston-daily-rotate-file';
 import dayjs from 'dayjs';
+import http from 'http';
+import https from 'https';
+import CacheableLookup from 'cacheable-lookup';
 import utc from 'dayjs/plugin/utc.js';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
 import tz from 'dayjs/plugin/timezone';
@@ -9,7 +12,6 @@ import relTime from 'dayjs/plugin/relativeTime.js';
 import sameafter from 'dayjs/plugin/isSameOrAfter.js';
 import samebefore from 'dayjs/plugin/isSameOrBefore.js';
 import weekOfYear from 'dayjs/plugin/weekOfYear.js';
-import {Manager} from "./Subreddit/Manager";
 import {Command, Argument} from 'commander';
 
 import {
@@ -40,6 +42,17 @@ dayjs.extend(tz);
 dayjs.extend(advancedFormat);
 dayjs.extend(weekOfYear);
 
+const cacheable = new CacheableLookup({
+    // cache dns entries for 60 seconds
+    maxTtl: 60,
+    // fallback to node lookup for 10 minutes in the event of a failure for 10 minutes
+    fallbackDuration: 600
+});
+
+// replace node native request agents, globally, so they used cached dns lookup
+cacheable.install(http.globalAgent);
+cacheable.install(https.globalAgent);
+
 const commentReg = parseLinkIdentifier([COMMENT_URL_ID]);
 const submissionReg = parseLinkIdentifier([SUBMISSION_URL_ID]);
 

src/util.ts

@@ -111,7 +111,7 @@ import {
 } from "./Common/Infrastructure/Filters/FilterShapes";
 import {
     ActivityType,
-    AuthorHistoryType, CMBannedUser,
+    AuthorHistoryType,
     FullNameTypes,
     PermalinkRedditThings,
     RedditThing,
@@ -3116,15 +3116,3 @@ export const toPollOn = (val: string | PollOn): PollOn => {
     }
     throw new SimpleError(`'${val}' is not a valid polling source. Valid sources: ${pollOnTypes.join(' | ')}`);
 }
-
-export const humanizeBanDetails = (banDetails: CMBannedUser | undefined): string => {
-    if(banDetails === undefined) {
-        return 'Not Banned';
-    }
-    const timeSinceBan = dayjs.duration(dayjs().diff(banDetails.date)).humanize(true);
-    if(banDetails.days_left === undefined) {
-        return `Banned permanently ${timeSinceBan}`;
-    }
-
-    return `Banned ${timeSinceBan} with ${banDetails.days_left?.days()} days left`;
-}