.env.example

@@ -0,0 +1,84 @@
+# ==========================
+# GENERAL OPTIONS
+# ==========================
+
+# 32 character encryption key
+KEY=
+
+# Values from the Discord developer portal
+CLIENT_ID=
+CLIENT_SECRET=
+BOT_TOKEN=
+
+# The defaults here automatically work for the development environment.
+# For production, change localhost:3300 to your domain.
+DASHBOARD_URL=https://localhost:3300
+API_URL=https://localhost:3300/api
+
+# Comma-separated list of user IDs who should have access to the bot's global commands
+STAFF=
+
+# A comma-separated list of server IDs that should be allowed by default
+DEFAULT_ALLOWED_SERVERS=
+
+# Only required if relevant feature is used
+#PHISHERMAN_API_KEY=
+
+
+# ==========================
+# DEVELOPMENT
+# NOTE: You only need to fill in these values for running the development environment
+# ==========================
+
+DEVELOPMENT_WEB_PORT=3300
+
+# The MySQL database running in the container is exposed to the host on this port,
+# allowing access with database tools such as DBeaver
+DEVELOPMENT_MYSQL_PORT=3356
+# Password for the Zeppelin database user
+DEVELOPMENT_MYSQL_PASSWORD=password
+# Password for the MySQL root user
+DEVELOPMENT_MYSQL_ROOT_PASSWORD=password
+
+# The development environment container has an SSH server that you can connect to.
+# This is the port that server is exposed to the host on.
+DEVELOPMENT_SSH_PORT=3022
+DEVELOPMENT_SSH_PASSWORD=password
+
+# If your user has a different UID than 1000, you might have to fill that in here to avoid permission issues
+#DEVELOPMENT_UID=1000
+
+
+# ==========================
+# PRODUCTION - STANDALONE
+# NOTE: You only need to fill in these values for running the standalone production environment
+# ==========================
+
+STANDALONE_WEB_PORT=80
+
+# The MySQL database running in the container is exposed to the host on this port,
+# allowing access with database tools such as DBeaver
+STANDALONE_MYSQL_PORT=3356
+# Password for the Zeppelin database user
+STANDALONE_MYSQL_PASSWORD=
+# Password for the MySQL root user
+STANDALONE_MYSQL_ROOT_PASSWORD=
+
+
+# ==========================
+# PRODUCTION - LIGHTWEIGHT
+# NOTE: You only need to fill in these values for running the lightweight production environment
+# ==========================
+
+# Ports where the API/dashboard are exposed on the host
+LIGHTWEIGHT_API_PORT=3001
+LIGHTWEIGHT_DASHBOARD_PORT=3002
+
+LIGHTWEIGHT_DB_HOST=
+LIGHTWEIGHT_DB_PORT=
+LIGHTWEIGHT_DB_USER=
+LIGHTWEIGHT_DB_PASSWORD=
+LIGHTWEIGHT_DB_DATABASE=
+
+# If you want to add a prefix to API paths, such as /api, you can set that here
+LIGHTWEIGHT_API_PATH_PREFIX=

.eslintrc.js

@@ -0,0 +1,28 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+    browser: true,
+    es6: true,
+  },
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  parser: "@typescript-eslint/parser",
+  plugins: ["@typescript-eslint"],
+  rules: {
+    "@typescript-eslint/no-explicit-any": 0,
+    "@typescript-eslint/ban-ts-comment": 0,
+    "@typescript-eslint/no-non-null-assertion": 0,
+    "no-async-promise-executor": 0,
+    "@typescript-eslint/no-empty-interface": 0,
+    "no-constant-condition": ["error", {
+      checkLoops: false,
+    }],
+    "prefer-const": ["error", {
+      destructuring: "all",
+      ignoreReadBeforeAssign: true,
+    }],
+    "@typescript-eslint/no-namespace": ["error", {
+      allowDeclarations: true,
+    }],
+  },
+};

.github/workflows/codequality.yml

@@ -8,20 +8,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [23]
+        node-version: [18.16]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Setup pnpm
+    - name: npm install, lint, code style check
-      uses: pnpm/action-setup@v4
-      with:
-        version: latest
-    - name: pnpm install, lint, code style check
       run: |
-        pnpm i
+        npm ci
-        pnpm run lint
+        npm run lint
-        pnpm run codestyle-check
+        npm run codestyle-check

.github/workflows/push-code.yml

@@ -1,21 +0,0 @@
-name: Push code
-
-on:
-  push:
-    branches:
-      - working-commit
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: install ssh keys
-      run: |
-        install -m 600 -D /dev/null ~/.ssh/id_ed25519
-        echo "${{ secrets.ZAPPYZEP_KEY }}" > ~/.ssh/id_ed25519
-        ssh-keyscan -H zappyzep.xyz > ~/.ssh/known_hosts
-    - name: connect and pull
-      run: ssh zappyzep@zappyzep.xyz "cd Zeppelin && git checkout working-commit && git pull && docker compose -f docker-compose.standalone.yml down && docker image rm zeppelin-prod-{api,dashboard,bot,migrate,nginx,revampdashboard} && docker compose -f docker-compose.standalone.yml up -d && exit"
-    - name: cleanup
-      run: rm -rf ~/.ssh

Dockerfile

@@ -1,7 +1,6 @@
 FROM node:20
 
 RUN mkdir /zeppelin
-RUN corepack enable
 RUN chown node:node /zeppelin
 
 USER node
@@ -9,34 +8,27 @@ USER node
 ARG API_URL
 
 # Install dependencies before copying over any other files
-RUN corepack prepare --activate pnpm@latest
+COPY --chown=node:node package.json package-lock.json /zeppelin
-COPY --chown=node:node package.json pnpm-lock.yaml pnpm-workspace.yaml /zeppelin/
 RUN mkdir /zeppelin/backend
-COPY --chown=node:node backend/package.json /zeppelin/backend/
+COPY --chown=node:node backend/package.json /zeppelin/backend
 RUN mkdir /zeppelin/shared
-COPY --chown=node:node shared/package.json /zeppelin/shared/
+COPY --chown=node:node shared/package.json /zeppelin/shared
 RUN mkdir /zeppelin/dashboard
-COPY --chown=node:node dashboard/package.json /zeppelin/dashboard/
+COPY --chown=node:node dashboard/package.json /zeppelin/dashboard
-RUN mkdir /zeppelin/revampdashboard
-COPY --chown=node:node revampdashboard/package.json /zeppelin/revampdashboard/
 
 WORKDIR /zeppelin
-RUN pnpm i
+RUN npm ci
 
 COPY --chown=node:node . /zeppelin
 
 # Build backend
 WORKDIR /zeppelin/backend
-RUN pnpm run build
+RUN npm run build
 
 # Build dashboard
 WORKDIR /zeppelin/dashboard
-RUN pnpm run build
+RUN npm run build
-
-WORKDIR /zeppelin/revampdashboard/
-RUN pnpm run check
-RUN pnpm run build
 
 # Prune dev dependencies
 WORKDIR /zeppelin
-RUN pnpm prune --prod
+RUN npm prune --omit=dev

backend/package.json

@@ -18,28 +18,26 @@
     "start-api-prod-debug": "clinic heapprofiler --collect-only --dest .clinic-api -- node --enable-source-maps --stack-trace-limit=30 dist/api/index.js",
     "watch-api": "tsc-watch --build --onSuccess \"npm run start-api-dev\"",
     "typeorm": "node ../node_modules/typeorm/cli.js",
-    "migrate": "pnpm run typeorm -- migration:run -d dist/data/dataSource.js",
+    "migrate": "npm run typeorm -- migration:run -d dist/data/dataSource.js",
-    "migrate-prod": "pnpm run migrate",
+    "migrate-prod": "npm run migrate",
-    "migrate-dev": "pnpm run build && npm run migrate",
+    "migrate-dev": "npm run build && npm run migrate",
-    "migrate-rollback": "pnpm run typeorm -- migration:revert -d dist/data/dataSource.js",
+    "migrate-rollback": "npm run typeorm -- migration:revert -d dist/data/dataSource.js",
-    "migrate-rollback-prod": "pnpm run migrate-rollback",
+    "migrate-rollback-prod": "npm run migrate-rollback",
-    "migrate-rollback-dev": "pnpm run build && npm run migrate-rollback",
+    "migrate-rollback-dev": "npm run build && npm run migrate-rollback",
     "validate-active-configs": "node --enable-source-maps dist/validateActiveConfigs.js > ../config-errors.txt",
     "export-config-json-schema": "node --enable-source-maps dist/exportSchemas.js > ../config-schema.json",
