Organise all imports, make Mutes depend on Logs

backend/src/RegExpRunner.ts

@@ -1,7 +1,7 @@
-import { RegExpWorker, TimeoutError } from "regexp-worker";
-import { CooldownManager } from "knub";
-import { MINUTES, SECONDS } from "./utils";
 import { EventEmitter } from "events";
+import { CooldownManager } from "knub";
+import { RegExpWorker, TimeoutError } from "regexp-worker";
+import { MINUTES, SECONDS } from "./utils";
 import Timeout = NodeJS.Timeout;
 
 const isTimeoutError = (a): a is TimeoutError => {

backend/src/api/archives.ts

@@ -1,7 +1,7 @@
 import express, { Request, Response } from "express";
+import moment from "moment-timezone";
 import { GuildArchives } from "../data/GuildArchives";
 import { notFound } from "./responses";
-import moment from "moment-timezone";
 
 export function initArchives(app: express.Express) {
   const archives = new GuildArchives(null);

backend/src/api/auth.ts

@@ -1,13 +1,13 @@
 import express, { Request, Response } from "express";
-import passport from "passport";
-import OAuth2Strategy from "passport-oauth2";
-import { Strategy as CustomStrategy } from "passport-custom";
-import { ApiLogins } from "../data/ApiLogins";
-import pick from "lodash.pick";
 import https from "https";
+import pick from "lodash.pick";
+import passport from "passport";
+import { Strategy as CustomStrategy } from "passport-custom";
+import OAuth2Strategy from "passport-oauth2";
+import { ApiLogins } from "../data/ApiLogins";
+import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
 import { ApiUserInfo } from "../data/ApiUserInfo";
 import { ApiUserInfoData } from "../data/entities/ApiUserInfo";
-import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
 import { ok } from "./responses";
 
 interface IPassportApiUser {

backend/src/api/docs.ts

@@ -1,7 +1,7 @@
 import express from "express";
 import { guildPlugins } from "../plugins/availablePlugins";
-import { notFound } from "./responses";
 import { indentLines } from "../utils";
+import { notFound } from "./responses";
 
 function formatConfigSchema(schema) {
   if (schema._tag === "InterfaceType" || schema._tag === "PartialType") {

backend/src/api/guilds.ts

@@ -1,13 +1,13 @@
-import express, { Request, Response } from "express";
-import { AllowedGuilds } from "../data/AllowedGuilds";
-import { clientError, ok, serverError, unauthorized } from "./responses";
-import { Configs } from "../data/Configs";
-import { validateGuildConfig } from "../configValidator";
-import yaml, { YAMLException } from "js-yaml";
-import { apiTokenAuthHandlers } from "./auth";
 import { ApiPermissions } from "@shared/apiPermissions";
-import { hasGuildPermission, requireGuildPermission } from "./permissions";
+import express, { Request, Response } from "express";
+import yaml, { YAMLException } from "js-yaml";
+import { validateGuildConfig } from "../configValidator";
+import { AllowedGuilds } from "../data/AllowedGuilds";
 import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
+import { Configs } from "../data/Configs";
+import { apiTokenAuthHandlers } from "./auth";
+import { hasGuildPermission, requireGuildPermission } from "./permissions";
+import { clientError, ok, serverError, unauthorized } from "./responses";
 
 const apiPermissionAssignments = new ApiPermissionAssignments();
 

backend/src/api/index.ts

@@ -1,8 +1,7 @@
+import { connect } from "../data/db";
+import { setIsAPI } from "../globals";
 import "./loadEnv";
 
-import { connect } from "../data/db";
-import path from "path";
-import { setIsAPI } from "../globals";
 
 if (!process.env.KEY) {
   // tslint:disable-next-line:no-console

backend/src/api/permissions.ts

@@ -1,7 +1,7 @@
 import { ApiPermissions, hasPermission, permissionArrToSet } from "@shared/apiPermissions";
-import { isStaff } from "../staff";
-import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
 import { Request, Response } from "express";
+import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
+import { isStaff } from "../staff";
 import { unauthorized } from "./responses";
 
 const apiPermissionAssignments = new ApiPermissionAssignments();

backend/src/api/staff.ts

@@ -1,6 +1,6 @@
 import express, { Request, Response } from "express";
-import { apiTokenAuthHandlers } from "./auth";
 import { isStaff } from "../staff";
+import { apiTokenAuthHandlers } from "./auth";
 
 export function initStaff(app: express.Express) {
   const staffRouter = express.Router();

backend/src/api/start.ts

@@ -1,11 +1,11 @@
-import { clientError, error, notFound } from "./responses";
-import express from "express";
 import cors from "cors";
-import { initAuth } from "./auth";
+import express from "express";
-import { initGuildsAPI } from "./guilds";
-import { initArchives } from "./archives";
-import { initDocs } from "./docs";
 import { TokenError } from "passport-oauth2";
+import { initArchives } from "./archives";
+import { initAuth } from "./auth";
+import { initDocs } from "./docs";
+import { initGuildsAPI } from "./guilds";
+import { clientError, error, notFound } from "./responses";
 
 const app = express();
 

backend/src/commandTypes.ts

@@ -1,21 +1,21 @@
-import {
+import { GuildChannel, GuildMember, User } from "discord.js";
-  channelMentionRegex,
+import { baseCommandParameterTypeHelpers, baseTypeConverters, CommandContext, TypeConversionError } from "knub";
-  convertDelayStringToMS,
-  disableCodeBlocks,
-  disableInlineCode,
-  isValidSnowflake,
-  resolveMember,
-  resolveUser,
-  resolveUserId,
-  roleMentionRegex,
-  UnknownUser,
-} from "./utils";
-import { baseTypeConverters, baseCommandParameterTypeHelpers, CommandContext, TypeConversionError } from "knub";
 import { createTypeHelper } from "knub-command-manager";
+import {
+    channelMentionRegex,
+    convertDelayStringToMS,
+    disableCodeBlocks,
+    disableInlineCode,
+    isValidSnowflake,
+    resolveMember,
+    resolveUser,
+    resolveUserId,
+    roleMentionRegex,
+    UnknownUser
+} from "./utils";
+import { isValidTimezone } from "./utils/isValidTimezone";
 import { MessageTarget, resolveMessageTarget } from "./utils/resolveMessageTarget";
 import { inputPatternToRegExp } from "./validatorUtils";
-import { isValidTimezone } from "./utils/isValidTimezone";
-import { GuildChannel, GuildMember, User } from "discord.js";
 
 export const commandTypes = {
   ...baseTypeConverters,

backend/src/configValidator.ts

@@ -1,10 +1,9 @@
-import * as t from "io-ts";
-import { guildPlugins } from "./plugins/availablePlugins";
-import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils";
-import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin";
-import { PartialZeppelinGuildConfigSchema, ZeppelinGuildConfig } from "./types";
 import { configUtils, ConfigValidationError, PluginOptions } from "knub";
 import moment from "moment-timezone";
+import { guildPlugins } from "./plugins/availablePlugins";
+import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin";
+import { PartialZeppelinGuildConfigSchema, ZeppelinGuildConfig } from "./types";
+import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils";
 
 const pluginNameToPlugin = new Map<string, ZeppelinPlugin>();
 for (const plugin of guildPlugins) {

backend/src/data/AllowedGuilds.ts

@@ -1,7 +1,7 @@
-import { AllowedGuild } from "./entities/AllowedGuild";
 import { getRepository, Repository } from "typeorm";
-import { BaseRepository } from "./BaseRepository";
 import { ApiPermissionTypes } from "./ApiPermissionAssignments";
+import { BaseRepository } from "./BaseRepository";
+import { AllowedGuild } from "./entities/AllowedGuild";
 
 export class AllowedGuilds extends BaseRepository {
   private allowedGuilds: Repository<AllowedGuild>;

backend/src/data/ApiLogins.ts

@@ -1,11 +1,11 @@
-import { getRepository, Repository } from "typeorm";
-import { ApiLogin } from "./entities/ApiLogin";
-import { BaseRepository } from "./BaseRepository";
 import crypto from "crypto";
 import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
 // tslint:disable-next-line:no-submodule-imports
 import uuidv4 from "uuid/v4";
 import { DAYS, DBDateFormat } from "../utils";
+import { BaseRepository } from "./BaseRepository";
+import { ApiLogin } from "./entities/ApiLogin";
 
 const LOGIN_EXPIRY_TIME = 1 * DAYS;
 

backend/src/data/ApiPermissionAssignments.ts

@@ -1,7 +1,7 @@
-import { getRepository, Repository } from "typeorm";
-import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment";
-import { BaseRepository } from "./BaseRepository";
 import { ApiPermissions } from "@shared/apiPermissions";
+import { getRepository, Repository } from "typeorm";
+import { BaseRepository } from "./BaseRepository";
+import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment";
 
 export enum ApiPermissionTypes {
   User = "USER",

backend/src/data/ApiUserInfo.ts

@@ -1,9 +1,9 @@
+import moment from "moment-timezone";
 import { getRepository, Repository } from "typeorm";
-import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
+import { DBDateFormat } from "../utils";
 import { BaseRepository } from "./BaseRepository";
 import { connection } from "./db";
-import moment from "moment-timezone";
+import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
-import { DBDateFormat } from "../utils";
 
 export class ApiUserInfo extends BaseRepository {
   private apiUserInfo: Repository<ApiUserInfoEntity>;

backend/src/data/Configs.ts

@@ -1,10 +1,10 @@
-import { Config } from "./entities/Config";
 import { getRepository, Repository } from "typeorm";
-import { connection } from "./db";
-import { BaseRepository } from "./BaseRepository";
 import { isAPI } from "../globals";
 import { HOURS, SECONDS } from "../utils";
+import { BaseRepository } from "./BaseRepository";
 import { cleanupConfigs } from "./cleanup/configs";
+import { connection } from "./db";
+import { Config } from "./entities/Config";
 
 if (isAPI()) {
   const CLEANUP_INTERVAL = 1 * HOURS;

backend/src/data/GuildAntiraidLevels.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { AntiraidLevel } from "./entities/AntiraidLevel";
 
 export class GuildAntiraidLevels extends BaseGuildRepository {

backend/src/data/GuildArchives.ts

@@ -1,11 +1,11 @@
-import moment from "moment-timezone";
-import { ArchiveEntry } from "./entities/ArchiveEntry";
-import { getRepository, Repository } from "typeorm";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { trimLines } from "../utils";
-import { SavedMessage } from "./entities/SavedMessage";
-import { renderTemplate } from "../templateFormatter";
 import { Guild } from "discord.js";
+import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
+import { renderTemplate } from "../templateFormatter";
+import { trimLines } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { ArchiveEntry } from "./entities/ArchiveEntry";
+import { SavedMessage } from "./entities/SavedMessage";
 
 const DEFAULT_EXPIRY_DAYS = 30;
 

backend/src/data/GuildAutoReactions.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { AutoReaction } from "./entities/AutoReaction";
 
 export class GuildAutoReactions extends BaseGuildRepository {

backend/src/data/GuildCases.ts

@@ -1,11 +1,10 @@
+import { getRepository, In, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { CaseTypes } from "./CaseTypes";
+import { connection } from "./db";
 import { Case } from "./entities/Case";
 import { CaseNote } from "./entities/CaseNote";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { getRepository, In, Repository } from "typeorm";
-import { DBDateFormat, disableLinkPreviews } from "../utils";
-import { CaseTypes } from "./CaseTypes";
 import moment = require("moment-timezone");
-import { connection } from "./db";
 
 const CASE_SUMMARY_REASON_MAX_LENGTH = 300;
 

backend/src/data/GuildCounters.ts

@@ -1,18 +1,18 @@
+import moment from "moment-timezone";
+import { FindConditions, getRepository, In, IsNull, Not, Repository } from "typeorm";
+import { Queue } from "../Queue";
+import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
-import { FindConditions, getRepository, In, IsNull, LessThan, Not, Repository } from "typeorm";
+import { connection } from "./db";
 import { Counter } from "./entities/Counter";
-import { CounterValue } from "./entities/CounterValue";
 import {
-  CounterTrigger,
+    CounterTrigger,
-  isValidCounterComparisonOp,
+    isValidCounterComparisonOp,
-  TRIGGER_COMPARISON_OPS,
+
-  TriggerComparisonOp,
+    TriggerComparisonOp
 } from "./entities/CounterTrigger";
 import { CounterTriggerState } from "./entities/CounterTriggerState";
-import moment from "moment-timezone";
+import { CounterValue } from "./entities/CounterValue";
-import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils";
-import { connection } from "./db";
-import { Queue } from "../Queue";
 
 const DELETE_UNUSED_COUNTERS_AFTER = 1 * DAYS;
 const DELETE_UNUSED_COUNTER_TRIGGERS_AFTER = 1 * DAYS;

backend/src/data/GuildEvents.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { QueuedEventEmitter } from "../QueuedEventEmitter";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 
 export class GuildEvents extends BaseGuildRepository {
   private queuedEventEmitter: QueuedEventEmitter;

backend/src/data/GuildMemberTimezones.ts

@@ -1,7 +1,7 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { MemberTimezone } from "./entities/MemberTimezone";
 import { getRepository, Repository } from "typeorm/index";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { connection } from "./db";
+import { MemberTimezone } from "./entities/MemberTimezone";
 
 export class GuildMemberTimezones extends BaseGuildRepository {
   protected memberTimezones: Repository<MemberTimezone>;

backend/src/data/GuildMutes.ts

@@ -1,7 +1,7 @@
 import moment from "moment-timezone";
-import { Mute } from "./entities/Mute";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { Brackets, getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { Mute } from "./entities/Mute";
 
 export class GuildMutes extends BaseGuildRepository {
   private mutes: Repository<Mute>;

backend/src/data/GuildNicknameHistory.ts

@@ -1,9 +1,9 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, In, Repository } from "typeorm";
-import { NicknameHistoryEntry } from "./entities/NicknameHistoryEntry";
-import { MINUTES, SECONDS } from "../utils";
 import { isAPI } from "../globals";
+import { MINUTES, SECONDS } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { cleanupNicknames } from "./cleanup/nicknames";
+import { NicknameHistoryEntry } from "./entities/NicknameHistoryEntry";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/GuildPersistedData.ts

@@ -1,6 +1,6 @@
-import { PersistedData } from "./entities/PersistedData";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { PersistedData } from "./entities/PersistedData";
 
 export interface IPartialPersistData {
   roles?: string[];

backend/src/data/GuildPingableRoles.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { PingableRole } from "./entities/PingableRole";
 
 export class GuildPingableRoles extends BaseGuildRepository {

backend/src/data/GuildReactionRoles.ts

@@ -1,6 +1,6 @@
-import { ReactionRole } from "./entities/ReactionRole";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { ReactionRole } from "./entities/ReactionRole";
 
 export class GuildReactionRoles extends BaseGuildRepository {
   private reactionRoles: Repository<ReactionRole>;

backend/src/data/GuildReminders.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { Reminder } from "./entities/Reminder";
 
 export class GuildReminders extends BaseGuildRepository {

backend/src/data/GuildSavedMessages.ts

@@ -1,12 +1,12 @@
-import { getRepository, Repository } from "typeorm";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage";
-import { QueuedEventEmitter } from "../QueuedEventEmitter";
-import moment from "moment-timezone";
-import { MINUTES, SECONDS } from "../utils";
-import { isAPI } from "../globals";
-import { cleanupMessages } from "./cleanup/messages";
 import { GuildChannel, Message } from "discord.js";
+import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
+import { isAPI } from "../globals";
+import { QueuedEventEmitter } from "../QueuedEventEmitter";
+import { MINUTES, SECONDS } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { cleanupMessages } from "./cleanup/messages";
+import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/GuildScheduledPosts.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { ScheduledPost } from "./entities/ScheduledPost";
 
 export class GuildScheduledPosts extends BaseGuildRepository {

backend/src/data/GuildSlowmodes.ts

@@ -1,8 +1,8 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
+import moment from "moment-timezone";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { SlowmodeChannel } from "./entities/SlowmodeChannel";
 import { SlowmodeUser } from "./entities/SlowmodeUser";
-import moment from "moment-timezone";
 
 export class GuildSlowmodes extends BaseGuildRepository {
   private slowmodeChannels: Repository<SlowmodeChannel>;

backend/src/data/GuildStarboardMessages.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StarboardMessage } from "./entities/StarboardMessage";
 
 export class GuildStarboardMessages extends BaseGuildRepository {

backend/src/data/GuildStarboardReactions.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StarboardReaction } from "./entities/StarboardReaction";
 
 export class GuildStarboardReactions extends BaseGuildRepository {

backend/src/data/GuildStats.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StatValue } from "./entities/StatValue";
 
 export class GuildStats extends BaseGuildRepository {

backend/src/data/GuildTags.ts

@@ -1,6 +1,6 @@
-import { Tag } from "./entities/Tag";
 import { getRepository, Repository } from "typeorm";
 import { BaseGuildRepository } from "./BaseGuildRepository";
+import { Tag } from "./entities/Tag";
 import { TagResponse } from "./entities/TagResponse";
 
 export class GuildTags extends BaseGuildRepository {

backend/src/data/GuildTempbans.ts

@@ -1,7 +1,6 @@
 import moment from "moment-timezone";
-import { Mute } from "./entities/Mute";
+import { getRepository, Repository } from "typeorm";
 import { BaseGuildRepository } from "./BaseGuildRepository";
-import { Brackets, getRepository, Repository } from "typeorm";
 import { Tempban } from "./entities/Tempban";
 
 export class GuildTempbans extends BaseGuildRepository {

backend/src/data/GuildVCAlerts.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { VCAlert } from "./entities/VCAlert";
 
 export class GuildVCAlerts extends BaseGuildRepository {

backend/src/data/Supporters.ts

@@ -1,5 +1,5 @@
-import { BaseRepository } from "./BaseRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseRepository } from "./BaseRepository";
 import { Supporter } from "./entities/Supporter";
 
 export class Supporters extends BaseRepository {

backend/src/data/UsernameHistory.ts

@@ -1,9 +1,9 @@
 import { getRepository, In, Repository } from "typeorm";
-import { UsernameHistoryEntry } from "./entities/UsernameHistoryEntry";
+import { isAPI } from "../globals";
 import { MINUTES, SECONDS } from "../utils";
 import { BaseRepository } from "./BaseRepository";
-import { isAPI } from "../globals";
 import { cleanupUsernames } from "./cleanup/usernames";
+import { UsernameHistoryEntry } from "./entities/UsernameHistoryEntry";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/cleanup/configs.ts

@@ -1,8 +1,8 @@
-import { connection } from "../db";
-import { getRepository, In } from "typeorm";
-import { Config } from "../entities/Config";
 import moment from "moment-timezone";
+import { getRepository, In } from "typeorm";
 import { DBDateFormat } from "../../utils";
+import { connection } from "../db";
+import { Config } from "../entities/Config";
 
 const CLEAN_PER_LOOP = 50;
 

backend/src/data/cleanup/messages.ts

@@ -1,8 +1,8 @@
-import { DAYS, DBDateFormat, MINUTES } from "../../utils";
-import { getRepository, In } from "typeorm";
-import { SavedMessage } from "../entities/SavedMessage";
 import moment from "moment-timezone";
+import { getRepository, In } from "typeorm";
+import { DAYS, DBDateFormat, MINUTES } from "../../utils";
 import { connection } from "../db";
+import { SavedMessage } from "../entities/SavedMessage";
 
 /**
  * How long message edits, deletions, etc. will include the original message content.

backend/src/data/cleanup/nicknames.ts

@@ -1,8 +1,8 @@
-import { getRepository, In } from "typeorm";
 import moment from "moment-timezone";
-import { NicknameHistoryEntry } from "../entities/NicknameHistoryEntry";
+import { getRepository, In } from "typeorm";
 import { DAYS, DBDateFormat } from "../../utils";
 import { connection } from "../db";
+import { NicknameHistoryEntry } from "../entities/NicknameHistoryEntry";
 
 export const NICKNAME_RETENTION_PERIOD = 30 * DAYS;
 const CLEAN_PER_LOOP = 500;

backend/src/data/cleanup/usernames.ts

@@ -1,8 +1,8 @@
-import { getRepository, In } from "typeorm";
 import moment from "moment-timezone";
-import { UsernameHistoryEntry } from "../entities/UsernameHistoryEntry";
+import { getRepository, In } from "typeorm";
 import { DAYS, DBDateFormat } from "../../utils";
 import { connection } from "../db";
+import { UsernameHistoryEntry } from "../entities/UsernameHistoryEntry";
 
 export const USERNAME_RETENTION_PERIOD = 30 * DAYS;
 const CLEAN_PER_LOOP = 500;

backend/src/data/db.ts

@@ -1,5 +1,5 @@
-import { SimpleError } from "../SimpleError";
 import { Connection, createConnection } from "typeorm";
+import { SimpleError } from "../SimpleError";
 
 let connectionPromise: Promise<Connection>;
 

backend/src/data/encryptedJsonTransformer.ts

@@ -1,5 +1,5 @@
-import { decrypt, encrypt } from "../utils/crypt";
 import { ValueTransformer } from "typeorm";
+import { decrypt, encrypt } from "../utils/crypt";
 
 interface EncryptedJsonTransformer<T> extends ValueTransformer {
   from(dbValue: any): T;

backend/src/data/encryptedTextTransformer.ts

@@ -1,5 +1,5 @@
-import { decrypt, encrypt } from "../utils/crypt";
 import { ValueTransformer } from "typeorm";
+import { decrypt, encrypt } from "../utils/crypt";
 
 interface EncryptedTextTransformer extends ValueTransformer {
   from(dbValue: any): string;

backend/src/data/getChannelIdFromMessageId.ts

@@ -1,5 +1,5 @@
+import { getRepository, Repository } from "typeorm";
 import { SavedMessage } from "./entities/SavedMessage";
-import { Repository, getRepository } from "typeorm";
 
 let repository: Repository<SavedMessage>;
 

backend/src/index.ts

@@ -1,29 +1,28 @@
-import "./loadEnv";
+import { Client, Intents, TextChannel } from "discord.js";
-
-import path from "path";
-import yaml from "js-yaml";
-
 import fs from "fs";
+import yaml from "js-yaml";
 import { Knub, PluginError } from "knub";
-import { SimpleError } from "./SimpleError";
+import { PluginLoadError } from "knub/dist/plugins/PluginLoadError";
-
-import { Configs } from "./data/Configs";
 // Always use UTC internally
 // This is also enforced for the database in data/db.ts
 import moment from "moment-timezone";
-import { connect } from "./data/db";
-import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availablePlugins";
-import { errorMessage, isDiscordHTTPError, isDiscordRESTError, MINUTES, successMessage } from "./utils";
-import { startUptimeCounter } from "./uptime";
 import { AllowedGuilds } from "./data/AllowedGuilds";
-import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types";
+import { Configs } from "./data/Configs";
-import { RecoverablePluginError } from "./RecoverablePluginError";
+import { connect } from "./data/db";
 import { GuildLogs } from "./data/GuildLogs";
 import { LogType } from "./data/LogType";
-import { logger } from "./logger";
-import { PluginLoadError } from "knub/dist/plugins/PluginLoadError";
 import { ErisError } from "./ErisError";
-import { Client, Intents, TextChannel } from "discord.js";
+import "./loadEnv";
+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, isDiscordHTTPError, isDiscordRESTError, successMessage } from "./utils";
+
+
+
 
 const fsp = fs.promises;
 

backend/src/migrateConfigsToDB.ts

@@ -1,8 +1,8 @@
 // tslint:disable:no-console
-import { connect } from "./data/db";
-import { Configs } from "./data/Configs";
-import path from "path";
 import * as _fs from "fs";
+import path from "path";
+import { Configs } from "./data/Configs";
+import { connect } from "./data/db";
 
 const fs = _fs.promises;
 

backend/src/migrations/1608692857722-FixStarboardReactionsIndices.ts

@@ -1,4 +1,4 @@
-import { MigrationInterface, QueryRunner, TableIndex, TableUnique } from "typeorm";
+import { MigrationInterface, QueryRunner, TableIndex } from "typeorm";
 
 export class FixStarboardReactionsIndices1608692857722 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<any> {

backend/src/pluginUtils.ts

@@ -2,18 +2,18 @@
  * @file Utility functions that are plugin-instance-specific (i.e. use PluginData)
  */
 
-import { CommandContext, configUtils, ConfigValidationError, GuildPluginData, helpers, PluginOptions } from "knub";
+import { GuildMember, Message, MessageMentionOptions, MessageOptions, TextChannel } from "discord.js";
-import { decodeAndValidateStrict, StrictValidationError, validate } from "./validatorUtils";
-import { deepKeyIntersect, errorMessage, successMessage, tDeepPartial, tNullable } from "./utils";
-import { TZeppelinKnub } from "./types";
-import { ExtendedMatchParams } from "knub/dist/config/PluginConfigManager"; // TODO: Export from Knub index
 import * as t from "io-ts";
+import { CommandContext, configUtils, ConfigValidationError, GuildPluginData, helpers, PluginOptions } from "knub";
 import { PluginOverrideCriteria } from "knub/dist/config/configTypes";
-import { Tail } from "./utils/typeUtils";
+import { ExtendedMatchParams } from "knub/dist/config/PluginConfigManager"; // TODO: Export from Knub index
 import { AnyPluginData } from "knub/dist/plugins/PluginData";
-import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin";
 import { logger } from "./logger";
-import { APIMessage, GuildMember, Message, MessageMentionOptions, MessageOptions, TextChannel, User } from "discord.js";
+import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin";
+import { TZeppelinKnub } from "./types";
+import { deepKeyIntersect, errorMessage, successMessage, tDeepPartial, tNullable } from "./utils";
+import { Tail } from "./utils/typeUtils";
+import { decodeAndValidateStrict, StrictValidationError, validate } from "./validatorUtils";
 
 const { getMemberLevel } = helpers;
 

backend/src/plugins/AutoDelete/AutoDeletePlugin.ts

@@ -1,13 +1,13 @@
 import { PluginOptions } from "knub";
-import { AutoDeletePluginType, ConfigSchema } from "./types";
-import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
-import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { GuildLogs } from "../../data/GuildLogs";
+import { GuildSavedMessages } from "../../data/GuildSavedMessages";
+import { LogsPlugin } from "../Logs/LogsPlugin";
+import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";
+import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
+import { AutoDeletePluginType, ConfigSchema } from "./types";
 import { onMessageCreate } from "./util/onMessageCreate";
 import { onMessageDelete } from "./util/onMessageDelete";
 import { onMessageDeleteBulk } from "./util/onMessageDeleteBulk";
-import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";
-import { LogsPlugin } from "../Logs/LogsPlugin";
 
 const defaultOptions: PluginOptions<AutoDeletePluginType> = {
   config: {

backend/src/plugins/AutoDelete/types.ts

@@ -1,9 +1,9 @@
 import * as t from "io-ts";
-import { BasePluginType, typedGuildCommand, typedGuildEventListener } from "knub";
+import { BasePluginType } from "knub";
-import { tDelayString, MINUTES } from "../../utils";
+import { SavedMessage } from "../../data/entities/SavedMessage";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
-import { SavedMessage } from "../../data/entities/SavedMessage";
+import { MINUTES, tDelayString } from "../../utils";
 import Timeout = NodeJS.Timeout;
 
 export const MAX_DELAY = 5 * MINUTES;

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

@@ -1,8 +1,8 @@
 import { GuildPluginData } from "knub";
-import { AutoDeletePluginType } from "../types";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
-import { scheduleNextDeletion } from "./scheduleNextDeletion";
 import { sorter } from "../../../utils";
+import { AutoDeletePluginType } from "../types";
+import { scheduleNextDeletion } from "./scheduleNextDeletion";
 
 export function addMessageToDeletionQueue(
   pluginData: GuildPluginData<AutoDeletePluginType>,

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

@@ -1,14 +1,14 @@
+import { Permissions, TextChannel } from "discord.js";
 import { GuildPluginData } from "knub";
-import { AutoDeletePluginType } from "../types";
 import moment from "moment-timezone";
 import { LogType } from "../../../data/LogType";
-import { resolveUser, stripObjectToScalars, verboseChannelMention } from "../../../utils";
 import { logger } from "../../../logger";
-import { scheduleNextDeletion } from "./scheduleNextDeletion";
+import { resolveUser, stripObjectToScalars, verboseChannelMention } from "../../../utils";
-import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions";
 import { LogsPlugin } from "../../Logs/LogsPlugin";
-import { Permissions, TextChannel } from "discord.js";
+import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
+import { AutoDeletePluginType } from "../types";
+import { scheduleNextDeletion } from "./scheduleNextDeletion";
 
 export async function deleteNextItem(pluginData: GuildPluginData<AutoDeletePluginType>) {
   const [itemToDelete] = pluginData.state.deletionQueue.splice(0, 1);

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

@@ -1,8 +1,8 @@
-import { AutoDeletePluginType, MAX_DELAY } from "../types";
 import { GuildPluginData } from "knub";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
-import { convertDelayStringToMS, resolveMember } from "../../../utils";
 import { LogType } from "../../../data/LogType";
+import { convertDelayStringToMS, resolveMember } from "../../../utils";
+import { AutoDeletePluginType, MAX_DELAY } from "../types";
 import { addMessageToDeletionQueue } from "./addMessageToDeletionQueue";
 
 export async function onMessageCreate(pluginData: GuildPluginData<AutoDeletePluginType>, msg: SavedMessage) {

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
-import { AutoDeletePluginType } from "../types";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
+import { AutoDeletePluginType } from "../types";
 import { scheduleNextDeletion } from "./scheduleNextDeletion";
 
 export function onMessageDelete(pluginData: GuildPluginData<AutoDeletePluginType>, msg: SavedMessage) {

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

@@ -1,6 +1,6 @@
-import { AutoDeletePluginType } from "../types";
 import { GuildPluginData } from "knub";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
+import { AutoDeletePluginType } from "../types";
 import { onMessageDelete } from "./onMessageDelete";
 
 export function onMessageDeleteBulk(pluginData: GuildPluginData<AutoDeletePluginType>, messages: SavedMessage[]) {

backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts

@@ -1,13 +1,13 @@
-import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
-import { AutoReactionsPluginType, ConfigSchema } from "./types";
 import { PluginOptions } from "knub";
-import { NewAutoReactionsCmd } from "./commands/NewAutoReactionsCmd";
-import { DisableAutoReactionsCmd } from "./commands/DisableAutoReactionsCmd";
-import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { GuildAutoReactions } from "../../data/GuildAutoReactions";
-import { AddReactionsEvt } from "./events/AddReactionsEvt";
+import { GuildSavedMessages } from "../../data/GuildSavedMessages";
 import { trimPluginDescription } from "../../utils";
 import { LogsPlugin } from "../Logs/LogsPlugin";
+import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
+import { DisableAutoReactionsCmd } from "./commands/DisableAutoReactionsCmd";
+import { NewAutoReactionsCmd } from "./commands/NewAutoReactionsCmd";
+import { AddReactionsEvt } from "./events/AddReactionsEvt";
+import { AutoReactionsPluginType, ConfigSchema } from "./types";
 
 const defaultOptions: PluginOptions<AutoReactionsPluginType> = {
   config: {

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

@@ -1,6 +1,6 @@
-import { autoReactionsCmd } from "../types";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { autoReactionsCmd } from "../types";
 
 export const DisableAutoReactionsCmd = autoReactionsCmd({
   trigger: "auto_reactions disable",

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

@@ -1,12 +1,12 @@
-import { autoReactionsCmd } from "../types";
-import { commandTypeHelpers as ct } from "../../../commandTypes";
-import { canUseEmoji, customEmojiRegex, isEmoji } from "../../../utils";
-import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
-
-import { readChannelPermissions } from "../../../utils/readChannelPermissions";
-import { missingPermissionError } from "../../../utils/missingPermissionError";
 import { GuildChannel, Permissions } from "discord.js";
+import { commandTypeHelpers as ct } from "../../../commandTypes";
+import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { canUseEmoji, customEmojiRegex, isEmoji } from "../../../utils";
+import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
+import { missingPermissionError } from "../../../utils/missingPermissionError";
+import { readChannelPermissions } from "../../../utils/readChannelPermissions";
+import { autoReactionsCmd } from "../types";
+
 
 const requiredPermissions = readChannelPermissions | Permissions.FLAGS.ADD_REACTIONS;
 

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

@@ -1,12 +1,12 @@
-import { autoReactionsEvt } from "../types";
-import { isDiscordRESTError } from "../../../utils";
-import { LogType } from "../../../data/LogType";
-import { LogsPlugin } from "../../Logs/LogsPlugin";
-
-import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
-import { readChannelPermissions } from "../../../utils/readChannelPermissions";
-import { missingPermissionError } from "../../../utils/missingPermissionError";
 import { GuildChannel, Permissions } from "discord.js";
+import { LogType } from "../../../data/LogType";
+import { isDiscordRESTError } from "../../../utils";
+import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions";
+import { missingPermissionError } from "../../../utils/missingPermissionError";
+import { readChannelPermissions } from "../../../utils/readChannelPermissions";
+import { LogsPlugin } from "../../Logs/LogsPlugin";
+import { autoReactionsEvt } from "../types";
+
 
 const p = Permissions.FLAGS;
 

backend/src/plugins/AutoReactions/types.ts

@@ -1,8 +1,8 @@
 import * as t from "io-ts";
 import { BasePluginType, typedGuildCommand, typedGuildEventListener } from "knub";
+import { GuildAutoReactions } from "../../data/GuildAutoReactions";
 import { GuildLogs } from "../../data/GuildLogs";
 import { GuildSavedMessages } from "../../data/GuildSavedMessages";
-import { GuildAutoReactions } from "../../data/GuildAutoReactions";
 
 export const ConfigSchema = t.type({
   can_manage: t.boolean,

backend/src/plugins/Automod/AutomodPlugin.ts

@@ -1,38 +1,35 @@
-import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
-import { AutomodPluginType, ConfigSchema } from "./types";
-import { RunAutomodOnJoinEvt } from "./events/RunAutomodOnJoinEvt";
-import { GuildLogs } from "../../data/GuildLogs";
-import { GuildSavedMessages } from "../../data/GuildSavedMessages";
-import { runAutomodOnMessage } from "./events/runAutomodOnMessage";
-import { Queue } from "../../Queue";
 import { configUtils, CooldownManager } from "knub";
-import { availableTriggers } from "./triggers/availableTriggers";
-import { StrictValidationError } from "../../validatorUtils";
 import { ConfigPreprocessorFn } from "knub/dist/config/configTypes";
-import { availableActions } from "./actions/availableActions";
-import { clearOldRecentActions } from "./functions/clearOldRecentActions";
-import { disableCodeBlocks, MINUTES, SECONDS } from "../../utils";
-import { clearOldRecentSpam } from "./functions/clearOldRecentSpam";
 import { GuildAntiraidLevels } from "../../data/GuildAntiraidLevels";
 import { GuildArchives } from "../../data/GuildArchives";
-import { clearOldRecentNicknameChanges } from "./functions/clearOldNicknameChanges";
+import { GuildLogs } from "../../data/GuildLogs";
+import { GuildSavedMessages } from "../../data/GuildSavedMessages";
+import { Queue } from "../../Queue";
+import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners";
+import { MINUTES, SECONDS } from "../../utils";
+import { registerEventListenersFromMap } from "../../utils/registerEventListenersFromMap";
+import { unregisterEventListenersFromMap } from "../../utils/unregisterEventListenersFromMap";
+import { StrictValidationError } from "../../validatorUtils";
+import { CountersPlugin } from "../Counters/CountersPlugin";
 import { LogsPlugin } from "../Logs/LogsPlugin";
 import { ModActionsPlugin } from "../ModActions/ModActionsPlugin";
 import { MutesPlugin } from "../Mutes/MutesPlugin";
+import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
+import { availableActions } from "./actions/availableActions";
 import { AntiraidClearCmd } from "./commands/AntiraidClearCmd";
 import { SetAntiraidCmd } from "./commands/SetAntiraidCmd";
 import { ViewAntiraidCmd } from "./commands/ViewAntiraidCmd";
-import { pluginInfo } from "./info";
-import { RegExpRunner } from "../../RegExpRunner";
-import { LogType } from "../../data/LogType";
-import { logger } from "../../logger";
-import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners";
-import { RunAutomodOnMemberUpdate } from "./events/RunAutomodOnMemberUpdate";
-import { CountersPlugin } from "../Counters/CountersPlugin";
 import { runAutomodOnCounterTrigger } from "./events/runAutomodOnCounterTrigger";
+import { RunAutomodOnJoinEvt } from "./events/RunAutomodOnJoinEvt";
+import { RunAutomodOnMemberUpdate } from "./events/RunAutomodOnMemberUpdate";
+import { runAutomodOnMessage } from "./events/runAutomodOnMessage";
 import { runAutomodOnModAction } from "./events/runAutomodOnModAction";
-import { registerEventListenersFromMap } from "../../utils/registerEventListenersFromMap";
+import { clearOldRecentNicknameChanges } from "./functions/clearOldNicknameChanges";
-import { unregisterEventListenersFromMap } from "../../utils/unregisterEventListenersFromMap";
+import { clearOldRecentActions } from "./functions/clearOldRecentActions";
+import { clearOldRecentSpam } from "./functions/clearOldRecentSpam";
+import { pluginInfo } from "./info";
+import { availableTriggers } from "./triggers/availableTriggers";
+import { AutomodPluginType, ConfigSchema } from "./types";
 
 const defaultOptions = {
   config: {

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

@@ -1,7 +1,7 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { CountersPlugin } from "../../Counters/CountersPlugin";
 import { LogType } from "../../../data/LogType";
+import { CountersPlugin } from "../../Counters/CountersPlugin";
+import { automodAction } from "../helpers";
 
 export const AddToCounterAction = automodAction({
   configType: t.type({

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

@@ -1,18 +1,18 @@
-import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { LogType } from "../../../data/LogType";
-import {
-  createChunkedMessage,
-  messageLink,
-  stripObjectToScalars,
-  tAllowedMentions,
-  tNormalizedNullOptional,
-  verboseChannelMention,
-} from "../../../utils";
-import { renderTemplate, TemplateParseError } from "../../../templateFormatter";
-import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { TextChannel } from "discord.js";
+import * as t from "io-ts";
 import { erisAllowedMentionsToDjsMentionOptions } from "src/utils/erisAllowedMentionsToDjsMentionOptions";
+import { LogType } from "../../../data/LogType";
+import { renderTemplate, TemplateParseError } from "../../../templateFormatter";
+import {
+    createChunkedMessage,
+    messageLink,
+    stripObjectToScalars,
+    tAllowedMentions,
+    tNormalizedNullOptional,
+    verboseChannelMention
+} from "../../../utils";
+import { LogsPlugin } from "../../Logs/LogsPlugin";
+import { automodAction } from "../helpers";
 
 export const AlertAction = automodAction({
   configType: t.type({

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

@@ -1,20 +1,20 @@
 import * as t from "io-ts";
-import { CleanAction } from "./clean";
 import { AutomodActionBlueprint } from "../helpers";
-import { WarnAction } from "./warn";
-import { MuteAction } from "./mute";
-import { KickAction } from "./kick";
-import { BanAction } from "./ban";
-import { AlertAction } from "./alert";
-import { ChangeNicknameAction } from "./changeNickname";
-import { LogAction } from "./log";
 import { AddRolesAction } from "./addRoles";
-import { RemoveRolesAction } from "./removeRoles";
-import { SetAntiraidLevelAction } from "./setAntiraidLevel";
-import { ReplyAction } from "./reply";
 import { AddToCounterAction } from "./addToCounter";
+import { AlertAction } from "./alert";
+import { BanAction } from "./ban";
+import { ChangeNicknameAction } from "./changeNickname";
+import { CleanAction } from "./clean";
+import { KickAction } from "./kick";
+import { LogAction } from "./log";
+import { MuteAction } from "./mute";
+import { RemoveRolesAction } from "./removeRoles";
+import { ReplyAction } from "./reply";
+import { SetAntiraidLevelAction } from "./setAntiraidLevel";
 import { SetCounterAction } from "./setCounter";
 import { SetSlowmodeAction } from "./setSlowmode";
+import { WarnAction } from "./warn";
 
 export const availableActions: Record<string, AutomodActionBlueprint<any>> = {
   clean: CleanAction,

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

@@ -1,18 +1,16 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { LogType } from "../../../data/LogType";
 import {
-  asyncMap,
+    convertDelayStringToMS,
-  convertDelayStringToMS,
+    nonNullish,
-  nonNullish,
+
-  resolveMember,
+    tDelayString,
-  tDelayString,
+    tNullable,
-  tNullable,
+    unique
-  unique,
 } from "../../../utils";
-import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
-import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
 import { CaseArgs } from "../../Cases/types";
+import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
+import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
+import { automodAction } from "../helpers";
 
 export const BanAction = automodAction({
   configType: t.type({

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

@@ -1,8 +1,8 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
 import { LogType } from "../../../data/LogType";
-import { LogsPlugin } from "../../Logs/LogsPlugin";
 import { nonNullish, unique } from "../../../utils";
+import { LogsPlugin } from "../../Logs/LogsPlugin";
+import { automodAction } from "../helpers";
 
 export const ChangeNicknameAction = automodAction({
   configType: t.union([

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

@@ -1,8 +1,8 @@
+import { TextChannel } from "discord.js";
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
 import { LogType } from "../../../data/LogType";
 import { noop } from "../../../utils";
-import { TextChannel } from "discord.js";
+import { automodAction } from "../helpers";
 
 export const CleanAction = automodAction({
   configType: t.boolean,

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

@@ -1,10 +1,9 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { LogType } from "../../../data/LogType";
 import { asyncMap, nonNullish, resolveMember, tNullable, unique } from "../../../utils";
-import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
-import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
 import { CaseArgs } from "../../Cases/types";
+import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
+import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
+import { automodAction } from "../helpers";
 
 export const KickAction = automodAction({
   configType: t.type({

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

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

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

@@ -1,21 +1,19 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
 import { LogType } from "../../../data/LogType";
-import {
-  asyncMap,
-  convertDelayStringToMS,
-  nonNullish,
-  resolveMember,
-  tDelayString,
-  tNullable,
-  unique,
-} from "../../../utils";
-import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
-import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
-import { MutesPlugin } from "../../Mutes/MutesPlugin";
 import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
-import { LogsPlugin } from "../../Logs/LogsPlugin";
+import {
+    convertDelayStringToMS,
+    nonNullish,
+
+    tDelayString,
+    tNullable,
+    unique
+} from "../../../utils";
 import { CaseArgs } from "../../Cases/types";
+import { LogsPlugin } from "../../Logs/LogsPlugin";
+import { MutesPlugin } from "../../Mutes/MutesPlugin";
+import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
+import { automodAction } from "../helpers";
 
 export const MuteAction = automodAction({
   configType: t.type({

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

@@ -1,17 +1,15 @@
-import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { LogType } from "../../../data/LogType";
-import { asyncMap, nonNullish, resolveMember, tNullable, unique } from "../../../utils";
-import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
-import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
-import { getMissingPermissions } from "../../../utils/getMissingPermissions";
-import { LogsPlugin } from "../../Logs/LogsPlugin";
-import { missingPermissionError } from "../../../utils/missingPermissionError";
-import { canAssignRole } from "../../../utils/canAssignRole";
-
-import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
-import { memberRolesLock } from "../../../utils/lockNameHelpers";
 import { Permissions } 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";
+import { memberRolesLock } from "../../../utils/lockNameHelpers";
+import { missingPermissionError } from "../../../utils/missingPermissionError";
+import { LogsPlugin } from "../../Logs/LogsPlugin";
+import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
+import { automodAction } from "../helpers";
+
 
 const p = Permissions.FLAGS;
 

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

@@ -1,23 +1,23 @@
+import { MessageOptions, Permissions, TextChannel, User } from "discord.js";
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import {
-  convertDelayStringToMS,
-  noop,
-  renderRecursively,
-  StrictMessageContent,
-  stripObjectToScalars,
-  tDelayString,
-  tMessageContent,
-  tNullable,
-  unique,
-  verboseChannelMention,
-} from "../../../utils";
-
-import { AutomodContext } from "../types";
-import { renderTemplate } from "../../../templateFormatter";
-import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions";
 import { LogType } from "../../../data/LogType";
-import { TextChannel, User, Constants, MessageOptions, Permissions } from "discord.js";
+import { renderTemplate } from "../../../templateFormatter";
+import {
+    convertDelayStringToMS,
+    noop,
+    renderRecursively,
+
+    stripObjectToScalars,
+    tDelayString,
+    tMessageContent,
+    tNullable,
+    unique,
+    verboseChannelMention
+} from "../../../utils";
+import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions";
+import { automodAction } from "../helpers";
+import { AutomodContext } from "../types";
+
 
 export const ReplyAction = automodAction({
   configType: t.union([

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

@@ -1,7 +1,7 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { setAntiraidLevel } from "../functions/setAntiraidLevel";
 import { tNullable } from "../../../utils";
+import { setAntiraidLevel } from "../functions/setAntiraidLevel";
+import { automodAction } from "../helpers";
 
 export const SetAntiraidLevelAction = automodAction({
   configType: tNullable(t.string),

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

@@ -1,7 +1,7 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { CountersPlugin } from "../../Counters/CountersPlugin";
 import { LogType } from "../../../data/LogType";
+import { CountersPlugin } from "../../Counters/CountersPlugin";
+import { automodAction } from "../helpers";
 
 export const SetCounterAction = automodAction({
   configType: t.type({

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

@@ -1,9 +1,9 @@
+import { TextChannel } from "discord.js";
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { convertDelayStringToMS, isDiscordRESTError, tDelayString, tNullable } from "../../../utils";
-import { LogType } from "../../../data/LogType";
-import { Constants, TextChannel } from "discord.js";
 import { ChannelTypeStrings } from "src/types";
+import { LogType } from "../../../data/LogType";
+import { convertDelayStringToMS, isDiscordRESTError, tDelayString, tNullable } from "../../../utils";
+import { automodAction } from "../helpers";
 
 export const SetSlowmodeAction = automodAction({
   configType: t.type({

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

@@ -1,10 +1,9 @@
 import * as t from "io-ts";
-import { automodAction } from "../helpers";
-import { LogType } from "../../../data/LogType";
 import { asyncMap, nonNullish, resolveMember, tNullable, unique } from "../../../utils";
-import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
-import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
 import { CaseArgs } from "../../Cases/types";
+import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
+import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
+import { automodAction } from "../helpers";
 
 export const WarnAction = automodAction({
   configType: t.type({

backend/src/plugins/Automod/commands/AntiraidClearCmd.ts

@@ -1,7 +1,7 @@
-import { typedGuildCommand, GuildPluginData } from "knub";
+import { typedGuildCommand } from "knub";
-import { AutomodPluginType } from "../types";
-import { setAntiraidLevel } from "../functions/setAntiraidLevel";
 import { sendSuccessMessage } from "../../../pluginUtils";
+import { setAntiraidLevel } from "../functions/setAntiraidLevel";
+import { AutomodPluginType } from "../types";
 
 export const AntiraidClearCmd = typedGuildCommand<AutomodPluginType>()({
   trigger: ["antiraid clear", "antiraid reset", "antiraid none", "antiraid off"],

backend/src/plugins/Automod/commands/SetAntiraidCmd.ts

@@ -1,8 +1,8 @@
-import { typedGuildCommand, GuildPluginData } from "knub";
+import { typedGuildCommand } from "knub";
-import { AutomodPluginType } from "../types";
-import { setAntiraidLevel } from "../functions/setAntiraidLevel";
-import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
+import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
+import { setAntiraidLevel } from "../functions/setAntiraidLevel";
+import { AutomodPluginType } from "../types";
 
 export const SetAntiraidCmd = typedGuildCommand<AutomodPluginType>()({
   trigger: "antiraid",

backend/src/plugins/Automod/commands/ViewAntiraidCmd.ts

@@ -1,8 +1,5 @@
-import { typedGuildCommand, GuildPluginData } from "knub";
+import { typedGuildCommand } from "knub";
 import { AutomodPluginType } from "../types";
-import { setAntiraidLevel } from "../functions/setAntiraidLevel";
-import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
-import { commandTypeHelpers as ct } from "../../../commandTypes";
 
 export const ViewAntiraidCmd = typedGuildCommand<AutomodPluginType>()({
   trigger: "antiraid",

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

@@ -1,7 +1,7 @@
 import { typedGuildEventListener } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { runAutomod } from "../functions/runAutomod";
 import { RecentActionType } from "../constants";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export const RunAutomodOnJoinEvt = typedGuildEventListener<AutomodPluginType>()({
   event: "guildMemberAdd",

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

@@ -1,9 +1,8 @@
 import { typedGuildEventListener } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { RecentActionType } from "../constants";
-import { runAutomod } from "../functions/runAutomod";
-import isEqual from "lodash.isequal";
 import diff from "lodash.difference";
+import isEqual from "lodash.isequal";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export const RunAutomodOnMemberUpdate = typedGuildEventListener<AutomodPluginType>()({
   event: "guildMemberUpdate",

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

@@ -1,7 +1,7 @@
-import { GuildPluginData } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { runAutomod } from "../functions/runAutomod";
 import { User } from "discord.js";
+import { GuildPluginData } from "knub";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export async function runAutomodOnAntiraidLevel(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,8 +1,8 @@
 import { GuildPluginData } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { runAutomod } from "../functions/runAutomod";
 import { resolveMember, resolveUser, UnknownUser } from "../../../utils";
 import { CountersPlugin } from "../../Counters/CountersPlugin";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export async function runAutomodOnCounterTrigger(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,10 +1,10 @@
-import { SavedMessage } from "../../../data/entities/SavedMessage";
 import { GuildPluginData } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { runAutomod } from "../functions/runAutomod";
-import { addRecentActionsFromMessage } from "../functions/addRecentActionsFromMessage";
 import moment from "moment-timezone";
+import { SavedMessage } from "../../../data/entities/SavedMessage";
+import { addRecentActionsFromMessage } from "../functions/addRecentActionsFromMessage";
 import { clearRecentActionsForMessage } from "../functions/clearRecentActionsForMessage";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export function runAutomodOnMessage(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,8 +1,8 @@
 import { GuildPluginData } from "knub";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { runAutomod } from "../functions/runAutomod";
 import { resolveMember, resolveUser, UnknownUser } from "../../../utils";
 import { ModActionType } from "../../ModActions/types";
+import { runAutomod } from "../functions/runAutomod";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export async function runAutomodOnModAction(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,7 +1,7 @@
-import { AutomodContext, AutomodPluginType } from "../types";
 import { GuildPluginData } from "knub";
-import { RECENT_ACTION_EXPIRY_TIME, RecentActionType } from "../constants";
 import { getEmojiInString, getRoleMentions, getUrlsInString, getUserMentions } from "../../../utils";
+import { RecentActionType, RECENT_ACTION_EXPIRY_TIME } from "../constants";
+import { AutomodContext, AutomodPluginType } from "../types";
 
 export function addRecentActionsFromMessage(pluginData: GuildPluginData<AutomodPluginType>, context: AutomodContext) {
   const message = context.message!;

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

@@ -1,7 +1,6 @@
-import { AutomodContext, AutomodPluginType, TRule } from "../types";
 import { GuildPluginData } from "knub";
-import { AutomodTriggerMatchResult } from "../helpers";
 import { convertDelayStringToMS } from "../../../utils";
+import { AutomodContext, AutomodPluginType, TRule } from "../types";
 
 export function checkAndUpdateCooldown(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
+import { RECENT_NICKNAME_CHANGE_EXPIRY_TIME } from "../constants";
 import { AutomodPluginType } from "../types";
-import { RECENT_NICKNAME_CHANGE_EXPIRY_TIME, RECENT_SPAM_EXPIRY_TIME } from "../constants";
 
 export function clearOldRecentNicknameChanges(pluginData: GuildPluginData<AutomodPluginType>) {
   const now = Date.now();

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
-import { AutomodPluginType } from "../types";
 import { RECENT_ACTION_EXPIRY_TIME } from "../constants";
+import { AutomodPluginType } from "../types";
 
 export function clearOldRecentActions(pluginData: GuildPluginData<AutomodPluginType>) {
   const now = Date.now();

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
-import { AutomodPluginType } from "../types";
 import { RECENT_SPAM_EXPIRY_TIME } from "../constants";
+import { AutomodPluginType } from "../types";
 
 export function clearOldRecentSpam(pluginData: GuildPluginData<AutomodPluginType>) {
   const now = Date.now();

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

@@ -1,7 +1,5 @@
-import { AutomodContext, AutomodPluginType } from "../types";
 import { GuildPluginData } from "knub";
-import { RECENT_ACTION_EXPIRY_TIME, RecentActionType } from "../constants";
+import { AutomodContext, AutomodPluginType } from "../types";
-import { getEmojiInString, getRoleMentions, getUrlsInString, getUserMentions } from "../../../utils";
 
 export function clearRecentActionsForMessage(pluginData: GuildPluginData<AutomodPluginType>, context: AutomodContext) {
   const message = context.message!;

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

@@ -1,13 +1,13 @@
-import { RecentActionType } from "../constants";
+import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
+import { SavedMessage } from "../../../data/entities/SavedMessage";
+import { humanizeDurationShort } from "../../../humanizeDurationShort";
 import { getBaseUrl } from "../../../pluginUtils";
 import { convertDelayStringToMS, sorter, tDelayString, tNullable } from "../../../utils";
-import { humanizeDurationShort } from "../../../humanizeDurationShort";
+import { RecentActionType } from "../constants";
+import { automodTrigger } from "../helpers";
 import { findRecentSpam } from "./findRecentSpam";
 import { getMatchingMessageRecentActions } from "./getMatchingMessageRecentActions";
-import * as t from "io-ts";
 import { getMessageSpamIdentifier } from "./getSpamIdentifier";
-import { SavedMessage } from "../../../data/entities/SavedMessage";
 
 const MessageSpamTriggerConfig = t.type({
   amount: t.number,

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
-import { AutomodPluginType } from "../types";
 import { RecentActionType } from "../constants";
+import { AutomodPluginType } from "../types";
 
 export function findRecentSpam(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,9 +1,9 @@
 import { GuildPluginData } from "knub";
-import { AutomodPluginType } from "../types";
-import { SavedMessage } from "../../../data/entities/SavedMessage";
 import moment from "moment-timezone";
-import { getMatchingRecentActions } from "./getMatchingRecentActions";
+import { SavedMessage } from "../../../data/entities/SavedMessage";
 import { RecentActionType } from "../constants";
+import { AutomodPluginType } from "../types";
+import { getMatchingRecentActions } from "./getMatchingRecentActions";
 
 export function getMatchingMessageRecentActions(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,6 +1,6 @@
 import { GuildPluginData } from "knub";
-import { AutomodPluginType } from "../types";
 import { RecentActionType } from "../constants";
+import { AutomodPluginType } from "../types";
 
 export function getMatchingRecentActions(
   pluginData: GuildPluginData<AutomodPluginType>,

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

@@ -1,7 +1,7 @@
-import { MatchableTextType } from "./matchMultipleTextTypesOnMessage";
-import { AutomodContext, AutomodPluginType } from "../types";
-import { messageSummary, verboseChannelMention } from "../../../utils";
 import { GuildPluginData } from "knub";
+import { messageSummary, verboseChannelMention } from "../../../utils";
+import { AutomodContext, AutomodPluginType } from "../types";
+import { MatchableTextType } from "./matchMultipleTextTypesOnMessage";
 
 export function getTextMatchPartialSummary(
   pluginData: GuildPluginData<AutomodPluginType>,