half the number of errors

backend/package-lock.json

@@ -13,8 +13,7 @@
         "cors": "^2.8.5",
         "cross-env": "^5.2.0",
         "deep-diff": "^1.0.2",
-        "discord-api-types": "^0.33.1",
+        "discord.js": "14.7.2-dev.1678536262-1b29099.0",
-        "discord.js": "^14.7.1",
         "dotenv": "^4.0.0",
         "emoji-regex": "^8.0.0",
         "erlpack": "github:discord/erlpack",
@@ -53,7 +52,7 @@
         "tsconfig-paths": "^3.9.0",
         "twemoji": "^12.1.4",
         "typeorm": "^0.2.31",
-        "typescript": "4.9",
+        "typescript": "~4.9.5",
         "utf-8-validate": "^5.0.5",
         "uuid": "^3.3.2",
         "yawn-yaml": "github:dragory/yawn-yaml#string-number-fix-build",
@@ -158,6 +157,22 @@
         "node": ">=16.9.0"
       }
     },
+    "node_modules/@discordjs/formatters": {
+      "version": "0.1.1-dev.1678536268-1b29099.0",
+      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.1.1-dev.1678536268-1b29099.0.tgz",
+      "integrity": "sha512-cMjsbJPW23HolJdx6zefhtc12qfHO7AY10miC3pSMB47dnvO4w8yJwBy6N7Y8pKpQzf5GNqOrJ87Z16CTeWHjw==",
+      "dependencies": {
+        "discord-api-types": "^0.37.35"
+      },
+      "engines": {
+        "node": ">=16.9.0"
+      }
+    },
+    "node_modules/@discordjs/formatters/node_modules/discord-api-types": {
+      "version": "0.37.35",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.35.tgz",
+      "integrity": "sha512-iyKZ/82k7FX3lcmHiAvvWu5TmyfVo78RtghBV/YsehK6CID83k5SI03DKKopBcln+TiEIYw5MGgq7SJXSpNzMg=="
+    },
     "node_modules/@discordjs/rest": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.5.0.tgz",
@@ -478,8 +493,9 @@
       "license": "MIT"
     },
     "node_modules/@types/ws": {
-      "version": "8.5.3",
+      "version": "8.5.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1752,28 +1768,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/discord-api-types": {
-      "version": "0.33.4",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.33.4.tgz",
-      "integrity": "sha512-Y6RMvXsHKiBgQhm/q5MgRieXc4Tzh5p/JuDyqreI48lmy+AQfO+g9Xhz0tuGBaN1FtsrLT7mD+lbFONPo5vdwA=="
-    },
     "node_modules/discord.js": {
-      "version": "14.7.1",
+      "version": "14.7.2-dev.1678536262-1b29099.0",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.2-dev.1678536262-1b29099.0.tgz",
-      "integrity": "sha512-1FECvqJJjjeYcjSm0IGMnPxLqja/pmG1B0W2l3lUY2Gi4KXiyTeQmU1IxWcbXHn2k+ytP587mMWqva2IA87EbA==",
+      "integrity": "sha512-Z2D0Ae4yxeVvaPa9ot88fPMuzADsKqZuqCLFKJ91XGjY5AL7uZxUCrnNNMUoi4JfSrL4GIG6eA7ddX/lORoCmQ==",
       "dependencies": {
         "@discordjs/builders": "^1.4.0",
         "@discordjs/collection": "^1.3.0",
-        "@discordjs/rest": "^1.4.0",
+        "@discordjs/formatters": "^0.1.0",
+        "@discordjs/rest": "^1.5.0",
         "@discordjs/util": "^0.1.0",
-        "@sapphire/snowflake": "^3.2.2",
+        "@sapphire/snowflake": "^3.4.0",
-        "@types/ws": "^8.5.3",
+        "@types/ws": "^8.5.4",
-        "discord-api-types": "^0.37.20",
+        "discord-api-types": "^0.37.35",
         "fast-deep-equal": "^3.1.3",
         "lodash.snakecase": "^4.1.1",
-        "tslib": "^2.4.1",
+        "tslib": "^2.5.0",
-        "undici": "^5.13.0",
+        "undici": "^5.20.0",
-        "ws": "^8.11.0"
+        "ws": "^8.12.1"
       },
       "engines": {
         "node": ">=16.9.0"
@@ -5523,6 +5535,21 @@
       "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.3.0.tgz",
       "integrity": "sha512-ylt2NyZ77bJbRij4h9u/wVy7qYw/aDqQLWnadjvDqW/WoWCxrsX6M3CIw9GVP5xcGCDxsrKj5e0r5evuFYwrKg=="
     },
+    "@discordjs/formatters": {
+      "version": "0.1.1-dev.1678536268-1b29099.0",
+      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.1.1-dev.1678536268-1b29099.0.tgz",
+      "integrity": "sha512-cMjsbJPW23HolJdx6zefhtc12qfHO7AY10miC3pSMB47dnvO4w8yJwBy6N7Y8pKpQzf5GNqOrJ87Z16CTeWHjw==",
+      "requires": {
+        "discord-api-types": "^0.37.35"
+      },
+      "dependencies": {
+        "discord-api-types": {
+          "version": "0.37.35",
+          "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.35.tgz",
+          "integrity": "sha512-iyKZ/82k7FX3lcmHiAvvWu5TmyfVo78RtghBV/YsehK6CID83k5SI03DKKopBcln+TiEIYw5MGgq7SJXSpNzMg=="
+        }
+      }
+    },
     "@discordjs/rest": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.5.0.tgz",
@@ -5779,7 +5806,9 @@
       "dev": true
     },
     "@types/ws": {
-      "version": "8.5.3",
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
       "requires": {
         "@types/node": "*"
       }
@@ -6599,28 +6628,24 @@
         "path-type": "^4.0.0"
       }
     },