-    "test": "pnpm run build && pnpm run run-tests",
+    "test": "npm run build && npm run run-tests",
     "run-tests": "ava",
     "test-watch": "tsc-watch --build --onSuccess \"npx ava\""
   },
   "dependencies": {
     "@silvia-odwyer/photon-node": "^0.3.1",
-    "@zeppelinbot/shared": "workspace:*",
     "bufferutil": "^4.0.3",
     "clinic": "^13.0.0",
-    "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "deep-diff": "^1.0.2",
-    "discord.js": "^14.16.3",
+    "discord.js": "^14.14.1",
     "dotenv": "^4.0.0",
     "emoji-regex": "^8.0.0",
     "escape-string-regexp": "^1.0.5",
@@ -50,14 +48,12 @@
     "knub": "^32.0.0-next.21",
     "knub-command-manager": "^9.1.0",
     "last-commit-log": "^2.1.0",
-    "lodash": "^4.17.21",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.difference": "^4.5.0",
     "lodash.intersection": "^4.4.0",
     "lodash.isequal": "^4.5.0",
     "lodash.pick": "^4.4.0",
-    "moment": "^2.29.4",
     "moment-timezone": "^0.5.21",
     "multer": "^1.4.5-lts.1",
     "mysql2": "^3.9.3",
@@ -76,20 +72,18 @@
     "tmp": "0.0.33",
     "tsconfig-paths": "^3.9.0",
     "twemoji": "^12.1.4",
-    "typeorm": "^0.3.20",
+    "typeorm": "^0.3.17",
     "utf-8-validate": "^5.0.5",
     "uuid": "^9.0.0",
     "yawn-yaml": "github:dragory/yawn-yaml#string-number-fix-build",
-    "zlib-sync": "^0.1.9",
+    "zlib-sync": "^0.1.7",
     "zod": "^3.7.2"
   },
   "devDependencies": {
-    "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.5",
     "@types/express": "^4.16.1",
     "@types/jest": "^24.0.15",
     "@types/js-yaml": "^3.12.1",
-    "@types/lodash": "^4.17.13",
     "@types/lodash.at": "^4.6.3",
     "@types/moment-timezone": "^0.5.6",
     "@types/multer": "^1.4.7",
@@ -102,7 +96,7 @@
     "@types/twemoji": "^12.1.0",
     "@types/uuid": "^9.0.2",
     "ava": "^5.3.1",
-    "rimraf": "^6.0.1",
+    "rimraf": "^2.6.2",
     "source-map-support": "^0.5.16",
     "zod-to-json-schema": "^3.22.3"
   },

backend/src/SimpleCache.ts

@@ -47,7 +47,7 @@ export class SimpleCache<T = any> {
 
     if (this.maxItems && this.store.size > this.maxItems) {
       const keyToDelete = this.store.keys().next().value;
-      this.store.delete(keyToDelete!);
+      this.store.delete(keyToDelete);
     }
   }
 

backend/src/api/auth.ts

@@ -1,4 +1,4 @@
-import express, { NextFunction, Request, Response } from "express";
+import express, { Request, Response } from "express";
 import https from "https";
 import pick from "lodash.pick";
 import passport from "passport";
@@ -111,32 +111,14 @@ export function initAuth(router: express.Router) {
   );
 
   router.get("/auth/login", passport.authenticate("oauth2"));
-  router.get(
-    "/auth/new-login",
-    (req: Request, res: Response, next: NextFunction) => {
-      res.cookie("redir", `/new/auth/login-callback/`, { httpOnly: true });
-
-      next();
-    },
-    passport.authenticate("oauth2"),
-  );
   router.get(
     "/auth/oauth-callback",
     passport.authenticate("oauth2", { failureRedirect: "/", session: false }),
     (req: Request, res: Response) => {
-      res.clearCookie("redir");
       if (req.user && req.user.apiKey) {
-        res.redirect(
+        res.redirect(`${env.DASHBOARD_URL}/login-callback/?apiKey=${req.user.apiKey}`);
-          req.cookies.redir
-            ? `${env.DASHBOARD_URL}${req.cookies.redir.toString()}?apiKey=${req.user.apiKey}`
-            : `${env.DASHBOARD_URL}/login-callback/?apiKey=${req.user.apiKey}`,
-        );
       } else {
-        res.redirect(
+        res.redirect(`${env.DASHBOARD_URL}/login-callback/?error=noAccess`);
-          req.cookies.redir
-            ? `${env.DASHBOARD_URL}${req.cookies.redir.toString()}?error=noAccess`
-            : `${env.DASHBOARD_URL}/login-callback/?error=noAccess`,
-        );
       }
     },
   );