-    "discord-api-types": {
-      "version": "0.33.4",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.33.4.tgz",
-      "integrity": "sha512-Y6RMvXsHKiBgQhm/q5MgRieXc4Tzh5p/JuDyqreI48lmy+AQfO+g9Xhz0tuGBaN1FtsrLT7mD+lbFONPo5vdwA=="
-    },
     "discord.js": {
-      "version": "14.7.1",
+      "version": "14.7.2-dev.1678536262-1b29099.0",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.2-dev.1678536262-1b29099.0.tgz",
-      "integrity": "sha512-1FECvqJJjjeYcjSm0IGMnPxLqja/pmG1B0W2l3lUY2Gi4KXiyTeQmU1IxWcbXHn2k+ytP587mMWqva2IA87EbA==",
+      "integrity": "sha512-Z2D0Ae4yxeVvaPa9ot88fPMuzADsKqZuqCLFKJ91XGjY5AL7uZxUCrnNNMUoi4JfSrL4GIG6eA7ddX/lORoCmQ==",
       "requires": {
         "@discordjs/builders": "^1.4.0",
         "@discordjs/collection": "^1.3.0",
-        "@discordjs/rest": "^1.4.0",
+        "@discordjs/formatters": "0.1.1-dev.1678536268-1b29099.0",
+        "@discordjs/rest": "^1.5.0",
         "@discordjs/util": "^0.1.0",
-        "@sapphire/snowflake": "^3.2.2",
+        "@sapphire/snowflake": "^3.4.0",
-        "@types/ws": "^8.5.3",
+        "@types/ws": "^8.5.4",
-        "discord-api-types": "^0.37.20",
+        "discord-api-types": "^0.37.35",
         "fast-deep-equal": "^3.1.3",
         "lodash.snakecase": "^4.1.1",
-        "tslib": "^2.4.1",
+        "tslib": "^2.5.0",
-        "undici": "^5.13.0",
+        "undici": "^5.20.0",
-        "ws": "^8.11.0"
+        "ws": "^8.12.1"
       },
       "dependencies": {
         "discord-api-types": {
@@ -7214,7 +7239,7 @@
       "integrity": "sha512-tT27Qr8qpge+EWonrMyw54mZ67/1WP3oKF7QgTdK6cYArTdERuYxF9X7ngd9JXcVeW9/WYz/62jq42/w9lDzIA==",
       "requires": {
         "discord-api-types": "^0.37.10",
-        "discord.js": "^14",
+        "discord.js": "14.7.2-dev.1678536262-1b29099.0",
         "knub-command-manager": "^9.1.0",
         "ts-essentials": "^9",
         "zod": "^3.19.1"

backend/package.json

@@ -28,8 +28,7 @@
     "cors": "^2.8.5",
     "cross-env": "^5.2.0",
     "deep-diff": "^1.0.2",
-    "discord-api-types": "^0.33.1",
+    "discord.js": "14.7.2-dev.1678536262-1b29099.0",
-    "discord.js": "^14.7.1",
     "dotenv": "^4.0.0",
     "emoji-regex": "^8.0.0",
     "erlpack": "github:discord/erlpack",
@@ -68,7 +67,7 @@
     "tsconfig-paths": "^3.9.0",
     "twemoji": "^12.1.4",
     "typeorm": "^0.2.31",
-    "typescript": "4.9",
+    "typescript": "~4.9.5",
     "utf-8-validate": "^5.0.5",
     "uuid": "^3.3.2",
     "yawn-yaml": "github:dragory/yawn-yaml#string-number-fix-build",
@@ -103,5 +102,11 @@
     "require": [
       "./register-tsconfig-paths.js"
     ]
+  },
+  "overrides": {
+    "@discordjs/formatters": "0.1.1-dev.1678536268-1b29099.0",
+    "knub": {
+      "discord.js": "14.7.2-dev.1678536262-1b29099.0"
+    }
   }
 }

backend/src/api/guilds/misc.ts

@@ -5,7 +5,6 @@ import { validateGuildConfig } from "../../configValidator";
 import { AllowedGuilds } from "../../data/AllowedGuilds";
 import { ApiPermissionAssignments, ApiPermissionTypes } from "../../data/ApiPermissionAssignments";
 import { Configs } from "../../data/Configs";
-import { apiTokenAuthHandlers } from "../auth";
 import { hasGuildPermission, requireGuildPermission } from "../permissions";
 import { clientError, ok, serverError, unauthorized } from "../responses";
 import { loadYamlSafely } from "../../utils/loadYamlSafely";
@@ -15,8 +14,6 @@ import moment from "moment-timezone";
 import { ApiAuditLog } from "../../data/ApiAuditLog";
 import { AuditLogEventTypes } from "../../data/apiAuditLogTypes";
 import { Queue } from "../../Queue";
-import { GuildCases } from "../../data/GuildCases";
-import { z } from "zod";
 
 const apiPermissionAssignments = new ApiPermissionAssignments();
 const auditLog = new ApiAuditLog();

backend/src/data/AllowedGuilds.ts

@@ -4,7 +4,6 @@ import { BaseRepository } from "./BaseRepository";
 import { AllowedGuild } from "./entities/AllowedGuild";
 import moment from "moment-timezone";
 import { DBDateFormat } from "../utils";
-import { env } from "../env";
 
 export class AllowedGuilds extends BaseRepository {
   private allowedGuilds: Repository<AllowedGuild>;

backend/src/data/ApiAuditLog.ts

@@ -1,7 +1,6 @@
 import { BaseRepository } from "./BaseRepository";
 import { getRepository, Repository } from "typeorm/index";
 import { ApiAuditLogEntry } from "./entities/ApiAuditLogEntry";
-import { ApiLogin } from "./entities/ApiLogin";
 import { AuditLogEventData, AuditLogEventType } from "./apiAuditLogTypes";
 
 export class ApiAuditLog extends BaseRepository {

backend/src/data/GuildArchives.ts

@@ -1,4 +1,4 @@
-import { Guild, Snowflake, User } from "discord.js";
+import { Guild, Snowflake } from "discord.js";
 import moment from "moment-timezone";
 import { isDefaultSticker } from "src/utils/isDefaultSticker";
 import { getRepository, Repository } from "typeorm";
@@ -6,11 +6,7 @@ import { renderTemplate, TemplateSafeValueContainer } from "../templateFormatter
 import { trimLines } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
 import { ArchiveEntry } from "./entities/ArchiveEntry";
-import {
+import { channelToTemplateSafeChannel, guildToTemplateSafeGuild } from "../utils/templateSafeObjects";
-  channelToTemplateSafeChannel,
-  guildToTemplateSafeGuild,
-  userToTemplateSafeUser,
-} from "../utils/templateSafeObjects";
 import { SavedMessage } from "./entities/SavedMessage";
 import { decrypt, encrypt } from "../utils/crypt";
 

backend/src/data/GuildCases.ts

@@ -4,7 +4,6 @@ import { CaseTypes } from "./CaseTypes";
 import { connection } from "./db";
 import { Case } from "./entities/Case";
 import { CaseNote } from "./entities/CaseNote";
-import moment from "moment-timezone";
 import { chunkArray } from "../utils";
 import { Queue } from "../Queue";
 

backend/src/data/GuildRoleButtons.ts

@@ -1,11 +1,5 @@
 import { getRepository, Repository } from "typeorm";
-import { Reminder } from "./entities/Reminder";
-import { BaseRepository } from "./BaseRepository";
-import moment from "moment-timezone";
-import { DBDateFormat } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
-import { RoleQueueItem } from "./entities/RoleQueueItem";
-import { connection } from "./db";
 import { RoleButtonsItem } from "./entities/RoleButtonsItem";
 
 export class GuildRoleButtons extends BaseGuildRepository {

backend/src/data/GuildRoleQueue.ts

@@ -1,8 +1,4 @@
 import { getRepository, Repository } from "typeorm";
-import { Reminder } from "./entities/Reminder";
-import { BaseRepository } from "./BaseRepository";
-import moment from "moment-timezone";
-import { DBDateFormat } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
 import { RoleQueueItem } from "./entities/RoleQueueItem";
 import { connection } from "./db";

backend/src/data/GuildSavedMessages.ts

@@ -1,13 +1,11 @@
 import { GuildChannel, Message } from "discord.js";
 import moment from "moment-timezone";
 import { getRepository, Repository } from "typeorm";
-import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
 import { QueuedEventEmitter } from "../QueuedEventEmitter";
 import { BaseGuildRepository } from "./BaseGuildRepository";
 import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage";
 import { buildEntity } from "./buildEntity";
 import { noop } from "../utils";
-import { decrypt } from "../utils/crypt";
 import { decryptJson, encryptJson } from "../utils/cryptHelpers";
 import { asyncMap } from "../utils/async";
 

backend/src/data/Mutes.ts

@@ -1,5 +1,5 @@
 import moment from "moment-timezone";
-import { Brackets, getRepository, Repository } from "typeorm";
+import { getRepository, Repository } from "typeorm";
 import { Mute } from "./entities/Mute";
 import { DAYS, DBDateFormat } from "../utils";
 import { BaseRepository } from "./BaseRepository";

backend/src/data/entities/ApiAuditLogEntry.ts

@@ -1,5 +1,4 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, Entity, PrimaryColumn } from "typeorm";
-import { ApiUserInfo } from "./ApiUserInfo";
 import { AuditLogEventData, AuditLogEventType } from "../apiAuditLogTypes";
 
 @Entity("api_audit_log")

backend/src/data/entities/CounterTrigger.ts

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 
 export const TRIGGER_COMPARISON_OPS = ["=", "!=", ">", "<", ">=", "<="] as const;
 
-export type TriggerComparisonOp = typeof TRIGGER_COMPARISON_OPS[number];
+export type TriggerComparisonOp = (typeof TRIGGER_COMPARISON_OPS)[number];
 
 const REVERSE_OPS: Record<TriggerComparisonOp, TriggerComparisonOp> = {
   "=": "!=",

backend/src/data/entities/Reminder.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 
 @Entity("reminders")
 export class Reminder {

backend/src/data/entities/ScheduledPost.ts

@@ -1,5 +1,5 @@
 import { Attachment } from "discord.js";
-import { Column, Entity, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 import { StrictMessageContent } from "../../utils";
 
 @Entity("scheduled_posts")

backend/src/data/entities/VCAlert.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 
 @Entity("vc_alerts")
 export class VCAlert {

backend/src/data/loops/expiredArchiveDeletionLoop.ts

@@ -2,7 +2,6 @@
 
 import { lazyMemoize, MINUTES } from "../../utils";
 import { Archives } from "../Archives";
-import moment from "moment-timezone";
 
 const LOOP_INTERVAL = 15 * MINUTES;
 const getArchivesRepository = lazyMemoize(() => new Archives());

backend/src/data/loops/expiringMutesLoop.ts

@@ -1,6 +1,6 @@
 // tslint:disable:no-console
 
-import { lazyMemoize, memoize, MINUTES } from "../../utils";
+import { lazyMemoize, MINUTES } from "../../utils";
 import { Mutes } from "../Mutes";
 import Timeout = NodeJS.Timeout;
 import moment from "moment-timezone";

backend/src/data/loops/phishermanLoops.ts

@@ -1,6 +1,6 @@
 // tslint:disable:no-console
 
-import { HOURS, MINUTES } from "../../utils";
+import { MINUTES } from "../../utils";
 import {
   deleteStalePhishermanCacheEntries,
   deleteStalePhishermanKeyCacheEntries,

backend/src/index.ts

@@ -1,4 +1,16 @@
-import { Client, Constants, Intents, Options, TextChannel, ThreadChannel } from "discord.js";
+import {
+  Client,
+  Events,
+  GatewayIntentBits,
+  GuildTextBasedChannel,
+  Message,
+  Options,
+  Partials,
+  RESTEvents,
+  TextBasedChannel,
+  TextChannel,
+  ThreadChannel,
+} from "discord.js";
 import { Knub, PluginError } from "knub";
 import { PluginLoadError } from "knub/dist/plugins/PluginLoadError";
 // Always use UTC internally
@@ -14,13 +26,11 @@ import { logger } from "./logger";
 import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availablePlugins";
 import { RecoverablePluginError } from "./RecoverablePluginError";
 import { SimpleError } from "./SimpleError";
-import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types";
 import { startUptimeCounter } from "./uptime";
 import { errorMessage, isDiscordAPIError, isDiscordHTTPError, MINUTES, SECONDS, sleep, successMessage } from "./utils";
 import { loadYamlSafely } from "./utils/loadYamlSafely";
 import { DecayingCounter } from "./utils/DecayingCounter";
 import { PluginNotLoadedError } from "knub/dist/plugins/PluginNotLoadedError";
-import { logRestCall } from "./restCallStats";
 import { logRateLimit } from "./rateLimitStats";
 import { runExpiringMutesLoop } from "./data/loops/expiringMutesLoop";
 import { runUpcomingRemindersLoop } from "./data/loops/upcomingRemindersLoop";
@@ -37,6 +47,19 @@ import { hasPhishermanMasterAPIKey } from "./data/Phisherman";
 import { consumeQueryStats } from "./data/queryLogger";
 import { EventEmitter } from "events";
 import { env } from "./env";
+import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types";
+
+// TODO: Remove this once fixed on upstream
+declare module "knub/dist/helpers" {
+  export function waitForReply(
+    client: Client,
+    channel: GuildTextBasedChannel,
+    restrictToUserId?: string,
+    timeout?: number,
+  ): Promise<Message | null>;
+
+  export function createChunkedMessage(channel: TextBasedChannel, messageText: string): Promise<Message[]>;
+}
 
 // Error handling
 let recentPluginErrors = 0;
@@ -188,17 +211,19 @@ setInterval(() => {
 logger.info("Connecting to database");
 connect().then(async () => {
   const client = new Client({
-    partials: ["USER", "CHANNEL", "GUILD_MEMBER", "MESSAGE", "REACTION"],
+    partials: [Partials.User, Partials.Channel, Partials.GuildMember, Partials.Message, Partials.Reaction],
 
     makeCache: Options.cacheWithLimits({
-      ...Options.defaultMakeCacheSettings,
+      ...Options.DefaultMakeCacheSettings,
       MessageManager: 1,
       // GuildMemberManager: 15000,
       GuildInviteManager: 0,
     }),
 
-    restGlobalRateLimit: 50,
+    rest: {
-    // restTimeOffset: 1000,
+      // globalRequestsPerSecond: 50,
+      // offset: 1000,
+    },
 
     // Disable mentions by default
     allowedMentions: {
@@ -209,25 +234,25 @@ connect().then(async () => {
     },
     intents: [
       // Privileged
-      Intents.FLAGS.GUILD_MEMBERS,
+      GatewayIntentBits.GuildMembers,
-      // Intents.FLAGS.GUILD_PRESENCES,
+      // GatewayIntentBits.GuildPresences,
-      Intents.FLAGS.GUILD_MESSAGE_TYPING,
 
       // Regular
-      Intents.FLAGS.DIRECT_MESSAGES,
+      GatewayIntentBits.GuildMessageTyping,
-      Intents.FLAGS.GUILD_BANS,
+      GatewayIntentBits.DirectMessages,
-      Intents.FLAGS.GUILD_EMOJIS_AND_STICKERS,
+      GatewayIntentBits.GuildModeration,
-      Intents.FLAGS.GUILD_INVITES,
+      GatewayIntentBits.GuildEmojisAndStickers,
-      Intents.FLAGS.GUILD_MESSAGE_REACTIONS,
+      GatewayIntentBits.GuildInvites,
-      Intents.FLAGS.GUILD_MESSAGES,
+      GatewayIntentBits.GuildMessageReactions,
-      Intents.FLAGS.GUILDS,
+      GatewayIntentBits.GuildMessages,
-      Intents.FLAGS.GUILD_VOICE_STATES,
+      GatewayIntentBits.Guilds,
+      GatewayIntentBits.GuildVoiceStates,
     ],
   });
   // FIXME: TS doesn't see Client as a child of EventEmitter for some reason
   (client as unknown as EventEmitter).setMaxListeners(200);
 
-  client.on(Constants.Events.RATE_LIMIT, (data) => {
+  client.rest.on(RESTEvents.RateLimited, (data) => {
     // tslint:disable-next-line:no-console
     // console.log(`[DEBUG] [RATE_LIMIT] ${JSON.stringify(data)}`);
   });
@@ -235,7 +260,7 @@ connect().then(async () => {
   const safe429DecayInterval = 5 * SECONDS;
   const safe429MaxCount = 5;
   const safe429Counter = new DecayingCounter(safe429DecayInterval);
-  client.on(Constants.Events.DEBUG, (errorText) => {
+  client.on(Events.Debug, (errorText) => {
     if (!errorText.includes("429")) {
       return;
     }
@@ -346,7 +371,7 @@ connect().then(async () => {
     startUptimeCounter();
   });
 
-  client.on(Constants.Events.RATE_LIMIT, (data) => {
+  client.rest.on(RESTEvents.RateLimited, (data) => {
     logRateLimit(data);
   });
 

backend/src/pluginUtils.ts

@@ -2,17 +2,7 @@
  * @file Utility functions that are plugin-instance-specific (i.e. use PluginData)
  */
 
-import {
+import { GuildMember, Message, MessageCreateOptions, MessageMentionOptions, TextBasedChannel } from "discord.js";
-  ChannelType,
-  GuildMember,
-  GuildTextBasedChannel,
-  Message,
-  MessageCreateOptions,
-  MessageMentionOptions,
-  MessagePayload,
-  TextBasedChannel,
-  TextChannel,
-} from "discord.js";
 import * as t from "io-ts";
 import { CommandContext, configUtils, ConfigValidationError, GuildPluginData, helpers, PluginOptions } from "knub";
 import { PluginOverrideCriteria } from "knub/dist/config/configTypes";
@@ -198,7 +188,7 @@ export function getPluginConfigPreprocessor(
 
 export async function sendSuccessMessage(
   pluginData: AnyPluginData<any>,
-  channel: GuildTextBasedChannel,
+  channel: TextBasedChannel,
   body: string,
   allowedMentions?: MessageMentionOptions,
 ): Promise<Message | undefined> {
@@ -211,7 +201,7 @@ export async function sendSuccessMessage(
   return channel
     .send({ ...content }) // Force line break
     .catch((err) => {
-      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
+      const channelInfo = "guild" in channel ? `${channel.id} (${channel.guild.id})` : channel.id;
       logger.warn(`Failed to send success message to ${channelInfo}): ${err.code} ${err.message}`);
       return undefined;
     });
@@ -232,7 +222,7 @@ export async function sendErrorMessage(
   return channel
     .send({ ...content }) // Force line break
     .catch((err) => {
-      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
+      const channelInfo = "guild" in channel ? `${channel.id} (${channel.guild.id})` : channel.id;
       logger.warn(`Failed to send error message to ${channelInfo}): ${err.code} ${err.message}`);
       return undefined;
     });

backend/src/plugins/AutoDelete/util/deleteNextItem.ts

@@ -1,7 +1,6 @@
-import { PermissionsBitField, Snowflake, TextChannel } from "discord.js";
+import { PermissionsBitField, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import moment from "moment-timezone";
-import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { LogType } from "../../../data/LogType";
 import { logger } from "../../../logger";
 import { resolveUser, verboseChannelMention } from "../../../utils";
@@ -47,7 +46,7 @@ export async function deleteNextItem(pluginData: GuildPluginData<AutoDeletePlugi
   const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
 
   pluginData.state.guildLogs.ignoreLog(LogType.MESSAGE_DELETE, itemToDelete.message.id);
-  (channel as TextChannel).messages.delete(itemToDelete.message.id as Snowflake).catch((err) => {
+  channel.messages.delete(itemToDelete.message.id as Snowflake).catch((err) => {
     if (err.code === 10008) {
       // "Unknown Message", probably already deleted by automod or another bot, ignore
       return;

backend/src/plugins/AutoDelete/util/onMessageCreate.ts

@@ -1,6 +1,5 @@
 import { GuildPluginData } from "knub";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
-import { LogType } from "../../../data/LogType";
 import { convertDelayStringToMS, resolveMember } from "../../../utils";
 import { AutoDeletePluginType, MAX_DELAY } from "../types";
 import { addMessageToDeletionQueue } from "./addMessageToDeletionQueue";

backend/src/plugins/AutoReactions/commands/NewAutoReactionsCmd.ts

@@ -1,4 +1,4 @@
-import { GuildChannel, PermissionsBitField } from "discord.js";
+import { PermissionsBitField } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { canUseEmoji, customEmojiRegex, isEmoji } from "../../../utils";

backend/src/plugins/AutoReactions/events/AddReactionsEvt.ts

@@ -1,5 +1,4 @@
-import { GuildChannel, GuildTextBasedChannel, PermissionsBitField } from "discord.js";
+import { GuildTextBasedChannel, PermissionsBitField } from "discord.js";
-import { LogType } from "../../../data/LogType";
 import { isDiscordAPIError } from "../../../utils";
 import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
 import { missingPermissionError } from "../../../utils/missingPermissionError";

backend/src/plugins/Automod/actions/addRoles.ts

@@ -1,6 +1,5 @@
-import { PermissionsBitField, Snowflake } from "discord.js";
+import { PermissionFlagsBits, Snowflake } from "discord.js";
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { nonNullish, unique } from "../../../utils";
 import { canAssignRole } from "../../../utils/canAssignRole";
 import { getMissingPermissions } from "../../../utils/getMissingPermissions";
@@ -10,7 +9,7 @@ import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
 import { automodAction } from "../helpers";
 
-const p = PermissionsBitField.Flags;
+const p = PermissionFlagsBits;
 
 export const AddRolesAction = automodAction({
   configType: t.array(t.string),

backend/src/plugins/Automod/actions/addToCounter.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { CountersPlugin } from "../../Counters/CountersPlugin";
 import { automodAction } from "../helpers";
 import { LogsPlugin } from "../../Logs/LogsPlugin";

backend/src/plugins/Automod/actions/alert.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel, ThreadChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import * as t from "io-ts";
 import { erisAllowedMentionsToDjsMentionOptions } from "src/utils/erisAllowedMentionsToDjsMentionOptions";
 import { LogType } from "../../../data/LogType";
@@ -9,9 +9,7 @@ import {
   TemplateSafeValueContainer,
 } from "../../../templateFormatter";
 import {
-  createChunkedMessage,
   messageLink,
-  stripObjectToScalars,
   tAllowedMentions,
   tNormalizedNullOptional,
   isTruthy,
@@ -21,7 +19,7 @@ import {
 } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { automodAction } from "../helpers";
-import { TemplateSafeUser, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
+import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { messageIsEmpty } from "../../../utils/messageIsEmpty";
 import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin";
 
@@ -96,7 +94,7 @@ export const AlertAction = automodAction({
         const chunks = chunkMessageLines(rendered);
         for (const chunk of chunks) {
           await poster.sendMessage(channel, {
-            content: rendered,
+            content: chunk,
             allowedMentions: erisAllowedMentionsToDjsMentionOptions(actionConfig.allowed_mentions),
           });
         }

backend/src/plugins/Automod/actions/archiveThread.ts

@@ -1,4 +1,4 @@
-import { ThreadChannel } from "discord.js";
+import { AnyThreadChannel } from "discord.js";
 import * as t from "io-ts";
 import { noop } from "../../../utils";
 import { automodAction } from "../helpers";
@@ -11,7 +11,7 @@ export const ArchiveThreadAction = automodAction({
     const threads = contexts
       .filter((c) => c.message?.channel_id)
       .map((c) => pluginData.guild.channels.cache.get(c.message!.channel_id))
-      .filter((c): c is ThreadChannel => c?.isThread() ?? false);
+      .filter((c): c is AnyThreadChannel => c?.isThread() ?? false);
 
     for (const thread of threads) {
       await thread.setArchived().catch(noop);

backend/src/plugins/Automod/actions/changeNickname.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { nonNullish, unique } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { automodAction } from "../helpers";

backend/src/plugins/Automod/actions/clean.ts

@@ -1,4 +1,4 @@
-import { GuildTextBasedChannel, Snowflake, TextChannel } from "discord.js";
+import { GuildTextBasedChannel, Snowflake } from "discord.js";
 import * as t from "io-ts";
 import { LogType } from "../../../data/LogType";
 import { noop } from "../../../utils";

backend/src/plugins/Automod/actions/log.ts

@@ -1,9 +1,7 @@
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
+import { isTruthy, unique } from "../../../utils";
-import { isTruthy, stripObjectToScalars, unique } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { automodAction } from "../helpers";
-import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 
 export const LogAction = automodAction({
   configType: t.boolean,

backend/src/plugins/Automod/actions/mute.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
 import { convertDelayStringToMS, nonNullish, tDelayString, tNullable, unique } from "../../../utils";
 import { CaseArgs } from "../../Cases/types";

backend/src/plugins/Automod/actions/removeRoles.ts

@@ -1,6 +1,5 @@
-import { PermissionsBitField, Snowflake } from "discord.js";
+import { PermissionFlagsBits, Snowflake } from "discord.js";
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { nonNullish, unique } from "../../../utils";
 import { canAssignRole } from "../../../utils/canAssignRole";
 import { getMissingPermissions } from "../../../utils/getMissingPermissions";
@@ -10,7 +9,7 @@ import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
 import { automodAction } from "../helpers";
 
-const p = PermissionsBitField.Flags;
+const p = PermissionFlagsBits;
 
 export const RemoveRolesAction = automodAction({
   configType: t.array(t.string),

backend/src/plugins/Automod/actions/reply.ts

@@ -1,12 +1,4 @@
-import {
+import { GuildTextBasedChannel, MessageCreateOptions, PermissionsBitField, Snowflake, User } from "discord.js";
-  GuildTextBasedChannel,
-  MessageOptions,
-  PermissionsBitField,
-  Snowflake,
-  TextChannel,
-  ThreadChannel,
-  User,
-} from "discord.js";
 import * as t from "io-ts";
 import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter";
@@ -71,7 +63,7 @@ export const ReplyAction = automodAction({
       const formatted =
         typeof actionConfig === "string"
           ? await renderReplyText(actionConfig)
-          : ((await renderRecursively(actionConfig.text, renderReplyText)) as MessageOptions);
+          : ((await renderRecursively(actionConfig.text, renderReplyText)) as MessageCreateOptions);
 
       if (formatted) {
         const channel = pluginData.guild.channels.cache.get(channelId as Snowflake) as GuildTextBasedChannel;
@@ -107,7 +99,7 @@ export const ReplyAction = automodAction({
 
         const messageContent = validateAndParseMessageContent(formatted);
 
-        const messageOpts: MessageOptions = {
+        const messageOpts: MessageCreateOptions = {
           ...messageContent,
           allowedMentions: {
             users: [user.id],

backend/src/plugins/Automod/actions/setCounter.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { CountersPlugin } from "../../Counters/CountersPlugin";
 import { automodAction } from "../helpers";
 import { LogsPlugin } from "../../Logs/LogsPlugin";

backend/src/plugins/Automod/actions/setSlowmode.ts

@@ -1,6 +1,5 @@
-import { ChannelType, GuildTextBasedChannel, Snowflake, TextChannel } from "discord.js";
+import { ChannelType, GuildTextBasedChannel, Snowflake } from "discord.js";
 import * as t from "io-ts";
-import { LogType } from "../../../data/LogType";
 import { convertDelayStringToMS, isDiscordAPIError, tDelayString, tNullable } from "../../../utils";
 import { automodAction } from "../helpers";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
@@ -42,9 +41,7 @@ export const SetSlowmodeAction = automodAction({
 
       try {
         for (const chan of channelsToSlowmode) {
-          await chan.edit({
+          await chan.setRateLimitPerUser(slowmodeSeconds);
-            rateLimitPerUser: slowmodeSeconds,
-          });
         }
       } catch (e) {
         // Check for invalid form body -> indicates duration was too large

backend/src/plugins/Automod/actions/startThread.ts

@@ -1,5 +1,4 @@
-import { GuildFeature, ThreadAutoArchiveDuration } from "discord-api-types/v9";
+import { ChannelType, GuildFeature, ThreadAutoArchiveDuration } from "discord.js";
-import { BaseGuildTextChannel, ChannelType, GuildTextBasedChannel, TextChannel } from "discord.js";
 import * as t from "io-ts";
 import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter";
 import { convertDelayStringToMS, MINUTES, noop, tDelayString, tNullable } from "../../../utils";
@@ -35,8 +34,7 @@ export const StartThreadAction = automodAction({
       // check against max threads per channel
       if (actionConfig.limit_per_channel && actionConfig.limit_per_channel > 0) {
         const threadCount = channel.threads.cache.filter(
-          (tr) =>
+          (tr) => tr.ownerId === pluginData.client.user!.id && !tr.archived && tr.parentId === channel.id,
-            tr.ownerId === pluginData.client.user!.id && !tr.deleted && !tr.archived && tr.parentId === channel.id,
         ).size;
         if (threadCount >= actionConfig.limit_per_channel) return false;
       }
@@ -52,7 +50,9 @@ export const StartThreadAction = automodAction({
       : ThreadAutoArchiveDuration.OneHour;
 
     for (const threadContext of threads) {
-      const channel = pluginData.guild.channels.cache.get(threadContext.message!.channel_id) as BaseGuildTextChannel;
+      const channel = pluginData.guild.channels.cache.get(threadContext.message!.channel_id);
+      if (!channel || !("threads" in channel)) continue;
+
       const renderThreadName = async (str: string) =>
         renderTemplate(
           str,
@@ -62,7 +62,7 @@ export const StartThreadAction = automodAction({
           }),
         );
       const threadName = await renderThreadName(actionConfig.name ?? "{user.tag}s thread");
-      const thread = await channel!.threads
+      const thread = await channel.threads
         .create({
           name: threadName,
           autoArchiveDuration: autoArchive,

backend/src/plugins/Automod/events/runAutomodOnMessage.ts

@@ -1,4 +1,3 @@
-import { Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import moment from "moment-timezone";
 import { SavedMessage } from "../../../data/entities/SavedMessage";

backend/src/plugins/Automod/functions/getTextMatchPartialSummary.ts

@@ -1,4 +1,4 @@
-import { ActivityType, Snowflake, TextChannel } from "discord.js";
+import { ActivityType, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { messageSummary, verboseChannelMention } from "../../../utils";
 import { AutomodContext, AutomodPluginType } from "../types";

backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts

@@ -1,8 +1,9 @@
-import { Constants, MessageEmbed } from "discord.js";
+import { ActivityType, Embed } from "discord.js";
 import { GuildPluginData } from "knub";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
 import { resolveMember } from "../../../utils";
 import { AutomodPluginType } from "../types";
+import { DeepMutable } from "../../../utils/typeUtils.js";
 
 type TextTriggerWithMultipleMatchTypes = {
   match_messages: boolean;
@@ -33,7 +34,7 @@ export async function* matchMultipleTextTypesOnMessage(
   }
 
   if (trigger.match_embeds && msg.data.embeds?.length) {
-    const copiedEmbed: MessageEmbed = JSON.parse(JSON.stringify(msg.data.embeds[0]));
+    const copiedEmbed: DeepMutable<Embed> = JSON.parse(JSON.stringify(msg.data.embeds[0]));
     if (copiedEmbed.video) {
       copiedEmbed.description = ""; // The description is not rendered, hence it doesn't need to be matched
     }
@@ -53,7 +54,7 @@ export async function* matchMultipleTextTypesOnMessage(
   }
 
   for (const activity of member.presence?.activities ?? []) {
-    if (activity.type === Constants.ActivityTypes[4]) {
+    if (activity.type === ActivityType.Custom) {
       yield ["customstatus", `${activity.emoji} ${activity.name}`];
       break;
     }

backend/src/plugins/Automod/functions/resolveActionContactMethods.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel, ThreadChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
 import { disableUserNotificationStrings, UserNotificationMethod } from "../../../utils";

backend/src/plugins/Automod/functions/runAutomod.ts

@@ -1,4 +1,4 @@
-import { GuildTextBasedChannel, Snowflake, TextChannel, ThreadChannel } from "discord.js";
+import { GuildTextBasedChannel, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { availableActions } from "../actions/availableActions";
 import { CleanAction } from "../actions/clean";

backend/src/plugins/Automod/functions/setAntiraidLevel.ts

@@ -1,7 +1,5 @@
 import { User } from "discord.js";
 import { GuildPluginData } from "knub";
-import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
-import { LogType } from "../../../data/LogType";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { runAutomodOnAntiraidLevel } from "../events/runAutomodOnAntiraidLevel";
 import { AutomodPluginType } from "../types";

backend/src/plugins/Automod/triggers/anyMessage.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import * as t from "io-ts";
 import { verboseChannelMention } from "../../../utils";
 import { automodTrigger } from "../helpers";

backend/src/plugins/Automod/triggers/matchAttachmentType.ts

@@ -1,4 +1,4 @@
-import { escapeInlineCode, Snowflake, TextChannel } from "discord.js";
+import { escapeInlineCode, Snowflake } from "discord.js";
 import * as t from "io-ts";
 import { asSingleLine, messageSummary, verboseChannelMention } from "../../../utils";
 import { automodTrigger } from "../helpers";
@@ -66,7 +66,7 @@ export const MatchAttachmentTypeTrigger = automodTrigger<MatchResultType>()({
   },
 
   renderMatchInformation({ pluginData, contexts, matchResult }) {
-    const channel = pluginData.guild.channels.cache.get(contexts[0].message!.channel_id as Snowflake);
+    const channel = pluginData.guild.channels.cache.get(contexts[0].message!.channel_id as Snowflake)!;
     const prettyChannel = verboseChannelMention(channel);
 
     return (

backend/src/plugins/Automod/triggers/matchLinks.ts

@@ -1,4 +1,3 @@
-import escapeStringRegexp from "escape-string-regexp";
 import * as t from "io-ts";
 import { allowTimeout } from "../../../RegExpRunner";
 import { getUrlsInString, tNullable } from "../../../utils";

backend/src/plugins/Automod/triggers/matchMimeType.ts

@@ -1,7 +1,7 @@
 import { automodTrigger } from "../helpers";
 import * as t from "io-ts";
 import { asSingleLine, messageSummary, verboseChannelMention } from "../../../utils";
-import { escapeInlineCode, GuildChannel } from "discord.js";
+import { escapeInlineCode } from "discord.js";
 
 interface MatchResultType {
   matchedType: string;
@@ -65,8 +65,8 @@ export const MatchMimeTypeTrigger = automodTrigger<MatchResultType>()({
 
   renderMatchInformation({ pluginData, contexts, matchResult }) {
     const { message } = contexts[0];
-    const channel = pluginData.guild.channels.resolve(message!.channel_id);
+    const channel = pluginData.guild.channels.resolve(message!.channel_id)!;
-    const prettyChannel = verboseChannelMention(channel as GuildChannel);
+    const prettyChannel = verboseChannelMention(channel);
     const { matchedType, mode } = matchResult.extra;
 
     return (

backend/src/plugins/Automod/triggers/threadArchive.ts

@@ -1,5 +1,4 @@
-import { Snowflake } from "discord-api-types/v9";
+import { escapeBold, User, type Snowflake } from "discord.js";
-import { escapeBold, User } from "discord.js";
 import * as t from "io-ts";
 import { tNullable } from "../../../utils";
 import { automodTrigger } from "../helpers";

backend/src/plugins/Automod/triggers/threadCreate.ts

@@ -1,5 +1,4 @@
-import { Snowflake } from "discord-api-types/v9";
+import { escapeBold, User, type Snowflake } from "discord.js";
-import { escapeBold, User } from "discord.js";
 import * as t from "io-ts";
 import { automodTrigger } from "../helpers";
 

backend/src/plugins/Automod/triggers/threadDelete.ts

@@ -1,5 +1,4 @@
-import { Snowflake } from "discord-api-types/v9";
+import { escapeBold, User, type Snowflake } from "discord.js";
-import { escapeBold, User } from "discord.js";
 import * as t from "io-ts";
 import { automodTrigger } from "../helpers";
 

backend/src/plugins/Automod/triggers/threadUnarchive.ts

@@ -1,5 +1,4 @@
-import { Snowflake } from "discord-api-types/v9";
+import { escapeBold, User, type Snowflake } from "discord.js";
-import { escapeBold, User } from "discord.js";
 import * as t from "io-ts";
 import { tNullable } from "../../../utils";
 import { automodTrigger } from "../helpers";

backend/src/plugins/Automod/types.ts

@@ -1,4 +1,4 @@
-import { GuildMember, GuildTextBasedChannel, PartialGuildMember, TextChannel, ThreadChannel, User } from "discord.js";
+import { GuildMember, GuildTextBasedChannel, PartialGuildMember, ThreadChannel, User } from "discord.js";
 import * as t from "io-ts";
 import { BasePluginType, CooldownManager } from "knub";
 import { SavedMessage } from "../../data/entities/SavedMessage";

backend/src/plugins/BotControl/commands/AddDashboardUserCmd.ts

@@ -1,5 +1,4 @@
 import { ApiPermissions } from "@shared/apiPermissions";
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { botControlCmd } from "../types";
@@ -38,7 +37,7 @@ export const AddDashboardUserCmd = botControlCmd({
     const userNameList = args.users.map((user) => `<@!${user.id}> (**${user.tag}**, \`${user.id}\`)`);
     sendSuccessMessage(
       pluginData,
-      msg.channel as TextChannel,
+      msg.channel,
       `The following users were given dashboard access for **${guild.name}**:\n\n${userNameList}`,
     );
   },

backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts

@@ -1,8 +1,7 @@
 import { ApiPermissions } from "@shared/apiPermissions";
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { DBDateFormat, isGuildInvite, isSnowflake, resolveInvite } from "../../../utils";
+import { DBDateFormat, isGuildInvite, resolveInvite } from "../../../utils";
 import { botControlCmd } from "../types";
 import moment from "moment-timezone";
 import { isEligible } from "../functions/isEligible";
@@ -19,23 +18,19 @@ export const AddServerFromInviteCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const invite = await resolveInvite(pluginData.client, args.inviteCode, true);
     if (!invite || !isGuildInvite(invite)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Could not resolve invite"); // :D
+      sendErrorMessage(pluginData, msg.channel, "Could not resolve invite"); // :D
       return;
     }
 
     const existing = await pluginData.state.allowedGuilds.find(invite.guild.id);
     if (existing) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Server is already allowed!");
+      sendErrorMessage(pluginData, msg.channel, "Server is already allowed!");
       return;
     }
 
     const { result, explanation } = await isEligible(pluginData, args.user, invite);
     if (!result) {
-      sendErrorMessage(
+      sendErrorMessage(pluginData, msg.channel, `Could not add server because it's not eligible: ${explanation}`);
-        pluginData,
-        msg.channel as TextChannel,
-        `Could not add server because it's not eligible: ${explanation}`,
-      );
       return;
     }
 
@@ -56,10 +51,6 @@ export const AddServerFromInviteCmd = botControlCmd({
       );
     }
 
-    sendSuccessMessage(
+    sendSuccessMessage(pluginData, msg.channel, "Server was eligible and is now allowed to use Zeppelin!");
-      pluginData,
-      msg.channel as TextChannel,
-      "Server was eligible and is now allowed to use Zeppelin!",
-    );
   },
 });

backend/src/plugins/BotControl/commands/AllowServerCmd.ts

@@ -1,5 +1,4 @@
 import { ApiPermissions } from "@shared/apiPermissions";
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { DBDateFormat, isSnowflake } from "../../../utils";
@@ -21,17 +20,17 @@ export const AllowServerCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const existing = await pluginData.state.allowedGuilds.find(args.guildId);
     if (existing) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Server is already allowed!");
+      sendErrorMessage(pluginData, msg.channel, "Server is already allowed!");
       return;
     }
 
     if (!isSnowflake(args.guildId)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Invalid server ID!");
+      sendErrorMessage(pluginData, msg.channel, "Invalid server ID!");
       return;
     }
 
     if (args.userId && !isSnowflake(args.userId)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Invalid user ID!");
+      sendErrorMessage(pluginData, msg.channel, "Invalid user ID!");
       return;
     }
 
@@ -52,6 +51,6 @@ export const AllowServerCmd = botControlCmd({
       );
     }
 
-    sendSuccessMessage(pluginData, msg.channel as TextChannel, "Server is now allowed to use Zeppelin!");
+    sendSuccessMessage(pluginData, msg.channel, "Server is now allowed to use Zeppelin!");
   },
 });

backend/src/plugins/BotControl/commands/ChannelToServerCmd.ts

@@ -1,9 +1,6 @@
-import { Guild, GuildChannel, TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { isStaffPreFilter, sendErrorMessage } from "../../../pluginUtils";
-import { GuildInvite, isGuildInvite, resolveInvite, verboseUserMention } from "../../../utils";
 import { botControlCmd } from "../types";
-import { isEligible } from "../functions/isEligible";
 
 export const ChannelToServerCmd = botControlCmd({
   trigger: ["channel_to_server", "channel2server"],
@@ -19,13 +16,13 @@ export const ChannelToServerCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const channel = pluginData.client.channels.cache.get(args.channelId);
     if (!channel) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Channel not found in cache!");
+      sendErrorMessage(pluginData, msg.channel, "Channel not found in cache!");
       return;
     }
 
-    const channelName = channel.isVoice() ? channel.name : `#${(channel as TextChannel).name}`;
+    const channelName = channel.isVoiceBased() ? channel.name : `#${"name" in channel ? channel.name : channel.id}`;
 
-    const guild: Guild | null = (channel as GuildChannel).guild ?? null;
+    const guild = "guild" in channel ? channel.guild : null;
     const guildInfo = guild ? `${guild.name} (\`${guild.id}\`)` : "Not a server";
 
     msg.channel.send(`**Channel:** ${channelName} (\`${channel.type}\`) (<#${channel.id}>)\n**Server:** ${guildInfo}`);

backend/src/plugins/BotControl/commands/DisallowServerCmd.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { noop } from "../../../utils";
@@ -18,7 +18,7 @@ export const DisallowServerCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const existing = await pluginData.state.allowedGuilds.find(args.guildId);
     if (!existing) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "That server is not allowed in the first place!");
+      sendErrorMessage(pluginData, msg.channel, "That server is not allowed in the first place!");
       return;
     }
 
@@ -27,6 +27,6 @@ export const DisallowServerCmd = botControlCmd({
       .get(args.guildId as Snowflake)
       ?.leave()
       .catch(noop);
-    sendSuccessMessage(pluginData, msg.channel as TextChannel, "Server removed!");
+    sendSuccessMessage(pluginData, msg.channel, "Server removed!");
   },
 });

backend/src/plugins/BotControl/commands/EligibleCmd.ts

@@ -1,7 +1,6 @@
-import { Guild, TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { GuildInvite, isGuildInvite, resolveInvite, verboseUserMention } from "../../../utils";
+import { isGuildInvite, resolveInvite } from "../../../utils";
 import { botControlCmd } from "../types";
 import { isEligible } from "../functions/isEligible";
 
@@ -17,17 +16,17 @@ export const EligibleCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const invite = await resolveInvite(pluginData.client, args.inviteCode, true);
     if (!invite || !isGuildInvite(invite)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Could not resolve invite");
+      sendErrorMessage(pluginData, msg.channel, "Could not resolve invite");
       return;
     }
 
     const { result, explanation } = await isEligible(pluginData, args.user, invite);
 
     if (result) {
-      sendSuccessMessage(pluginData, msg.channel as TextChannel, `Server is eligible: ${explanation}`);
+      sendSuccessMessage(pluginData, msg.channel, `Server is eligible: ${explanation}`);
       return;
     }
 
-    sendErrorMessage(pluginData, msg.channel as TextChannel, `Server is **NOT** eligible: ${explanation}`);
+    sendErrorMessage(pluginData, msg.channel, `Server is **NOT** eligible: ${explanation}`);
   },
 });

backend/src/plugins/BotControl/commands/LeaveServerCmd.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { botControlCmd } from "../types";
@@ -16,7 +16,7 @@ export const LeaveServerCmd = botControlCmd({
 
   async run({ pluginData, message: msg, args }) {
     if (!pluginData.client.guilds.cache.has(args.guildId as Snowflake)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "I am not in that guild");
+      sendErrorMessage(pluginData, msg.channel, "I am not in that guild");
       return;
     }
 
@@ -26,10 +26,10 @@ export const LeaveServerCmd = botControlCmd({
     try {
       await pluginData.client.guilds.cache.get(args.guildId as Snowflake)?.leave();
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, `Failed to leave guild: ${e.message}`);
+      sendErrorMessage(pluginData, msg.channel, `Failed to leave guild: ${e.message}`);
       return;
     }
 
-    sendSuccessMessage(pluginData, msg.channel as TextChannel, `Left guild **${guildName}**`);
+    sendSuccessMessage(pluginData, msg.channel, `Left guild **${guildName}**`);
   },
 });

backend/src/plugins/BotControl/commands/ListDashboardPermsCmd.ts

@@ -1,8 +1,7 @@
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { AllowedGuild } from "../../../data/entities/AllowedGuild";
 import { ApiPermissionAssignment } from "../../../data/entities/ApiPermissionAssignment";
-import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { resolveUser } from "../../../utils";
 import { botControlCmd } from "../types";
 
@@ -17,7 +16,7 @@ export const ListDashboardPermsCmd = botControlCmd({
 
   async run({ pluginData, message: msg, args }) {
     if (!args.user && !args.guildId) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Must specify at least guildId, user, or both.");
+      sendErrorMessage(pluginData, msg.channel, "Must specify at least guildId, user, or both.");
       return;
     }
 
@@ -25,7 +24,7 @@ export const ListDashboardPermsCmd = botControlCmd({
     if (args.guildId) {
       guild = await pluginData.state.allowedGuilds.find(args.guildId);
       if (!guild) {
-        sendErrorMessage(pluginData, msg.channel as TextChannel, "Server is not using Zeppelin");
+        sendErrorMessage(pluginData, msg.channel, "Server is not using Zeppelin");
         return;
       }
     }
@@ -34,7 +33,7 @@ export const ListDashboardPermsCmd = botControlCmd({
     if (args.user) {
       existingUserAssignment = await pluginData.state.apiPermissionAssignments.getByUserId(args.user.id);
       if (existingUserAssignment.length === 0) {
-        sendErrorMessage(pluginData, msg.channel as TextChannel, "The user has no assigned permissions.");
+        sendErrorMessage(pluginData, msg.channel, "The user has no assigned permissions.");
         return;
       }
     }
@@ -57,7 +56,7 @@ export const ListDashboardPermsCmd = botControlCmd({
       if (finalMessage === "") {
         sendErrorMessage(
           pluginData,
-          msg.channel as TextChannel,
+          msg.channel,
           `The user ${userInfo} has no assigned permissions on the specified server.`,
         );
         return;
@@ -68,11 +67,7 @@ export const ListDashboardPermsCmd = botControlCmd({
 
       const existingGuildAssignment = await pluginData.state.apiPermissionAssignments.getByGuildId(guild.id);
       if (existingGuildAssignment.length === 0) {
-        sendErrorMessage(
+        sendErrorMessage(pluginData, msg.channel, `The server ${guildInfo} has no assigned permissions.`);
-          pluginData,
-          msg.channel as TextChannel,
-          `The server ${guildInfo} has no assigned permissions.`,
-        );
         return;
       }
 
@@ -83,6 +78,6 @@ export const ListDashboardPermsCmd = botControlCmd({
       }
     }
 
-    await sendSuccessMessage(pluginData, msg.channel as TextChannel, finalMessage.trim(), {});
+    await sendSuccessMessage(pluginData, msg.channel, finalMessage.trim(), {});
   },
 });

backend/src/plugins/BotControl/commands/ListDashboardUsersCmd.ts

@@ -1,6 +1,5 @@
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { resolveUser } from "../../../utils";
 import { botControlCmd } from "../types";
 
@@ -15,7 +14,7 @@ export const ListDashboardUsersCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const guild = await pluginData.state.allowedGuilds.find(args.guildId);
     if (!guild) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Server is not using Zeppelin");
+      sendErrorMessage(pluginData, msg.channel, "Server is not using Zeppelin");
       return;
     }
 
@@ -33,7 +32,7 @@ export const ListDashboardUsersCmd = botControlCmd({
 
     sendSuccessMessage(
       pluginData,
-      msg.channel as TextChannel,
+      msg.channel,
       `The following users have dashboard access for **${guild.name}**:\n\n${userNameList.join("\n")}`,
       {},
     );

backend/src/plugins/BotControl/commands/ProfilerDataCmd.ts

@@ -1,7 +1,6 @@
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { getBaseUrl } from "../../../pluginUtils";
-import { createChunkedMessage, formatNumber, resolveInvite, sorter, verboseUserMention } from "../../../utils";
+import { sorter } from "../../../utils";
 import { botControlCmd } from "../types";
 import { GuildArchives } from "../../../data/GuildArchives";
 import moment from "moment-timezone";

backend/src/plugins/BotControl/commands/RateLimitPerformanceCmd.ts

@@ -2,8 +2,7 @@ import { botControlCmd } from "../types";
 import { getRateLimitStats } from "../../../rateLimitStats";
 import moment from "moment-timezone";
 import { GuildArchives } from "../../../data/GuildArchives";
-import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { getBaseUrl, sendSuccessMessage } from "../../../pluginUtils";
-import { TextChannel } from "discord.js";
 
 export const RateLimitPerformanceCmd = botControlCmd({
   trigger: ["rate_limit_performance"],
@@ -14,7 +13,7 @@ export const RateLimitPerformanceCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const logItems = getRateLimitStats();
     if (logItems.length === 0) {
-      sendSuccessMessage(pluginData, msg.channel as TextChannel, `No rate limits hit`);
+      sendSuccessMessage(pluginData, msg.channel, `No rate limits hit`);
       return;
     }
 
@@ -25,7 +24,7 @@ export const RateLimitPerformanceCmd = botControlCmd({
       if (item.data.global) items.push("GLOBAL");
       items.push(item.data.method.toUpperCase());
       items.push(item.data.route);
-      items.push(`stalled for ${item.data.timeout}ms`);
+      items.push(`stalled for ${item.data.timeToReset}ms`);
       items.push(`(max requests ${item.data.limit})`);
       return items.join(" ");
     });

backend/src/plugins/BotControl/commands/ReloadGlobalPluginsCmd.ts

@@ -1,5 +1,4 @@
-import { TextChannel } from "discord.js";
+import { isStaffPreFilter, sendErrorMessage } from "../../../pluginUtils";
-import { isStaffPreFilter } from "../../../pluginUtils";
 import { getActiveReload, setActiveReload } from "../activeReload";
 import { botControlCmd } from "../types";
 
@@ -13,7 +12,13 @@ export const ReloadGlobalPluginsCmd = botControlCmd({
   async run({ pluginData, message }) {
     if (getActiveReload()) return;
 
-    setActiveReload((message.channel as TextChannel).guild?.id, message.channel.id);
+    const guildId = "guild" in message.channel ? message.channel.guild.id : null;
+    if (!guildId) {
+      sendErrorMessage(pluginData, message.channel, "This command can only be used in a server");
+      return;
+    }
+
+    setActiveReload(guildId, message.channel.id);
     await message.channel.send("Reloading global plugins...");
 
     pluginData.getKnubInstance().reloadGlobalContext();

backend/src/plugins/BotControl/commands/ReloadServerCmd.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { botControlCmd } from "../types";
@@ -16,18 +16,18 @@ export const ReloadServerCmd = botControlCmd({
 
   async run({ pluginData, message: msg, args }) {
     if (!pluginData.client.guilds.cache.has(args.guildId as Snowflake)) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "I am not in that guild");
+      sendErrorMessage(pluginData, msg.channel, "I am not in that guild");
       return;
     }
 
     try {
       await pluginData.getKnubInstance().reloadGuild(args.guildId);
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, `Failed to reload guild: ${e.message}`);
+      sendErrorMessage(pluginData, msg.channel, `Failed to reload guild: ${e.message}`);
       return;
     }
 
     const guild = await pluginData.client.guilds.fetch(args.guildId as Snowflake);
-    sendSuccessMessage(pluginData, msg.channel as TextChannel, `Reloaded guild **${guild?.name || "???"}**`);
+    sendSuccessMessage(pluginData, msg.channel, `Reloaded guild **${guild?.name || "???"}**`);
   },
 });

backend/src/plugins/BotControl/commands/RemoveDashboardUserCmd.ts

@@ -1,4 +1,3 @@
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { botControlCmd } from "../types";
@@ -18,7 +17,7 @@ export const RemoveDashboardUserCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const guild = await pluginData.state.allowedGuilds.find(args.guildId);
     if (!guild) {
-      sendErrorMessage(pluginData, msg.channel as TextChannel, "Server is not using Zeppelin");
+      sendErrorMessage(pluginData, msg.channel, "Server is not using Zeppelin");
       return;
     }
 
@@ -37,7 +36,7 @@ export const RemoveDashboardUserCmd = botControlCmd({
     const userNameList = args.users.map((user) => `<@!${user.id}> (**${user.tag}**, \`${user.id}\`)`);
     sendSuccessMessage(
       pluginData,
-      msg.channel as TextChannel,
+      msg.channel,
       `The following users were removed from the dashboard for **${guild.name}**:\n\n${userNameList}`,
     );
   },

backend/src/plugins/BotControl/commands/RestPerformanceCmd.ts

@@ -1,7 +1,5 @@
-import { TextChannel } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { createChunkedMessage } from "../../../utils";
-import { createChunkedMessage, formatNumber, resolveInvite, sorter, verboseUserMention } from "../../../utils";
 import { botControlCmd } from "../types";
 import { getTopRestCallStats } from "../../../restCallStats";
 
@@ -22,6 +20,6 @@ export const RestPerformanceCmd = botControlCmd({
       const cleanSource = callStats.source.replace(leadingPathRegex, "");
       return `**${callStats.count} calls**\n${callStats.method.toUpperCase()} ${callStats.path}\n${cleanSource}`;
     });
-    createChunkedMessage(msg.channel as TextChannel, `Top rest calls:\n\n${formatted.join("\n")}`);
+    createChunkedMessage(msg.channel, `Top rest calls:\n\n${formatted.join("\n")}`);
   },
 });

backend/src/plugins/BotControl/commands/ServersCmd.ts

@@ -1,4 +1,3 @@
-import { TextChannel } from "discord.js";
 import escapeStringRegexp from "escape-string-regexp";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter } from "../../../pluginUtils";
@@ -51,7 +50,7 @@ export const ServersCmd = botControlCmd({
           const owner = getUser(pluginData.client, g.ownerId);
           return `\`${paddedId}\` **${g.name}** (${g.memberCount} members) (owner **${owner.tag}** \`${owner.id}\`)`;
         });
-        createChunkedMessage(msg.channel as TextChannel, lines.join("\n"));
+        createChunkedMessage(msg.channel, lines.join("\n"));
       } else {
         msg.channel.send("No servers matched the filters");
       }

backend/src/plugins/Cases/functions/createCase.ts

@@ -1,10 +1,10 @@
-import type { Snowflake } from "discord-api-types/globals";
 import { GuildPluginData } from "knub";
 import { logger } from "../../../logger";
 import { resolveUser } from "../../../utils";
 import { CaseArgs, CasesPluginType } from "../types";
 import { createCaseNote } from "./createCaseNote";
 import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
+import type { Snowflake } from "discord.js";
 
 export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) {
   const user = await resolveUser(pluginData.client, args.userId);

backend/src/plugins/Cases/functions/getCaseEmbed.ts

@@ -1,4 +1,4 @@
-import { escapeCodeBlock, MessageEditOptions, MessageOptions } from "discord.js";
+import { escapeCodeBlock, MessageEditOptions, MessageCreateOptions } from "discord.js";
 import { GuildPluginData } from "knub";
 import moment from "moment-timezone";
 import { CaseTypes } from "../../../data/CaseTypes";
@@ -14,7 +14,7 @@ export async function getCaseEmbed(
   caseOrCaseId: Case | number,
   requestMemberId?: string,
   noOriginalCaseLink?: boolean,
-): Promise<MessageOptions & MessageEditOptions> {
+): Promise<MessageCreateOptions & MessageEditOptions> {
   const theCase = await pluginData.state.cases.with("notes").find(resolveCaseId(caseOrCaseId));
   if (!theCase) {
     throw new Error("Unknown case");

backend/src/plugins/Cases/functions/postToCaseLogChannel.ts

@@ -1,4 +1,4 @@
-import { FileOptions, MessageOptions, NewsChannel, Snowflake, TextChannel } from "discord.js";
+import { MessageCreateOptions, NewsChannel, RESTJSONErrorCodes, Snowflake, TextChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import { Case } from "../../../data/entities/Case";
 import { isDiscordAPIError } from "../../../utils";
@@ -11,8 +11,8 @@ import { InternalPosterMessageResult } from "../../InternalPoster/functions/send
 
 export async function postToCaseLogChannel(
   pluginData: GuildPluginData<CasesPluginType>,
-  content: MessageOptions,
+  content: MessageCreateOptions,
-  file?: FileOptions[],
+  files?: MessageCreateOptions["files"],
 ): Promise<InternalPosterMessageResult | null> {
   const caseLogChannelId = pluginData.config.get().case_log_channel;
   if (!caseLogChannelId) return null;
@@ -23,13 +23,16 @@ export async function postToCaseLogChannel(
 
   let result: InternalPosterMessageResult | null = null;
   try {
-    if (file != null) {
+    if (files != null) {
-      content.files = file;
+      content.files = files;
     }
     const poster = pluginData.getPlugin(InternalPosterPlugin);
     result = await poster.sendMessage(caseLogChannel, { ...content });
   } catch (e) {
-    if (isDiscordAPIError(e) && (e.code === 50013 || e.code === 50001)) {
+    if (
+      isDiscordAPIError(e) &&
+      (e.code === RESTJSONErrorCodes.MissingPermissions || e.code === RESTJSONErrorCodes.MissingAccess)
+    ) {
       pluginData.getPlugin(LogsPlugin).logBotAlert({
         body: `Missing permissions to post mod cases in <#${caseLogChannel.id}>`,
       });
@@ -57,10 +60,12 @@ export async function postCaseToCaseLogChannel(
 
     try {
       const poster = pluginData.getPlugin(InternalPosterPlugin);
-      const channel = pluginData.guild.channels.resolve(channelId as Snowflake) as TextChannel;
+      const channel = pluginData.guild.channels.resolve(channelId as Snowflake);
-      const message = await channel.messages.fetch(messageId);
+      if (channel?.isTextBased()) {
-      if (message) {
+        const message = await channel.messages.fetch(messageId);
-        await poster.editMessage(message, caseEmbed);
+        if (message) {
+          await poster.editMessage(message, caseEmbed);
+        }
       }
       return;
     } catch {} // tslint:disable-line:no-empty

backend/src/plugins/Censor/util/applyFiltersToMsg.ts

@@ -1,4 +1,4 @@
-import { Invite, MessageEmbed } from "discord.js";
+import { Invite, Embed } from "discord.js";
 import escapeStringRegexp from "escape-string-regexp";
 import { GuildPluginData } from "knub";
 import cloneDeep from "lodash.clonedeep";
@@ -19,7 +19,7 @@ export async function applyFiltersToMsg(
   let messageContent = savedMessage.data.content || "";
   if (savedMessage.data.attachments) messageContent += " " + JSON.stringify(savedMessage.data.attachments);
   if (savedMessage.data.embeds) {
-    const embeds = (savedMessage.data.embeds as MessageEmbed[]).map((e) => cloneDeep(e));
+    const embeds = (savedMessage.data.embeds as Embed[]).map((e) => cloneDeep(e));
     for (const embed of embeds) {
       if (embed.type === "video") {
         // Ignore video descriptions as they're not actually shown on the embed

backend/src/plugins/Censor/util/censorMessage.ts

@@ -1,6 +1,5 @@
-import { BaseGuildTextChannel, GuildTextBasedChannel, Snowflake, TextChannel, ThreadChannel } from "discord.js";
+import { GuildTextBasedChannel, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
-import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
 import { LogType } from "../../../data/LogType";
 import { resolveUser } from "../../../utils";
@@ -15,8 +14,8 @@ export async function censorMessage(
   pluginData.state.serverLogs.ignoreLog(LogType.MESSAGE_DELETE, savedMessage.id);
 
   try {
-    const resolvedChannel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake) as TextChannel;
+    const resolvedChannel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake);
-    await resolvedChannel.messages.delete(savedMessage.id as Snowflake);
+    if (resolvedChannel?.isTextBased()) await resolvedChannel.messages.delete(savedMessage.id as Snowflake);
   } catch {
     return;
   }

backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts

@@ -1,4 +1,4 @@
-import { Collection, Message, Snowflake } from "discord.js";
+import { Snowflake } from "discord.js";
 import moment from "moment-timezone";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isOwner, sendErrorMessage } from "../../../pluginUtils";

backend/src/plugins/ChannelArchiver/rehostAttachment.ts

@@ -1,14 +1,11 @@
-import { MessageAttachment, MessageOptions, TextChannel, ThreadChannel } from "discord.js";
+import { GuildTextBasedChannel, Attachment, MessageCreateOptions } from "discord.js";
 import fs from "fs";
 import { downloadFile } from "../../utils";
 const fsp = fs.promises;
 
 const MAX_ATTACHMENT_REHOST_SIZE = 1024 * 1024 * 8;
 
-export async function rehostAttachment(
+export async function rehostAttachment(attachment: Attachment, targetChannel: GuildTextBasedChannel): Promise<string> {
-  attachment: MessageAttachment,
-  targetChannel: TextChannel | ThreadChannel,
-): Promise<string> {
   if (attachment.size > MAX_ATTACHMENT_REHOST_SIZE) {
     return "Attachment too big to rehost";
   }
@@ -21,7 +18,7 @@ export async function rehostAttachment(
   }
 
   try {
-    const content: MessageOptions = {
+    const content: MessageCreateOptions = {
       content: `Rehost of attachment ${attachment.id}`,
       files: [{ name: attachment.name ? attachment.name : undefined, attachment: await fsp.readFile(downloaded.path) }],
     };

backend/src/plugins/ContextMenus/actions/clean.ts

@@ -1,6 +1,5 @@
-import { ContextMenuInteraction, TextChannel } from "discord.js";
+import { ContextMenuCommandInteraction, TextChannel } from "discord.js";
 import { GuildPluginData } from "knub";
-import { LogType } from "../../../data/LogType";
 import { UtilityPlugin } from "../../../plugins/Utility/UtilityPlugin";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
@@ -9,7 +8,7 @@ import { ContextMenuPluginType } from "../types";
 export async function cleanAction(
   pluginData: GuildPluginData<ContextMenuPluginType>,
   amount: number,
-  interaction: ContextMenuInteraction,
+  interaction: ContextMenuCommandInteraction,
 ) {
   interaction.deferReply({ ephemeral: true });
   const executingMember = await pluginData.guild.members.fetch(interaction.user.id);

backend/src/plugins/ContextMenus/actions/mute.ts

@@ -1,9 +1,8 @@
-import { ContextMenuInteraction } from "discord.js";
+import { ContextMenuCommandInteraction } from "discord.js";
 import humanizeDuration from "humanize-duration";
 import { GuildPluginData } from "knub";
 import { ModActionsPlugin } from "src/plugins/ModActions/ModActionsPlugin";
 import { canActOn } from "src/pluginUtils";
-import { LogType } from "../../../data/LogType";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
 import { convertDelayStringToMS } from "../../../utils";
 import { CaseArgs } from "../../Cases/types";
@@ -14,7 +13,7 @@ import { ContextMenuPluginType } from "../types";
 export async function muteAction(
   pluginData: GuildPluginData<ContextMenuPluginType>,
   duration: string | undefined,
-  interaction: ContextMenuInteraction,
+  interaction: ContextMenuCommandInteraction,
 ) {
   interaction.deferReply({ ephemeral: true });
   const executingMember = await pluginData.guild.members.fetch(interaction.user.id);

backend/src/plugins/ContextMenus/actions/userInfo.ts

@@ -1,11 +1,11 @@
-import { ContextMenuInteraction } from "discord.js";
+import { ContextMenuCommandInteraction } from "discord.js";
 import { GuildPluginData } from "knub";
 import { UtilityPlugin } from "../../../plugins/Utility/UtilityPlugin";
 import { ContextMenuPluginType } from "../types";
 
 export async function userInfoAction(
   pluginData: GuildPluginData<ContextMenuPluginType>,
-  interaction: ContextMenuInteraction,
+  interaction: ContextMenuCommandInteraction,
 ) {
   interaction.deferReply({ ephemeral: true });
   const executingMember = await pluginData.guild.members.fetch(interaction.user.id);

backend/src/plugins/ContextMenus/events/ContextClickedEvt.ts

@@ -1,4 +1,3 @@
-import { ContextMenuInteraction } from "discord.js";
 import { contextMenuEvt } from "../types";
 import { routeContextAction } from "../utils/contextRouter";
 
@@ -6,8 +5,8 @@ export const ContextClickedEvt = contextMenuEvt({
   event: "interactionCreate",
 
   async listener(meta) {
-    if (!meta.args.interaction.isContextMenu) return;
+    if (!meta.args.interaction.isContextMenuCommand()) return;
-    const inter = meta.args.interaction as ContextMenuInteraction;
+    const inter = meta.args.interaction;
     await routeContextAction(meta.pluginData, inter);
   },
 });

backend/src/plugins/ContextMenus/utils/contextRouter.ts

@@ -1,11 +1,11 @@
-import { ContextMenuInteraction } from "discord.js";
+import { ContextMenuCommandInteraction } from "discord.js";
 import { GuildPluginData } from "knub";
 import { ContextMenuPluginType } from "../types";
 import { hardcodedActions } from "./hardcodedContextOptions";
 
 export async function routeContextAction(
   pluginData: GuildPluginData<ContextMenuPluginType>,
-  interaction: ContextMenuInteraction,
+  interaction: ContextMenuCommandInteraction,
 ) {
   const contextLink = await pluginData.state.contextMenuLinks.get(interaction.commandId);
   if (!contextLink) return;

backend/src/plugins/ContextMenus/utils/loadAllCommands.ts

@@ -1,5 +1,4 @@
-import { ApplicationCommandData, Constants } from "discord.js";
+import { ApplicationCommandData, ApplicationCommandType } from "discord.js";
-import { LogType } from "../../../data/LogType";
 import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin";
 import { GuildPluginData } from "knub";
 import { ContextMenuPluginType } from "../types";
@@ -14,9 +13,7 @@ export async function loadAllCommands(pluginData: GuildPluginData<ContextMenuPlu
   for (const [name, label] of Object.entries(hardcodedContext)) {
     if (!cfg[name]) continue;
 
-    const type = name.startsWith("user")
+    const type = name.startsWith("user") ? ApplicationCommandType.User : ApplicationCommandType.Message;
-      ? Constants.ApplicationCommandTypes.USER
-      : Constants.ApplicationCommandTypes.MESSAGE;
     const data: ApplicationCommandData = {
       type,
       name: label,

backend/src/plugins/Counters/commands/ViewCounterCmd.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { guildPluginMessageCommand } from "knub";
 import { waitForReply } from "knub/dist/helpers";
 import { commandTypeHelpers as ct } from "../../../commandTypes";

backend/src/plugins/CustomEvents/CustomEventsPlugin.ts

@@ -1,11 +1,11 @@
 import { parseSignature, guildPluginMessageCommand } from "knub";
 import { commandTypes } from "../../commandTypes";
-import { stripObjectToScalars, UnknownUser } from "../../utils";
+import { UnknownUser } from "../../utils";
 import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
 import { runEvent } from "./functions/runEvent";
 import { ConfigSchema, CustomEventsPluginType } from "./types";
 import { createTypedTemplateSafeValueContainer, TemplateSafeValueContainer } from "../../templateFormatter";
-import { Channel, GuildChannel, GuildMember, ThreadChannel, User } from "discord.js";
+import { GuildChannel, GuildMember, ThreadChannel, User } from "discord.js";
 import {
   channelToTemplateSafeChannel,
   memberToTemplateSafeMember,

backend/src/plugins/CustomEvents/actions/addRoleAction.ts

@@ -1,4 +1,3 @@
-import { Snowflake } from "discord.js";
 import * as t from "io-ts";
 import { GuildPluginData } from "knub";
 import { canActOn } from "../../../pluginUtils";

backend/src/plugins/CustomEvents/actions/makeRoleMentionableAction.ts

@@ -25,22 +25,10 @@ export async function makeRoleMentionableAction(
     throw new ActionError(`Unknown role: ${role}`);
   }
 
-  await role.edit(
+  await role.setMentionable(true, `Custom event: ${event.name}`);
-    {
-      mentionable: true,
-    },
-    `Custom event: ${event.name}`,
-  );
 
   const timeout = convertDelayStringToMS(action.timeout)!;
   setTimeout(() => {
-    role
+    role.setMentionable(false, `Custom event: ${event.name}`).catch(noop);
-      .edit(
-        {
-          mentionable: false,
-        },
-        `Custom event: ${event.name}`,
-      )
-      .catch(noop);
   }, timeout);
 }

backend/src/plugins/CustomEvents/actions/makeRoleUnmentionableAction.ts

@@ -23,10 +23,5 @@ export async function makeRoleUnmentionableAction(
     throw new ActionError(`Unknown role: ${role}`);
   }
 
-  await role.edit(
+  await role.setMentionable(false, `Custom event: ${event.name}`);
-    {
-      mentionable: false,
-    },
-    `Custom event: ${event.name}`,
-  );
 }

backend/src/plugins/CustomEvents/actions/setChannelPermissionOverrides.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel, PermissionsString, PermissionsBitField } from "discord.js";
+import { Snowflake, PermissionsString, PermissionsBitField } from "discord.js";
 import * as t from "io-ts";
 import { GuildPluginData } from "knub";
 import { ActionError } from "../ActionError";
@@ -26,8 +26,8 @@ export async function setChannelPermissionOverridesAction(
   event: TCustomEvent,
   eventData: any,
 ) {
-  const channel = pluginData.guild.channels.cache.get(action.channel as Snowflake) as TextChannel;
+  const channel = pluginData.guild.channels.cache.get(action.channel as Snowflake);
-  if (!channel) {
+  if (!channel || channel.isThread() || !("guild" in channel)) {
     throw new ActionError(`Unknown channel: ${action.channel}`);
   }
 

backend/src/plugins/CustomEvents/functions/runEvent.ts

@@ -1,4 +1,4 @@
-import { Message, TextChannel } from "discord.js";
+import { Message } from "discord.js";
 import { GuildPluginData } from "knub";
 import { sendErrorMessage } from "../../../pluginUtils";
 import { ActionError } from "../ActionError";
@@ -39,7 +39,7 @@ export async function runEvent(
   } catch (e) {
     if (e instanceof ActionError) {
       if (event.trigger.type === "command") {
-        sendErrorMessage(pluginData, (eventData.msg as Message).channel as TextChannel, e.message);
+        sendErrorMessage(pluginData, (eventData.msg as Message).channel, e.message);
       } else {
         // TODO: Where to log action errors from other kinds of triggers?
       }

backend/src/plugins/GuildInfoSaver/GuildInfoSaverPlugin.ts

@@ -1,5 +1,5 @@
 import * as t from "io-ts";
-import { GuildPluginData, guildPluginEventListener } from "knub";
+import { guildPluginEventListener } from "knub";
 import { AllowedGuilds } from "../../data/AllowedGuilds";
 import { MINUTES } from "../../utils";
 import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";

backend/src/plugins/GuildInfoSaver/types.ts

@@ -1,5 +1,4 @@
 import { BasePluginType } from "knub";
-import { AllowedGuilds } from "../../data/AllowedGuilds";
 
 export interface GuildInfoSaverPluginType extends BasePluginType {
   state: {

backend/src/plugins/InternalPoster/InternalPosterPlugin.ts

@@ -1,13 +1,6 @@
-import { PluginOptions, guildPluginMessageCommand } from "knub";
+import { PluginOptions } from "knub";
-import { GuildPingableRoles } from "../../data/GuildPingableRoles";
 import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
 import { ConfigSchema, InternalPosterPluginType } from "./types";
-import {
-  getPhishermanDomainInfo,
-  hasPhishermanMasterAPIKey,
-  phishermanApiKeyIsValid,
-  reportTrackedDomainsToPhisherman,
-} from "../../data/Phisherman";
 import { mapToPublicFn } from "../../pluginUtils";
 import { Webhooks } from "../../data/Webhooks";
 import { Queue } from "../../Queue";

backend/src/plugins/InternalPoster/functions/editMessage.ts

@@ -1,11 +1,4 @@
-import {
+import { Message, MessageEditOptions, WebhookClient, WebhookMessageEditOptions } from "discord.js";
-  Message,
-  MessageEditOptions,
-  NewsChannel,
-  TextChannel,
-  WebhookClient,
-  WebhookEditMessageOptions,
-} from "discord.js";
 import { GuildPluginData } from "knub";
 import { InternalPosterPluginType } from "../types";
 import { isDiscordAPIError, noop } from "../../../utils";
@@ -16,14 +9,13 @@ import { isDiscordAPIError, noop } from "../../../utils";
 export async function editMessage(
   pluginData: GuildPluginData<InternalPosterPluginType>,
   message: Message,
-  content: MessageEditOptions & WebhookEditMessageOptions,
+  content: MessageEditOptions & WebhookMessageEditOptions,
 ): Promise<void> {
-  if (!(message.channel instanceof TextChannel || message.channel instanceof NewsChannel)) {
+  const channel = message.channel;
+  if (!channel.isTextBased()) {
     return;
   }
 
-  const channel = message.channel as TextChannel | NewsChannel;
-
   await pluginData.state.queue.add(async () => {
     if (message.webhookId) {
       const webhook = await pluginData.state.webhooks.find(message.webhookId);

backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts

@@ -1,13 +1,6 @@
 import { GuildPluginData } from "knub";
 import { InternalPosterPluginType } from "../types";
-import {
+import { GuildBasedChannel, PermissionsBitField } from "discord.js";
-  GuildBasedChannel,
-  GuildChannel,
-  MessageManager,
-  NewsChannel,
-  PermissionsBitField,
-  TextChannel,
-} from "discord.js";
 import { isDiscordAPIError } from "../../../utils";
 
 type WebhookInfo = [id: string, token: string];

backend/src/plugins/LocateUser/events/SendAlertsEvts.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { locateUserEvt } from "../types";
 import { sendAlerts } from "../utils/sendAlerts";
 
@@ -20,11 +20,13 @@ export const VoiceStateUpdateAlertEvt = locateUserEvt({
       const voiceChannel = meta.args.oldState.channel!;
 
       triggeredAlerts.forEach((alert) => {
-        const txtChannel = meta.pluginData.guild.channels.resolve(alert.channel_id as Snowflake) as TextChannel;
+        const txtChannel = meta.pluginData.guild.channels.resolve(alert.channel_id as Snowflake);
-        txtChannel.send({
+        if (txtChannel?.isTextBased()) {
-          content: `🔴 <@!${alert.requestor_id}> the user <@!${alert.user_id}> disconnected out of \`${voiceChannel.name}\``,
+          txtChannel.send({
-          allowedMentions: { users: [alert.requestor_id as Snowflake] },
+            content: `🔴 <@!${alert.requestor_id}> the user <@!${alert.user_id}> disconnected out of \`${voiceChannel.name}\``,
-        });
+            allowedMentions: { users: [alert.requestor_id as Snowflake] },
+          });
+        }
       });
     }
   },

backend/src/plugins/LocateUser/types.ts

@@ -1,7 +1,6 @@
 import * as t from "io-ts";
 import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub";
 import { GuildVCAlerts } from "../../data/GuildVCAlerts";
-import Timeout = NodeJS.Timeout;
 
 export const ConfigSchema = t.type({
   can_where: t.boolean,

backend/src/plugins/LocateUser/utils/moveMember.ts

@@ -1,4 +1,4 @@
-import { GuildMember, Snowflake, TextChannel } from "discord.js";
+import { GuildMember, Snowflake, GuildTextBasedChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import { sendErrorMessage } from "../../../pluginUtils";
 import { LocateUserPluginType } from "../types";
@@ -7,7 +7,7 @@ export async function moveMember(
   pluginData: GuildPluginData<LocateUserPluginType>,
   toMoveID: string,
   target: GuildMember,
-  errorChannel: TextChannel,
+  errorChannel: GuildTextBasedChannel,
 ) {
   const modMember: GuildMember = await pluginData.guild.members.fetch(toMoveID as Snowflake);
   if (modMember.voice.channelId != null) {

backend/src/plugins/LocateUser/utils/sendAlerts.ts

@@ -1,4 +1,4 @@
-import { Snowflake, TextChannel } from "discord.js";
+import { Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { resolveMember } from "../../../utils";
 import { LocateUserPluginType } from "../types";
@@ -12,10 +12,12 @@ export async function sendAlerts(pluginData: GuildPluginData<LocateUserPluginTyp
 
   triggeredAlerts.forEach((alert) => {
     const prepend = `<@!${alert.requestor_id}>, an alert requested by you has triggered!\nReminder: \`${alert.body}\`\n`;
-    const txtChannel = pluginData.guild.channels.resolve(alert.channel_id as Snowflake) as TextChannel;
+    const txtChannel = pluginData.guild.channels.resolve(alert.channel_id as Snowflake);
-    sendWhere(pluginData, member, txtChannel, prepend);
+    if (txtChannel?.isTextBased()) {
-    if (alert.active) {
+      sendWhere(pluginData, member, txtChannel, prepend);
-      moveMember(pluginData, alert.requestor_id, member, txtChannel);
+      if (alert.active) {
+        moveMember(pluginData, alert.requestor_id, member, txtChannel);
+      }
     }
   });
 }

backend/src/plugins/LocateUser/utils/sendWhere.ts

@@ -1,4 +1,4 @@
-import { GuildMember, Invite, TextChannel, VoiceChannel } from "discord.js";
+import { GuildMember, GuildTextBasedChannel, Invite, VoiceChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import { getInviteLink } from "knub/dist/helpers";
 import { sendErrorMessage } from "../../../pluginUtils";
@@ -8,7 +8,7 @@ import { createOrReuseInvite } from "./createOrReuseInvite";
 export async function sendWhere(
   pluginData: GuildPluginData<LocateUserPluginType>,
   member: GuildMember,
-  channel: TextChannel,
+  channel: GuildTextBasedChannel,
   prepend: string,
 ) {
   const voice = member.voice.channelId

backend/src/plugins/Logs/LogsPlugin.ts

@@ -35,11 +35,7 @@ import { log } from "./util/log";
 import { onMessageDelete } from "./util/onMessageDelete";
 import { onMessageDeleteBulk } from "./util/onMessageDeleteBulk";
 import { onMessageUpdate } from "./util/onMessageUpdate";
-import {
+import { createTypedTemplateSafeValueContainer, TypedTemplateSafeValueContainer } from "../../templateFormatter";
-  createTypedTemplateSafeValueContainer,
-  TemplateSafeValueContainer,
-  TypedTemplateSafeValueContainer,
-} from "../../templateFormatter";
 import { mapToPublicFn } from "../../pluginUtils";
 
 import { logAutomodAction } from "./logFunctions/logAutomodAction";