@@ -168,6 +150,7 @@ export function initAuth(router: express.Router) {
 export function apiTokenAuthHandlers() {
   return [
     passport.authenticate("api-token", { failWithError: true, session: false }),
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     (err, req: Request, res: Response, next) => {
       return res.status(401).json({ error: err.message });
     },

backend/src/api/start.ts

@@ -1,7 +1,6 @@
 import cors from "cors";
 import express from "express";
 import multer from "multer";
-import cookieParser from "cookie-parser";
 import { TokenError } from "passport-oauth2";
 import { env } from "../env";
 import { initArchives } from "./archives";
@@ -26,14 +25,13 @@ app.use(
   }),
 );
 app.use(multer().none());
-app.use(cookieParser());
 
 const rootRouter = express.Router();
 
-initAuth(rootRouter);
+initAuth(app);
-initGuildsAPI(rootRouter);
+initGuildsAPI(app);
-initArchives(rootRouter);
+initArchives(app);
-initDocs(rootRouter);
+initDocs(app);
 
 // Default route
 rootRouter.get("/", (req, res) => {

backend/src/data/ApiLogins.ts

@@ -7,7 +7,6 @@ import { DAYS, DBDateFormat } from "../utils";
 import { BaseRepository } from "./BaseRepository";
 import { dataSource } from "./dataSource";
 import { ApiLogin } from "./entities/ApiLogin";
-import { randomBytes } from "node:crypto";
 
 const LOGIN_EXPIRY_TIME = 1 * DAYS;
 
@@ -49,7 +48,7 @@ export class ApiLogins extends BaseRepository {
     // Generate random login id
     let loginId;
     while (true) {
-      loginId = randomBytes(16).toString("hex");
+      loginId = uuidv4();
       const existing = await this.apiLogins.findOne({
         where: {
           id: loginId,
@@ -59,7 +58,7 @@ export class ApiLogins extends BaseRepository {
     }
 
     // Generate token
-    const token = randomBytes(32).toString("hex");
+    const token = uuidv4();
     const hash = crypto.createHash("sha256");
     hash.update(loginId + token); // Use loginId as a salt
     const hashedToken = hash.digest("hex");

backend/src/data/ApiUserInfo.ts

@@ -3,7 +3,7 @@ import { Repository } from "typeorm";
 import { DBDateFormat } from "../utils";
 import { BaseRepository } from "./BaseRepository";
 import { dataSource } from "./dataSource";
-import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
+import { ApiUserInfoData, ApiUserInfo as ApiUserInfoEntity } from "./entities/ApiUserInfo";
 
 export class ApiUserInfo extends BaseRepository {
   private apiUserInfo: Repository<ApiUserInfoEntity>;

backend/src/data/GuildArchives.ts

@@ -1,7 +1,7 @@
 import { Guild, Snowflake } from "discord.js";
 import moment from "moment-timezone";
 import { Repository } from "typeorm";
-import { renderTemplate, TemplateSafeValueContainer } from "../templateFormatter";
+import { TemplateSafeValueContainer, renderTemplate } from "../templateFormatter";
 import { renderUsername, trimLines } from "../utils";
 import { decrypt, encrypt } from "../utils/crypt";
 import { isDefaultSticker } from "../utils/isDefaultSticker";

backend/src/data/GuildCounters.ts

@@ -5,7 +5,7 @@ import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
 import { dataSource } from "./dataSource";
 import { Counter } from "./entities/Counter";
-import { CounterTrigger, isValidCounterComparisonOp, TriggerComparisonOp } from "./entities/CounterTrigger";
+import { CounterTrigger, TriggerComparisonOp, isValidCounterComparisonOp } from "./entities/CounterTrigger";
 import { CounterTriggerState } from "./entities/CounterTriggerState";
 import { CounterValue } from "./entities/CounterValue";
 

backend/src/index.ts

@@ -44,7 +44,7 @@ import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availab
 import { setProfiler } from "./profiler";
 import { logRateLimit } from "./rateLimitStats";
 import { startUptimeCounter } from "./uptime";
-import { errorMessage, isDiscordAPIError, isDiscordHTTPError, MINUTES, SECONDS, sleep, successMessage } from "./utils";
+import { MINUTES, SECONDS, errorMessage, isDiscordAPIError, isDiscordHTTPError, sleep, successMessage } from "./utils";
 import { DecayingCounter } from "./utils/DecayingCounter";
 import { enableProfiling } from "./utils/easyProfiler";
 import { loadYamlSafely } from "./utils/loadYamlSafely";

backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts

@@ -3,24 +3,18 @@ import { MigrationInterface, QueryRunner, Table, TableColumn } from "typeorm";
 export class MoveStarboardsToConfig1573248462469 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {
     // Create a new column for the channel's id
-    await queryRunner.addColumn(
+    await queryRunner.addColumn("starboard_messages", new TableColumn({
-      "starboard_messages",
-      new TableColumn({
       name: "starboard_channel_id",
       type: "bigint",
       unsigned: true,
-      }),
+    }));
-    );
 
     // Since we are removing the guild_id with the starboards table, we might want it here
-    await queryRunner.addColumn(
+    await queryRunner.addColumn("starboard_messages", new TableColumn({
-      "starboard_messages",
-      new TableColumn({
       name: "guild_id",
       type: "bigint",
       unsigned: true,
-      }),
+    }));
-    );
 
     // Migrate the old starboard_id to the new starboard_channel_id
     await queryRunner.query(`
@@ -49,14 +43,11 @@ export class MoveStarboardsToConfig1573248462469 implements MigrationInterface {
     await queryRunner.dropColumn("starboard_messages", "starboard_channel_id");
     await queryRunner.dropColumn("starboard_messages", "guild_id");
 
-    await queryRunner.addColumn(
+    await queryRunner.addColumn("starboard_messages", new TableColumn({
-      "starboard_messages",
-      new TableColumn({
       name: "starboard_id",
       type: "int",
       unsigned: true,
-      }),
+    }));
-    );
 
     await queryRunner.query(`
       ALTER TABLE starboard_messages

backend/src/pluginUtils.ts

@@ -3,14 +3,12 @@
  */
 
 import {
-  DMChannel,
   GuildMember,
   Message,
   MessageCreateOptions,
   MessageMentionOptions,
   PermissionsBitField,
   TextBasedChannel,
-  TextChannel,
 } from "discord.js";
 import { AnyPluginData, BasePluginData, CommandContext, ExtendedMatchParams, GuildPluginData, helpers } from "knub";
 import { logger } from "./logger";
@@ -63,7 +61,7 @@ export async function sendSuccessMessage(
     ? { content: formattedBody, allowedMentions }
     : { content: formattedBody };
 
-  return ((channel as TextChannel) || DMChannel)
+  return channel
     .send({ ...content }) // Force line break
     .catch((err) => {
       const channelInfo = "guild" in channel ? `${channel.id} (${channel.guild.id})` : channel.id;
@@ -84,7 +82,7 @@ export async function sendErrorMessage(
     ? { content: formattedBody, allowedMentions }
     : { content: formattedBody };
 
-  return ((channel as TextChannel) || DMChannel)
+  return channel
     .send({ ...content }) // Force line break
     .catch((err) => {
       const channelInfo = "guild" in channel ? `${channel.id} (${channel.guild.id})` : channel.id;

backend/src/plugins/AutoDelete/AutoDeletePlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { LogsPlugin } from "../Logs/LogsPlugin";

backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildAutoReactions } from "../../data/GuildAutoReactions";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { LogsPlugin } from "../Logs/LogsPlugin";

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

@@ -1,7 +1,7 @@
 import { PermissionsBitField, PermissionsString } from "discord.js";
 import { U } from "ts-toolbelt";
 import z from "zod";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import { isValidSnowflake, keys, noop, zBoundedCharacters } from "../../../utils";
 import {
   guildToTemplateSafeGuild,

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

@@ -1,6 +1,6 @@
 import { GuildTextBasedChannel, MessageCreateOptions, PermissionsBitField, Snowflake, User } from "discord.js";
 import z from "zod";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import {
   convertDelayStringToMS,
   noop,

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

@@ -1,7 +1,7 @@
 import { ChannelType, GuildTextThreadCreateOptions, ThreadAutoArchiveDuration, ThreadChannel } from "discord.js";
 import z from "zod";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
-import { convertDelayStringToMS, MINUTES, noop, zBoundedCharacters, zDelayString } from "../../../utils";
+import { MINUTES, convertDelayStringToMS, noop, zBoundedCharacters, zDelayString } from "../../../utils";
 import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { automodAction } from "../helpers";

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

@@ -1,7 +1,7 @@
 import { Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
-import { disableUserNotificationStrings, UserNotificationMethod } from "../../../utils";
+import { UserNotificationMethod, disableUserNotificationStrings } from "../../../utils";
 import { AutomodPluginType } from "../types";
 
 export function resolveActionContactMethods(

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

@@ -51,10 +51,10 @@ export const MatchInvitesTrigger = automodTrigger<MatchResultType>()({
         const invite = await resolveInvite(pluginData.client, code);
         if (!invite || !isGuildInvite(invite)) return { extra: { type, code } };
 
-        if (trigger.include_guilds && trigger.include_guilds.includes(await zSnowflake.parseAsync(invite.guild.id))) {
+        if (trigger.include_guilds && trigger.include_guilds.includes(invite.guild.id)) {
           return { extra: { type, code, invite } };
         }
-        if (trigger.exclude_guilds && !trigger.exclude_guilds.includes(await zSnowflake.parseAsync(invite.guild.id))) {
+        if (trigger.exclude_guilds && !trigger.exclude_guilds.includes(invite.guild.id)) {
           return { extra: { type, code, invite } };
         }
       }

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

@@ -1,4 +1,4 @@
-import { escapeBold, type Snowflake, User } from "discord.js";
+import { User, escapeBold, type Snowflake } from "discord.js";
 import z from "zod";
 import { renderUsername } from "../../../utils";
 import { automodTrigger } from "../helpers";

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

@@ -1,4 +1,4 @@
-import { escapeBold, type Snowflake, User } from "discord.js";
+import { User, escapeBold, type Snowflake } from "discord.js";
 import z from "zod";
 import { renderUsername } from "../../../utils.js";
 import { automodTrigger } from "../helpers";

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

@@ -1,4 +1,4 @@
-import { escapeBold, type Snowflake, User } from "discord.js";
+import { User, escapeBold, type Snowflake } from "discord.js";
 import z from "zod";
 import { renderUsername } from "../../../utils.js";
 import { automodTrigger } from "../helpers";

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

@@ -1,4 +1,4 @@
-import { escapeBold, type Snowflake, User } from "discord.js";
+import { User, escapeBold, type Snowflake } from "discord.js";
 import z from "zod";
 import { renderUsername } from "../../../utils";
 import { automodTrigger } from "../helpers";

backend/src/plugins/Automod/types.ts

@@ -10,11 +10,12 @@ import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { SavedMessage } from "../../data/entities/SavedMessage";
 import { entries, zBoundedRecord, zDelayString } from "../../utils";
 import { CounterEvents } from "../Counters/types";
-import { ModActionsEvents, ModActionType } from "../ModActions/types";
+import { ModActionType, ModActionsEvents } from "../ModActions/types";
 import { MutesEvents } from "../Mutes/types";
 import { availableActions } from "./actions/availableActions";
 import { RecentActionType } from "./constants";
 import { availableTriggers } from "./triggers/availableTriggers";
+
 import Timeout = NodeJS.Timeout;
 
 export type ZTriggersMapHelper = {

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

@@ -1,7 +1,6 @@
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter, sendErrorMessage } from "../../../pluginUtils";
 import { botControlCmd } from "../types";
-import { TextBasedChannelFields } from "discord.js";
 
 export const ChannelToServerCmd = botControlCmd({
   trigger: ["channel_to_server", "channel2server"],
@@ -17,7 +16,7 @@ export const ChannelToServerCmd = botControlCmd({
   async run({ pluginData, message: msg, args }) {
     const channel = pluginData.client.channels.cache.get(args.channelId);
     if (!channel) {
-      await sendErrorMessage(pluginData, msg.channel, "Channel not found in cache!");
+      sendErrorMessage(pluginData, msg.channel, "Channel not found in cache!");
       return;
     }
 
@@ -26,8 +25,6 @@ export const ChannelToServerCmd = botControlCmd({
     const guild = "guild" in channel ? channel.guild : null;
     const guildInfo = guild ? `${guild.name} (\`${guild.id}\`)` : "Not a server";
 
-    await (msg.channel as TextBasedChannelFields).send(
+    msg.channel.send(`**Channel:** ${channelName} (\`${channel.type}\`) (<#${channel.id}>)\n**Server:** ${guildInfo}`);
-      `**Channel:** ${channelName} (\`${channel.type}\`) (<#${channel.id}>)\n**Server:** ${guildInfo}`,
-    );
   },
 });

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

@@ -4,7 +4,6 @@ import { GuildArchives } from "../../../data/GuildArchives";
 import { getBaseUrl } from "../../../pluginUtils";
 import { sorter } from "../../../utils";
 import { botControlCmd } from "../types";
-import { TextBasedChannelFields } from "discord.js";
 
 const sortProps = {
   totalTime: "TOTAL TIME",
@@ -52,6 +51,6 @@ export const ProfilerDataCmd = botControlCmd({
     const archiveId = await archives.create(formatted, moment().add(1, "hour"));
     const archiveUrl = archives.getUrl(getBaseUrl(pluginData), archiveId);
 
-    await (msg.channel as TextBasedChannelFields).send(`Link: ${archiveUrl}`);
+    msg.channel.send(`Link: ${archiveUrl}`);
   },
 });

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

@@ -3,7 +3,6 @@ import { GuildArchives } from "../../../data/GuildArchives";
 import { getBaseUrl, sendSuccessMessage } from "../../../pluginUtils";
 import { getRateLimitStats } from "../../../rateLimitStats";
 import { botControlCmd } from "../types";
-import { TextBasedChannelFields } from "discord.js";
 
 export const RateLimitPerformanceCmd = botControlCmd({
   trigger: ["rate_limit_performance"],
@@ -35,6 +34,6 @@ export const RateLimitPerformanceCmd = botControlCmd({
     const archives = GuildArchives.getGuildInstance("0");
     const archiveId = await archives.create(fullText, moment().add(1, "hour"));
     const archiveUrl = archives.getUrl(getBaseUrl(pluginData), archiveId);
-    await (msg.channel as TextBasedChannelFields).send(`Link: ${archiveUrl}`);
+    msg.channel.send(`Link: ${archiveUrl}`);
   },
 });

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

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

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

@@ -2,7 +2,6 @@ import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { getTopRestCallStats } from "../../../restCallStats";
 import { createChunkedMessage } from "../../../utils";
 import { botControlCmd } from "../types";
-import { TextChannel } from "discord.js";
 
 const leadingPathRegex = /(?<=\().+\/backend\//g;
 
@@ -21,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}`;
     });
-    await 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

@@ -3,7 +3,6 @@ import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isStaffPreFilter } from "../../../pluginUtils";
 import { createChunkedMessage, getUser, renderUsername, sorter } from "../../../utils";
 import { botControlCmd } from "../types";
-import { TextBasedChannelFields, TextChannel } from "discord.js";
 
 export const ServersCmd = botControlCmd({
   trigger: ["servers", "guilds"],
@@ -53,16 +52,16 @@ export const ServersCmd = botControlCmd({
             owner.id
           }\`)`;
         });
-        await createChunkedMessage(msg.channel as TextChannel, lines.join("\n"));
+        createChunkedMessage(msg.channel, lines.join("\n"));
       } else {
-        await (msg.channel as TextBasedChannelFields).send("No servers matched the filters");
+        msg.channel.send("No servers matched the filters");
       }
     } else {
       const total = joinedGuilds.length;
       const initialized = joinedGuilds.filter((g) => loadedGuildsMap.has(g.id)).length;
       const unInitialized = total - initialized;
 
-      await (msg.channel as TextBasedChannelFields).send(
+      msg.channel.send(
         `I am on **${total} total servers**, of which **${initialized} are initialized** and **${unInitialized} are not initialized**`,
       );
     }

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
-import { renderUsername, resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, renderUsername, resolveUser } from "../../../utils";
 import { CaseNoteArgs, CasesPluginType } from "../types";
 import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
 import { resolveCaseId } from "./resolveCaseId";

backend/src/plugins/Censor/CensorPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners";

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

@@ -5,14 +5,7 @@ import cloneDeep from "lodash.clonedeep";
 import { allowTimeout } from "../../../RegExpRunner";
 import { ZalgoRegex } from "../../../data/Zalgo";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
-import {
+import { getInviteCodesInString, getUrlsInString, isGuildInvite, resolveInvite, resolveMember } from "../../../utils";
-  getInviteCodesInString,
-  getUrlsInString,
-  isGuildInvite,
-  resolveInvite,
-  resolveMember,
-  zSnowflake,
-} from "../../../utils";
 import { CensorPluginType } from "../types";
 import { censorMessage } from "./censorMessage";
 
@@ -65,18 +58,18 @@ export async function applyFiltersToMsg(
     for (const invite of invites) {
       // Always filter unknown invites if invite filtering is enabled
       if (invite == null) {
-        await censorMessage(pluginData, savedMessage, `unknown invite not found in whitelist`);
+        censorMessage(pluginData, savedMessage, `unknown invite not found in whitelist`);
         return true;
       }
 
       if (!isGuildInvite(invite) && !allowGroupDMInvites) {
-        await censorMessage(pluginData, savedMessage, `group dm invites are not allowed`);
+        censorMessage(pluginData, savedMessage, `group dm invites are not allowed`);
         return true;
       }
 
       if (isGuildInvite(invite)) {
-        if (inviteGuildWhitelist && !inviteGuildWhitelist.includes(await zSnowflake.parseAsync(invite.guild!.id))) {
+        if (inviteGuildWhitelist && !inviteGuildWhitelist.includes(invite.guild!.id)) {
-          await censorMessage(
+          censorMessage(
             pluginData,
             savedMessage,
             `invite guild (**${invite.guild!.name}** \`${invite.guild!.id}\`) not found in whitelist`,
@@ -84,8 +77,8 @@ export async function applyFiltersToMsg(
           return true;
         }
 
-        if (inviteGuildBlacklist && inviteGuildBlacklist.includes(await zSnowflake.parseAsync(invite.guild!.id))) {
+        if (inviteGuildBlacklist && inviteGuildBlacklist.includes(invite.guild!.id)) {
-          await censorMessage(
+          censorMessage(
             pluginData,
             savedMessage,
             `invite guild (**${invite.guild!.name}** \`${invite.guild!.id}\`) found in blacklist`,

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

@@ -2,7 +2,7 @@ import { Snowflake } from "discord.js";
 import moment from "moment-timezone";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isOwner, sendErrorMessage } from "../../../pluginUtils";
-import { confirm, noop, renderUsername, SECONDS } from "../../../utils";
+import { SECONDS, confirm, noop, renderUsername } from "../../../utils";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 import { rehostAttachment } from "../rehostAttachment";
 import { channelArchiverCmd } from "../types";

backend/src/plugins/ChannelArchiver/rehostAttachment.ts

@@ -1,7 +1,6 @@
 import { Attachment, GuildTextBasedChannel, MessageCreateOptions } from "discord.js";
 import fs from "fs";
 import { downloadFile } from "../../utils";
-
 const fsp = fs.promises;
 
 const MAX_ATTACHMENT_REHOST_SIZE = 1024 * 1024 * 8;

backend/src/plugins/CompanionChannels/functions/getCompanionChannelOptsForVoiceChannelId.ts

@@ -1,7 +1,6 @@
 import { StageChannel, VoiceChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import { CompanionChannelsPluginType, TCompanionChannelOpts } from "../types";
-import { zSnowflake } from "../../../utils";
 
 const defaultCompanionChannelOpts: Partial<TCompanionChannelOpts> = {
   enabled: true,
@@ -16,8 +15,8 @@ export async function getCompanionChannelOptsForVoiceChannelId(
   return Object.values(config.entries)
     .filter(
       (opts) =>
-        opts.voice_channel_ids.includes(zSnowflake.parse(voiceChannel.id)) ||
+        opts.voice_channel_ids.includes(voiceChannel.id) ||
-        (voiceChannel.parentId && opts.voice_channel_ids.includes(zSnowflake.parse(voiceChannel.parentId))),
+        (voiceChannel.parentId && opts.voice_channel_ids.includes(voiceChannel.parentId)),
     )
     .map((opts) => Object.assign({}, defaultCompanionChannelOpts, opts));
 }

backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts

@@ -1,7 +1,7 @@
 import { PermissionsBitField, Snowflake, StageChannel, TextChannel, VoiceChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import { LogType } from "../../../data/LogType";
-import { isDiscordAPIError, MINUTES } from "../../../utils";
+import { MINUTES, isDiscordAPIError } from "../../../utils";
 import { filterObject } from "../../../utils/filterObject";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { CompanionChannelsPluginType, TCompanionChannelOpts } from "../types";

backend/src/plugins/ContextMenus/ContextMenuPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildContextMenuLinks } from "../../data/GuildContextMenuLinks";
 import { LogsPlugin } from "../Logs/LogsPlugin";
 import { MutesPlugin } from "../Mutes/MutesPlugin";

backend/src/plugins/Counters/CountersPlugin.ts

@@ -1,8 +1,9 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { EventEmitter } from "events";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildCounters } from "../../data/GuildCounters";
 import { CounterTrigger, parseCounterConditionString } from "../../data/entities/CounterTrigger";
 import { makePublicFn } from "../../pluginUtils";
-import { convertDelayStringToMS, MINUTES, values } from "../../utils";
+import { MINUTES, convertDelayStringToMS, values } from "../../utils";
 import { AddCounterCmd } from "./commands/AddCounterCmd";
 import { CountersListCmd } from "./commands/CountersListCmd";
 import { ResetAllCounterValuesCmd } from "./commands/ResetAllCounterValuesCmd";
@@ -18,7 +19,6 @@ import { offCounterEvent } from "./functions/offCounterEvent";
 import { onCounterEvent } from "./functions/onCounterEvent";
 import { setCounterValue } from "./functions/setCounterValue";
 import { CountersPluginType, zCountersConfig } from "./types";
-import { EventEmitter } from "events";
 
 const DECAY_APPLY_INTERVAL = 5 * MINUTES;
 

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

@@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub";
 import { waitForReply } from "knub/helpers";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { changeCounterValue } from "../functions/changeCounterValue";
 import { CountersPluginType } from "../types";
 

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

@@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub";
 import { waitForReply } from "knub/helpers";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { setCounterValue } from "../functions/setCounterValue";
 import { CountersPluginType } from "../types";
 

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

@@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub";
 import { waitForReply } from "knub/helpers";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { setCounterValue } from "../functions/setCounterValue";
 import { CountersPluginType } from "../types";
 

backend/src/plugins/Counters/types.ts

@@ -3,8 +3,8 @@ import { BasePluginType } from "knub";
 import z from "zod";
 import { GuildCounters, MAX_COUNTER_VALUE, MIN_COUNTER_VALUE } from "../../data/GuildCounters";
 import {
-  buildCounterConditionString,
   CounterTrigger,
+  buildCounterConditionString,
   getReverseCounterComparisonOp,
   parseCounterConditionString,
 } from "../../data/entities/CounterTrigger";

backend/src/plugins/CustomEvents/CustomEventsPlugin.ts

@@ -2,7 +2,7 @@ import { GuildChannel, GuildMember, User } from "discord.js";
 import { guildPlugin, guildPluginMessageCommand, parseSignature } from "knub";
 import { TSignature } from "knub-command-manager";
 import { commandTypes } from "../../commandTypes";
-import { createTypedTemplateSafeValueContainer, TemplateSafeValueContainer } from "../../templateFormatter";
+import { TemplateSafeValueContainer, createTypedTemplateSafeValueContainer } from "../../templateFormatter";
 import { UnknownUser } from "../../utils";
 import { isScalar } from "../../utils/isScalar";
 import {

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

@@ -1,7 +1,7 @@
 import { Snowflake, TextChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import z from "zod";
-import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import { zBoundedCharacters, zSnowflake } from "../../../utils";
 import { ActionError } from "../ActionError";
 import { catchTemplateError } from "../catchTemplateError";

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

@@ -2,7 +2,7 @@ import { Snowflake, VoiceChannel } from "discord.js";
 import { GuildPluginData } from "knub";
 import z from "zod";
 import { canActOn } from "../../../pluginUtils";
-import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import { resolveMember, zSnowflake } from "../../../utils";
 import { ActionError } from "../ActionError";
 import { catchTemplateError } from "../catchTemplateError";

backend/src/plugins/GuildAccessMonitor/GuildAccessMonitorPlugin.ts

@@ -1,5 +1,5 @@
 import { Guild } from "discord.js";
-import { BasePluginType, globalPlugin, GlobalPluginData, globalPluginEventListener } from "knub";
+import { BasePluginType, GlobalPluginData, globalPlugin, globalPluginEventListener } from "knub";
 import z from "zod";
 import { AllowedGuilds } from "../../data/AllowedGuilds";
 import { Configs } from "../../data/Configs";

backend/src/plugins/InternalPoster/InternalPosterPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import z from "zod";
 import { Queue } from "../../Queue";
 import { Webhooks } from "../../data/Webhooks";

backend/src/plugins/LocateUser/LocateUserPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { onGuildEvent } from "../../data/GuildEvents";
 import { GuildVCAlerts } from "../../data/GuildVCAlerts";
 import { FollowCmd } from "./commands/FollowCmd";

backend/src/plugins/LocateUser/commands/ListFollowCmd.ts

@@ -3,7 +3,6 @@ import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { createChunkedMessage, sorter } from "../../../utils";
 import { locateUserCmd } from "../types";
-import { TextChannel } from "discord.js";
 
 export const ListFollowCmd = locateUserCmd({
   trigger: ["follows", "fs"],
@@ -14,7 +13,7 @@ export const ListFollowCmd = locateUserCmd({
   async run({ message: msg, pluginData }) {
     const alerts = await pluginData.state.alerts.getAlertsByRequestorId(msg.member.id);
     if (alerts.length === 0) {
-      await sendErrorMessage(pluginData, msg.channel, "You have no active alerts!");
+      sendErrorMessage(pluginData, msg.channel, "You have no active alerts!");
       return;
     }
 
@@ -27,7 +26,7 @@ export const ListFollowCmd = locateUserCmd({
         alert.body
       }\` **Active:** ${alert.active.valueOf()}`;
     });
-    await createChunkedMessage(msg.channel as TextChannel, lines.join("\n"));
+    await createChunkedMessage(msg.channel, lines.join("\n"));
   },
 });
 

backend/src/plugins/Logs/LogsPlugin.ts

@@ -1,4 +1,4 @@
-import { CooldownManager, guildPlugin, PluginOptions } from "knub";
+import { CooldownManager, PluginOptions, guildPlugin } from "knub";
 import DefaultLogMessages from "../../data/DefaultLogMessages.json";
 import { GuildArchives } from "../../data/GuildArchives";
 import { GuildCases } from "../../data/GuildCases";

backend/src/plugins/Logs/util/log.ts

@@ -3,7 +3,7 @@ import { GuildPluginData } from "knub";
 import { allowTimeout } from "../../../RegExpRunner";
 import { LogType } from "../../../data/LogType";
 import { TypedTemplateSafeValueContainer } from "../../../templateFormatter";
-import { isDiscordAPIError, MINUTES, zSnowflake } from "../../../utils";
+import { MINUTES, isDiscordAPIError } from "../../../utils";
 import { MessageBuffer } from "../../../utils/MessageBuffer";
 import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin";
 import { ILogTypeData, LogsPluginType, TLogChannel, TLogChannelMap } from "../types";
@@ -28,11 +28,7 @@ async function shouldExclude(
   opts: TLogChannel,
   exclusionData: ExclusionData,
 ): Promise<boolean> {
-  if (
+  if (opts.excluded_users && exclusionData.userId && opts.excluded_users.includes(exclusionData.userId)) {
-    opts.excluded_users &&
-    exclusionData.userId &&
-    opts.excluded_users.includes(zSnowflake.parse(exclusionData.userId))
-  ) {
     return true;
   }
 
@@ -42,33 +38,21 @@ async function shouldExclude(
 
   if (opts.excluded_roles && exclusionData.roles) {
     for (const role of exclusionData.roles) {
-      if (opts.excluded_roles.includes(await zSnowflake.parseAsync(role))) {
+      if (opts.excluded_roles.includes(role)) {
         return true;
       }
     }
   }
 
-  if (
+  if (opts.excluded_channels && exclusionData.channel && opts.excluded_channels.includes(exclusionData.channel)) {
-    opts.excluded_channels &&
-    exclusionData.channel &&
-    opts.excluded_channels.includes(await zSnowflake.parseAsync(exclusionData.channel))
-  ) {
     return true;
   }
 
-  if (
+  if (opts.excluded_categories && exclusionData.category && opts.excluded_categories.includes(exclusionData.category)) {
-    opts.excluded_categories &&
-    exclusionData.category &&
-    opts.excluded_categories.includes(await zSnowflake.parseAsync(exclusionData.category))
-  ) {
     return true;
   }
 
-  if (
+  if (opts.excluded_threads && exclusionData.thread && opts.excluded_threads.includes(exclusionData.thread)) {
-    opts.excluded_threads &&
-    exclusionData.thread &&
-    opts.excluded_threads.includes(await zSnowflake.parseAsync(exclusionData.thread))
-  ) {
     return true;
   }
 
@@ -99,20 +83,20 @@ export async function log<TLogType extends keyof ILogTypeData>(
     const channel = pluginData.guild.channels.cache.get(channelId as Snowflake);
     if (!channel?.isTextBased()) continue;
     if (pluginData.state.channelCooldowns.isOnCooldown(channelId)) continue;
-    if (opts!.include?.length && !opts!.include.includes(typeStr)) continue;
+    if (opts.include?.length && !opts.include.includes(typeStr)) continue;
-    if (opts!.exclude && opts!.exclude.includes(typeStr)) continue;
+    if (opts.exclude && opts.exclude.includes(typeStr)) continue;
-    if (await shouldExclude(pluginData, opts!, exclusionData)) continue;
+    if (await shouldExclude(pluginData, opts, exclusionData)) continue;
 
     const message = await getLogMessage(pluginData, type, data, {
-      format: opts!.format,
+      format: opts.format,
-      include_embed_timestamp: opts!.include_embed_timestamp,
+      include_embed_timestamp: opts.include_embed_timestamp,
-      timestamp_format: opts!.timestamp_format,
+      timestamp_format: opts.timestamp_format,
     });
     if (!message) return;
 
     // Initialize message buffer for this channel
     if (!pluginData.state.buffers.has(channelId)) {
-      const batchTime = Math.min(Math.max(opts!.batch_time ?? DEFAULT_BATCH_TIME, MIN_BATCH_TIME), MAX_BATCH_TIME);
+      const batchTime = Math.min(Math.max(opts.batch_time ?? DEFAULT_BATCH_TIME, MIN_BATCH_TIME), MAX_BATCH_TIME);
       const internalPosterPlugin = pluginData.getPlugin(InternalPosterPlugin);
       pluginData.state.buffers.set(
         channelId,

backend/src/plugins/MessageSaver/MessageSaverPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { SaveMessagesToDBCmd } from "./commands/SaveMessagesToDB";
 import { SavePinsToDBCmd } from "./commands/SavePinsToDB";

backend/src/plugins/ModActions/ModActionsPlugin.ts

@@ -1,4 +1,5 @@
 import { Message } from "discord.js";
+import { EventEmitter } from "events";
 import { guildPlugin } from "knub";
 import { Queue } from "../../Queue";
 import { GuildCases } from "../../data/GuildCases";
@@ -47,7 +48,6 @@ import { onModActionsEvent } from "./functions/onModActionsEvent";
 import { updateCase } from "./functions/updateCase";
 import { warnMember } from "./functions/warnMember";
 import { ModActionsPluginType, zModActionsConfig } from "./types";
-import { EventEmitter } from "events";
 
 const defaultOptions = {
   config: {

backend/src/plugins/ModActions/commands/CasesModCmd.ts

@@ -1,7 +1,7 @@
 import { APIEmbed } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
-import { emptyEmbedValue, renderUsername, resolveMember, resolveUser, trimLines, UnknownUser } from "../../../utils";
+import { UnknownUser, emptyEmbedValue, renderUsername, resolveMember, resolveUser, trimLines } from "../../../utils";
 import { asyncMap } from "../../../utils/async";
 import { createPaginatedMessage } from "../../../utils/createPaginatedMessage";
 import { getGuildPrefix } from "../../../utils/getGuildPrefix";

backend/src/plugins/ModActions/commands/CasesUserCmd.ts

@@ -3,7 +3,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { CaseTypes } from "../../../data/CaseTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
 import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
-import { chunkArray, emptyEmbedValue, renderUsername, resolveMember, resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, chunkArray, emptyEmbedValue, renderUsername, resolveMember, resolveUser } from "../../../utils";
 import { asyncMap } from "../../../utils/async";
 import { createPaginatedMessage } from "../../../utils/createPaginatedMessage.js";
 import { getGuildPrefix } from "../../../utils/getGuildPrefix";

backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts

@@ -2,7 +2,7 @@ import { helpers } from "knub";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { Case } from "../../../data/entities/Case";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { renderUsername, SECONDS, trimLines } from "../../../utils";
+import { SECONDS, renderUsername, trimLines } from "../../../utils";
 import { CasesPlugin } from "../../Cases/CasesPlugin";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";

backend/src/plugins/ModActions/commands/MassBanCmd.ts

@@ -7,7 +7,7 @@ import { LogType } from "../../../data/LogType";
 import { humanizeDurationShort } from "../../../humanizeDurationShort";
 import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
-import { DAYS, MINUTES, noop, SECONDS } from "../../../utils";
+import { DAYS, MINUTES, SECONDS, noop } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments";
 import { ignoreEvent } from "../functions/ignoreEvent";

backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts

@@ -1,7 +1,7 @@
 import { AuditLogEvent, User } from "discord.js";
 import { CaseTypes } from "../../../data/CaseTypes";
 import { Case } from "../../../data/entities/Case";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry";
 import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { CasesPlugin } from "../../Cases/CasesPlugin";

backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts

@@ -2,7 +2,7 @@ import { AuditLogEvent, User } from "discord.js";
 import { CaseTypes } from "../../../data/CaseTypes";
 import { Case } from "../../../data/entities/Case";
 import { logger } from "../../../logger";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry";
 import { CasesPlugin } from "../../Cases/CasesPlugin";
 import { LogsPlugin } from "../../Logs/LogsPlugin";

backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts

@@ -1,7 +1,7 @@
 import { AuditLogEvent, User } from "discord.js";
 import { CaseTypes } from "../../../data/CaseTypes";
 import { Case } from "../../../data/entities/Case";
-import { resolveUser, UnknownUser } from "../../../utils";
+import { UnknownUser, resolveUser } from "../../../utils";
 import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry";
 import { CasesPlugin } from "../../Cases/CasesPlugin";
 import { LogsPlugin } from "../../Logs/LogsPlugin";

backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts

@@ -3,7 +3,7 @@ import { GuildPluginData } from "knub";
 import { hasPermission } from "knub/helpers";
 import { LogType } from "../../../data/LogType";
 import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { DAYS, errorMessage, renderUsername, resolveMember, resolveUser, SECONDS } from "../../../utils";
+import { DAYS, SECONDS, errorMessage, renderUsername, resolveMember, resolveUser } from "../../../utils";
 import { IgnoredEventType, ModActionsPluginType } from "../types";
 import { formatReasonWithAttachments } from "./formatReasonWithAttachments";
 import { ignoreEvent } from "./ignoreEvent";

backend/src/plugins/ModActions/functions/actualMuteUserCmd.ts

@@ -4,7 +4,7 @@ import { GuildPluginData } from "knub";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
 import { logger } from "../../../logger";
 import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { asSingleLine, isDiscordAPIError, renderUsername, UnknownUser } from "../../../utils";
+import { UnknownUser, asSingleLine, isDiscordAPIError, renderUsername } from "../../../utils";
 import { MutesPlugin } from "../../Mutes/MutesPlugin";
 import { MuteResult } from "../../Mutes/types";
 import { ModActionsPluginType } from "../types";

backend/src/plugins/ModActions/functions/actualUnmuteUserCmd.ts

@@ -3,7 +3,7 @@ import humanizeDuration from "humanize-duration";
 import { GuildPluginData } from "knub";
 import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin";
-import { asSingleLine, renderUsername, UnknownUser } from "../../../utils";
+import { UnknownUser, asSingleLine, renderUsername } from "../../../utils";
 import { ModActionsPluginType } from "../types";
 import { formatReasonWithAttachments } from "./formatReasonWithAttachments";
 

backend/src/plugins/ModActions/functions/banUserId.ts

@@ -5,16 +5,16 @@ import { CaseTypes } from "../../../data/CaseTypes";
 import { LogType } from "../../../data/LogType";
 import { registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop";
 import { logger } from "../../../logger";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import {
-  createUserNotificationError,
   DAYS,
+  SECONDS,
+  UserNotificationResult,
+  createUserNotificationError,
   notifyUser,
   resolveMember,
   resolveUser,
-  SECONDS,
   ucfirst,
-  UserNotificationResult,
 } from "../../../utils";
 import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { CasesPlugin } from "../../Cases/CasesPlugin";

backend/src/plugins/ModActions/functions/isBanned.ts

@@ -1,6 +1,6 @@
 import { PermissionsBitField, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
-import { isDiscordAPIError, isDiscordHTTPError, SECONDS, sleep } from "../../../utils";
+import { SECONDS, isDiscordAPIError, isDiscordHTTPError, sleep } from "../../../utils";
 import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { ModActionsPluginType } from "../types";

backend/src/plugins/ModActions/functions/warnMember.ts

@@ -1,8 +1,8 @@
 import { GuildMember, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { CaseTypes } from "../../../data/CaseTypes";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
-import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils";
+import { UserNotificationResult, createUserNotificationError, notifyUser, resolveUser, ucfirst } from "../../../utils";
 import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
 import { waitForButtonConfirm } from "../../../utils/waitForInteraction";
 import { CasesPlugin } from "../../Cases/CasesPlugin";

backend/src/plugins/Mutes/MutesPlugin.ts

@@ -1,4 +1,5 @@
 import { GuildMember, Snowflake } from "discord.js";
+import { EventEmitter } from "events";
 import { guildPlugin } from "knub";
 import { GuildArchives } from "../../data/GuildArchives";
 import { GuildCases } from "../../data/GuildCases";
@@ -23,7 +24,6 @@ import { onMutesEvent } from "./functions/onMutesEvent";
 import { renewTimeoutMute } from "./functions/renewTimeoutMute";
 import { unmuteUser } from "./functions/unmuteUser";
 import { MutesPluginType, zMutesConfig } from "./types";
-import { EventEmitter } from "events";
 
 const defaultOptions = {
   config: {

backend/src/plugins/Mutes/functions/muteUser.ts

@@ -9,15 +9,15 @@ import { Case } from "../../../data/entities/Case";
 import { Mute } from "../../../data/entities/Mute";
 import { registerExpiringMute } from "../../../data/loops/expiringMutesLoop";
 import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin";
-import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
 import {
+  UserNotificationMethod,
+  UserNotificationResult,
   noop,
   notifyUser,
   resolveMember,
   resolveUser,
   ucfirst,
-  UserNotificationMethod,
-  UserNotificationResult,
 } from "../../../utils";
 import { muteLock } from "../../../utils/lockNameHelpers";
 import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";

backend/src/plugins/NameHistory/NameHistoryPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { Queue } from "../../Queue";
 import { GuildNicknameHistory } from "../../data/GuildNicknameHistory";
 import { UsernameHistory } from "../../data/UsernameHistory";

backend/src/plugins/Persist/PersistPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildPersistedData } from "../../data/GuildPersistedData";
 import { LogsPlugin } from "../Logs/LogsPlugin";

backend/src/plugins/Persist/events/LoadDataEvt.ts

@@ -8,7 +8,7 @@ import { getMissingPermissions } from "../../../utils/getMissingPermissions";
 import { missingPermissionError } from "../../../utils/missingPermissionError";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { RoleManagerPlugin } from "../../RoleManager/RoleManagerPlugin";
-import { persistEvt, PersistPluginType } from "../types";
+import { PersistPluginType, persistEvt } from "../types";
 
 const p = PermissionFlagsBits;
 

backend/src/plugins/Phisherman/PhishermanPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { hasPhishermanMasterAPIKey, phishermanApiKeyIsValid } from "../../data/Phisherman";
 import { makePublicFn } from "../../pluginUtils";
 import { getDomainInfo } from "./functions/getDomainInfo";

backend/src/plugins/PingableRoles/PingableRolesPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildPingableRoles } from "../../data/GuildPingableRoles";
 import { PingableRoleDisableCmd } from "./commands/PingableRoleDisableCmd";
 import { PingableRoleEnableCmd } from "./commands/PingableRoleEnableCmd";

backend/src/plugins/Post/PostPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { onGuildEvent } from "../../data/GuildEvents";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";

backend/src/plugins/Post/commands/ScheduledPostsListCmd.ts

@@ -1,4 +1,4 @@
-import { escapeCodeBlock, TextChannel } from "discord.js";
+import { escapeCodeBlock } from "discord.js";
 import humanizeDuration from "humanize-duration";
 import moment from "moment-timezone";
 import { createChunkedMessage, DBDateFormat, deactivateMentions, sorter, trimLines } from "../../../utils";
@@ -58,6 +58,6 @@ export const ScheduledPostsListCmd = postCmd({
       Use \`scheduled_posts <num>\` to view a scheduled post in full
       Use \`scheduled_posts delete <num>\` to delete a scheduled post
     `);
-    createChunkedMessage(msg.channel as TextChannel, finalMessage);
+    createChunkedMessage(msg.channel, finalMessage);
   },
 });

backend/src/plugins/Post/util/actualPostCmd.ts

@@ -1,10 +1,10 @@
-import { GuildTextBasedChannel, Message, TextBasedChannelFields } from "discord.js";
+import { GuildTextBasedChannel, Message } from "discord.js";
 import humanizeDuration from "humanize-duration";
 import { GuildPluginData } from "knub";
 import moment from "moment-timezone";
 import { registerUpcomingScheduledPost } from "../../../data/loops/upcomingScheduledPostsLoop";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { DBDateFormat, errorMessage, MINUTES, renderUsername, StrictMessageContent } from "../../../utils";
+import { DBDateFormat, MINUTES, StrictMessageContent, errorMessage, renderUsername } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 import { PostPluginType } from "../types";
@@ -29,12 +29,12 @@ export async function actualPostCmd(
   } = {},
 ) {
   if (!targetChannel.isTextBased()) {
-    await (msg.channel as TextBasedChannelFields).send(errorMessage("Specified channel is not a text-based channel"));
+    msg.channel.send(errorMessage("Specified channel is not a text-based channel"));
     return;
   }
 
   if (content == null && msg.attachments.size === 0) {
-    await (msg.channel as TextBasedChannelFields).send(errorMessage("Message content or attachment required"));
+    msg.channel.send(errorMessage("Message content or attachment required"));
     return;
   }
 

backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { Queue } from "../../Queue";
 import { GuildReactionRoles } from "../../data/GuildReactionRoles";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";

backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts

@@ -3,7 +3,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { canUseEmoji, isDiscordAPIError, isValidEmoji, noop, trimPluginDescription } from "../../../utils";
 import { canReadChannel } from "../../../utils/canReadChannel";
-import { reactionRolesCmd, TReactionRolePair } from "../types";
+import { TReactionRolePair, reactionRolesCmd } from "../types";
 import { applyReactionRoleReactionsToMessage } from "../util/applyReactionRoleReactionsToMessage";
 
 const CLEAR_ROLES_EMOJI = "❌";

backend/src/plugins/Reminders/RemindersPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { onGuildEvent } from "../../data/GuildEvents";
 import { GuildReminders } from "../../data/GuildReminders";
 import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";

backend/src/plugins/Reminders/commands/RemindersCmd.ts

@@ -4,7 +4,6 @@ import { sendErrorMessage } from "../../../pluginUtils";
 import { createChunkedMessage, DBDateFormat, sorter } from "../../../utils";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 import { remindersCmd } from "../types";
-import { TextChannel } from "discord.js";
 
 export const RemindersCmd = remindersCmd({
   trigger: "reminders",
@@ -33,6 +32,6 @@ export const RemindersCmd = remindersCmd({
       return `\`${paddedNum}.\` \`${prettyRemindAt} (${result})\` ${reminder.body}`;
     });
 
-    await createChunkedMessage(msg.channel as TextChannel, lines.join("\n"));
+    createChunkedMessage(msg.channel, lines.join("\n"));
   },
 });

backend/src/plugins/Roles/RolesPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildLogs } from "../../data/GuildLogs";
 import { LogsPlugin } from "../Logs/LogsPlugin";
 import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin";

backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts

@@ -1,4 +1,4 @@
-import { CooldownManager, guildPlugin, PluginOptions } from "knub";
+import { CooldownManager, PluginOptions, guildPlugin } from "knub";
 import { RoleAddCmd } from "./commands/RoleAddCmd";
 import { RoleHelpCmd } from "./commands/RoleHelpCmd";
 import { RoleRemoveCmd } from "./commands/RoleRemoveCmd";

backend/src/plugins/Slowmode/SlowmodePlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { GuildSlowmodes } from "../../data/GuildSlowmodes";

backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts

@@ -1,4 +1,4 @@
-import { Message, TextBasedChannelFields } from "discord.js";
+import { Message } from "discord.js";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { noop } from "../../../utils";
 import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
@@ -26,7 +26,7 @@ export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) {
     return;
   }
 
-  const initMsg = await (msg.channel as TextBasedChannelFields).send("Disabling slowmode...");
+  const initMsg = await msg.channel.send("Disabling slowmode...");
 
   // Disable bot-maintained slowmode
   let failedUsers: string[] = [];

backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts

@@ -2,7 +2,7 @@ import { GuildTextBasedChannel, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
 import { LogType } from "../../../data/LogType";
 import { logger } from "../../../logger";
-import { isDiscordAPIError, UnknownUser, verboseChannelMention, verboseUserMention } from "../../../utils";
+import { UnknownUser, isDiscordAPIError, verboseChannelMention, verboseUserMention } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { SlowmodePluginType } from "../types";
 

backend/src/plugins/Spam/SpamPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildArchives } from "../../data/GuildArchives";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildMutes } from "../../data/GuildMutes";

backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts

@@ -9,7 +9,7 @@ import { logger } from "../../../logger";
 import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
 import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin";
 import { MuteResult } from "../../../plugins/Mutes/types";
-import { convertDelayStringToMS, DBDateFormat, noop, resolveMember, trimLines } from "../../../utils";
+import { DBDateFormat, convertDelayStringToMS, noop, resolveMember, trimLines } from "../../../utils";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { RecentActionType, SpamPluginType, TBaseSingleSpamConfig } from "../types";
 import { addRecentAction } from "./addRecentAction";

backend/src/plugins/Starboard/StarboardPlugin.ts

@@ -1,4 +1,4 @@
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { GuildStarboardMessages } from "../../data/GuildStarboardMessages";
 import { GuildStarboardReactions } from "../../data/GuildStarboardReactions";

backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts

@@ -1,6 +1,6 @@
 import { GuildChannel, Message } from "discord.js";
 import path from "path";
-import { EmbedWith, EMPTY_CHAR, renderUsername } from "../../../utils";
+import { EMPTY_CHAR, EmbedWith, renderUsername } from "../../../utils";
 
 const imageAttachmentExtensions = ["jpeg", "jpg", "png", "gif", "webp"];
 const audioAttachmentExtensions = ["wav", "mp3", "m4a"];

backend/src/plugins/Tags/TagsPlugin.ts

@@ -1,6 +1,6 @@
 import { Snowflake } from "discord.js";
 import humanizeDuration from "humanize-duration";
-import { guildPlugin, PluginOptions } from "knub";
+import { PluginOptions, guildPlugin } from "knub";
 import moment from "moment-timezone";
 import { GuildArchives } from "../../data/GuildArchives";
 import { GuildLogs } from "../../data/GuildLogs";

backend/src/plugins/Tags/commands/TagCreateCmd.ts

@@ -1,6 +1,6 @@
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { parseTemplate, TemplateParseError } from "../../../templateFormatter";
+import { TemplateParseError, parseTemplate } from "../../../templateFormatter";
 import { tagsCmd } from "../types";
 
 export const TagCreateCmd = tagsCmd({

backend/src/plugins/Tags/commands/TagListCmd.ts

@@ -2,7 +2,6 @@ import escapeStringRegexp from "escape-string-regexp";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { createChunkedMessage } from "../../../utils";
 import { tagsCmd } from "../types";
-import { TextChannel } from "discord.js";
 
 export const TagListCmd = tagsCmd({
   trigger: ["tag list", "tags", "taglist"],
@@ -47,6 +46,6 @@ export const TagListCmd = tagsCmd({
       .map((key) => `[${key}] ${tagGroups[key].join(", ")}`)
       .join("\n");
 
-    createChunkedMessage(msg.channel as TextChannel, `Available tags (use with ${prefix}tag): \`\`\`${tagList}\`\`\``);
+    createChunkedMessage(msg.channel, `Available tags (use with ${prefix}tag): \`\`\`${tagList}\`\`\``);
   },
 });

backend/src/plugins/Tags/util/findTagByName.ts

@@ -1,5 +1,5 @@
 import { ExtendedMatchParams, GuildPluginData } from "knub";
-import { TagsPluginType, TTag } from "../types";
+import { TTag, TagsPluginType } from "../types";
 
 export async function findTagByName(
   pluginData: GuildPluginData<TagsPluginType>,

backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts

@@ -2,7 +2,7 @@ import { GuildMember } from "discord.js";
 import escapeStringRegexp from "escape-string-regexp";
 import { ExtendedMatchParams, GuildPluginData } from "knub";
 import { StrictMessageContent } from "../../../utils";
-import { TagsPluginType, TTagCategory } from "../types";
+import { TTagCategory, TagsPluginType } from "../types";
 import { renderTagFromString } from "./renderTagFromString";
 
 interface BaseResult {

backend/src/plugins/Tags/util/renderTagBody.ts

@@ -1,7 +1,7 @@
 import { ExtendedMatchParams, GuildPluginData } from "knub";
-import { renderTemplate, TemplateSafeValue, TemplateSafeValueContainer } from "../../../templateFormatter";
+import { TemplateSafeValue, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter";
-import { renderRecursively, StrictMessageContent } from "../../../utils";
+import { StrictMessageContent, renderRecursively } from "../../../utils";
-import { TagsPluginType, TTag } from "../types";
+import { TTag, TagsPluginType } from "../types";
 import { findTagByName } from "./findTagByName";
 
 const MAX_TAG_FN_CALLS = 25;