diff --git a/backend/src/api/auth.ts b/backend/src/api/auth.ts index ca947d8c..9bb6e3f1 100644 --- a/backend/src/api/auth.ts +++ b/backend/src/api/auth.ts @@ -8,8 +8,8 @@ import { ApiLogins } from "../data/ApiLogins"; import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments"; import { ApiUserInfo } from "../data/ApiUserInfo"; import { ApiUserInfoData } from "../data/entities/ApiUserInfo"; -import { ok } from "./responses"; import { env } from "../env"; +import { ok } from "./responses"; interface IPassportApiUser { apiKey: string; diff --git a/backend/src/api/guilds.ts b/backend/src/api/guilds.ts index 0706b4be..c85f5b1e 100644 --- a/backend/src/api/guilds.ts +++ b/backend/src/api/guilds.ts @@ -1,20 +1,20 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; import { YAMLException } from "js-yaml"; +import moment from "moment-timezone"; import { validateGuildConfig } from "../configValidator"; import { AllowedGuilds } from "../data/AllowedGuilds"; +import { ApiAuditLog } from "../data/ApiAuditLog"; +import { AuditLogEventTypes } from "../data/apiAuditLogTypes"; import { ApiPermissionAssignments, ApiPermissionTypes } from "../data/ApiPermissionAssignments"; import { Configs } from "../data/Configs"; +import { Queue } from "../Queue"; +import { isSnowflake } from "../utils"; +import { loadYamlSafely } from "../utils/loadYamlSafely"; +import { ObjectAliasError } from "../utils/validateNoObjectAliases"; import { apiTokenAuthHandlers } from "./auth"; import { hasGuildPermission, requireGuildPermission } from "./permissions"; import { clientError, ok, serverError, unauthorized } from "./responses"; -import { loadYamlSafely } from "../utils/loadYamlSafely"; -import { ObjectAliasError } from "../utils/validateNoObjectAliases"; -import { isSnowflake } from "../utils"; -import moment from "moment-timezone"; -import { ApiAuditLog } from "../data/ApiAuditLog"; -import { AuditLogEventTypes } from "../data/apiAuditLogTypes"; -import { Queue } from "../Queue"; const apiPermissionAssignments = new ApiPermissionAssignments(); const auditLog = new ApiAuditLog(); diff --git a/backend/src/api/guilds/importExport.ts b/backend/src/api/guilds/importExport.ts index 8bb46748..9e91f4af 100644 --- a/backend/src/api/guilds/importExport.ts +++ b/backend/src/api/guilds/importExport.ts @@ -1,13 +1,13 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; -import { requireGuildPermission } from "../permissions"; -import { clientError, ok } from "../responses"; -import { GuildCases } from "../../data/GuildCases"; +import moment from "moment-timezone"; import { z } from "zod"; import { Case } from "../../data/entities/Case"; -import { rateLimit } from "../rateLimits"; +import { GuildCases } from "../../data/GuildCases"; import { MINUTES } from "../../utils"; -import moment from "moment-timezone"; +import { requireGuildPermission } from "../permissions"; +import { rateLimit } from "../rateLimits"; +import { clientError, ok } from "../responses"; const caseHandlingModeSchema = z.union([ z.literal("replace"), diff --git a/backend/src/api/guilds/index.ts b/backend/src/api/guilds/index.ts index 36fe4383..1f37aca8 100644 --- a/backend/src/api/guilds/index.ts +++ b/backend/src/api/guilds/index.ts @@ -1,7 +1,7 @@ import express from "express"; import { apiTokenAuthHandlers } from "../auth"; -import { initGuildsMiscAPI } from "./misc"; import { initGuildsImportExportAPI } from "./importExport"; +import { initGuildsMiscAPI } from "./misc"; export function initGuildsAPI(app: express.Express) { const guildRouter = express.Router(); diff --git a/backend/src/api/guilds/misc.ts b/backend/src/api/guilds/misc.ts index 630e03d4..8ec25d56 100644 --- a/backend/src/api/guilds/misc.ts +++ b/backend/src/api/guilds/misc.ts @@ -1,19 +1,19 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; import { YAMLException } from "js-yaml"; +import moment from "moment-timezone"; import { validateGuildConfig } from "../../configValidator"; import { AllowedGuilds } from "../../data/AllowedGuilds"; -import { ApiPermissionAssignments, ApiPermissionTypes } from "../../data/ApiPermissionAssignments"; -import { Configs } from "../../data/Configs"; -import { hasGuildPermission, requireGuildPermission } from "../permissions"; -import { clientError, ok, serverError, unauthorized } from "../responses"; -import { loadYamlSafely } from "../../utils/loadYamlSafely"; -import { ObjectAliasError } from "../../utils/validateNoObjectAliases"; -import { isSnowflake } from "../../utils"; -import moment from "moment-timezone"; import { ApiAuditLog } from "../../data/ApiAuditLog"; import { AuditLogEventTypes } from "../../data/apiAuditLogTypes"; +import { ApiPermissionAssignments, ApiPermissionTypes } from "../../data/ApiPermissionAssignments"; +import { Configs } from "../../data/Configs"; import { Queue } from "../../Queue"; +import { isSnowflake } from "../../utils"; +import { loadYamlSafely } from "../../utils/loadYamlSafely"; +import { ObjectAliasError } from "../../utils/validateNoObjectAliases"; +import { hasGuildPermission, requireGuildPermission } from "../permissions"; +import { clientError, ok, serverError, unauthorized } from "../responses"; const apiPermissionAssignments = new ApiPermissionAssignments(); const auditLog = new ApiAuditLog(); diff --git a/backend/src/api/index.ts b/backend/src/api/index.ts index 75bcea5e..badc9033 100644 --- a/backend/src/api/index.ts +++ b/backend/src/api/index.ts @@ -1,6 +1,6 @@ import { connect } from "../data/db"; -import { setIsAPI } from "../globals"; import { env } from "../env"; +import { setIsAPI } from "../globals"; if (!env.KEY) { // tslint:disable-next-line:no-console diff --git a/backend/src/api/start.ts b/backend/src/api/start.ts index 59a20da6..8e542cc0 100644 --- a/backend/src/api/start.ts +++ b/backend/src/api/start.ts @@ -1,14 +1,14 @@ import cors from "cors"; import express from "express"; +import multer from "multer"; import { TokenError } from "passport-oauth2"; +import { env } from "../env"; import { initArchives } from "./archives"; import { initAuth } from "./auth"; import { initDocs } from "./docs"; import { initGuildsAPI } from "./guilds/index"; import { clientError, error, notFound } from "./responses"; import { startBackgroundTasks } from "./tasks"; -import multer from "multer"; -import { env } from "../env"; const app = express(); diff --git a/backend/src/commandTypes.ts b/backend/src/commandTypes.ts index 2ab56fd7..78188f8a 100644 --- a/backend/src/commandTypes.ts +++ b/backend/src/commandTypes.ts @@ -1,16 +1,16 @@ import { - GuildChannel, - GuildMember, - Snowflake, - User, - GuildTextBasedChannel, escapeCodeBlock, escapeInlineCode, + GuildChannel, + GuildMember, + GuildTextBasedChannel, + Snowflake, + User, } from "discord.js"; import { baseCommandParameterTypeHelpers, - messageCommandBaseTypeConverters, CommandContext, + messageCommandBaseTypeConverters, TypeConversionError, } from "knub"; import { createTypeHelper } from "knub-command-manager"; diff --git a/backend/src/data/AllowedGuilds.ts b/backend/src/data/AllowedGuilds.ts index 747dbb87..63941d4b 100644 --- a/backend/src/data/AllowedGuilds.ts +++ b/backend/src/data/AllowedGuilds.ts @@ -1,9 +1,9 @@ +import moment from "moment-timezone"; import { getRepository, Repository } from "typeorm"; +import { DBDateFormat } from "../utils"; import { ApiPermissionTypes } from "./ApiPermissionAssignments"; import { BaseRepository } from "./BaseRepository"; import { AllowedGuild } from "./entities/AllowedGuild"; -import moment from "moment-timezone"; -import { DBDateFormat } from "../utils"; export class AllowedGuilds extends BaseRepository { private allowedGuilds: Repository; diff --git a/backend/src/data/ApiAuditLog.ts b/backend/src/data/ApiAuditLog.ts index 6088ed48..e6d33999 100644 --- a/backend/src/data/ApiAuditLog.ts +++ b/backend/src/data/ApiAuditLog.ts @@ -1,7 +1,7 @@ -import { BaseRepository } from "./BaseRepository"; import { getRepository, Repository } from "typeorm/index"; -import { ApiAuditLogEntry } from "./entities/ApiAuditLogEntry"; import { AuditLogEventData, AuditLogEventType } from "./apiAuditLogTypes"; +import { BaseRepository } from "./BaseRepository"; +import { ApiAuditLogEntry } from "./entities/ApiAuditLogEntry"; export class ApiAuditLog extends BaseRepository { private auditLog: Repository>; diff --git a/backend/src/data/ApiPermissionAssignments.ts b/backend/src/data/ApiPermissionAssignments.ts index 71ad1c57..03ba7c4f 100644 --- a/backend/src/data/ApiPermissionAssignments.ts +++ b/backend/src/data/ApiPermissionAssignments.ts @@ -1,9 +1,9 @@ import { ApiPermissions } from "@shared/apiPermissions"; import { getRepository, Repository } from "typeorm"; -import { BaseRepository } from "./BaseRepository"; -import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment"; import { ApiAuditLog } from "./ApiAuditLog"; import { AuditLogEventTypes } from "./apiAuditLogTypes"; +import { BaseRepository } from "./BaseRepository"; +import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment"; export enum ApiPermissionTypes { User = "USER", diff --git a/backend/src/data/Archives.ts b/backend/src/data/Archives.ts index 06ed0760..b696c33e 100644 --- a/backend/src/data/Archives.ts +++ b/backend/src/data/Archives.ts @@ -1,6 +1,6 @@ import { getRepository, Repository } from "typeorm"; -import { ArchiveEntry } from "./entities/ArchiveEntry"; import { BaseRepository } from "./BaseRepository"; +import { ArchiveEntry } from "./entities/ArchiveEntry"; export class Archives extends BaseRepository { protected archives: Repository; diff --git a/backend/src/data/GuildArchives.ts b/backend/src/data/GuildArchives.ts index ca73c892..297028a3 100644 --- a/backend/src/data/GuildArchives.ts +++ b/backend/src/data/GuildArchives.ts @@ -4,11 +4,11 @@ import { isDefaultSticker } from "src/utils/isDefaultSticker"; import { getRepository, Repository } from "typeorm"; import { renderTemplate, TemplateSafeValueContainer } from "../templateFormatter"; import { trimLines } from "../utils"; +import { decrypt, encrypt } from "../utils/crypt"; +import { channelToTemplateSafeChannel, guildToTemplateSafeGuild } from "../utils/templateSafeObjects"; import { BaseGuildRepository } from "./BaseGuildRepository"; import { ArchiveEntry } from "./entities/ArchiveEntry"; -import { channelToTemplateSafeChannel, guildToTemplateSafeGuild } from "../utils/templateSafeObjects"; import { SavedMessage } from "./entities/SavedMessage"; -import { decrypt, encrypt } from "../utils/crypt"; const DEFAULT_EXPIRY_DAYS = 30; diff --git a/backend/src/data/GuildCases.ts b/backend/src/data/GuildCases.ts index 31a499a4..22b389e7 100644 --- a/backend/src/data/GuildCases.ts +++ b/backend/src/data/GuildCases.ts @@ -1,11 +1,11 @@ import { getRepository, In, InsertResult, Repository } from "typeorm"; +import { Queue } from "../Queue"; +import { chunkArray } from "../utils"; import { BaseGuildRepository } from "./BaseGuildRepository"; import { CaseTypes } from "./CaseTypes"; import { connection } from "./db"; import { Case } from "./entities/Case"; import { CaseNote } from "./entities/CaseNote"; -import { chunkArray } from "../utils"; -import { Queue } from "../Queue"; const CASE_SUMMARY_REASON_MAX_LENGTH = 300; diff --git a/backend/src/data/GuildEvents.ts b/backend/src/data/GuildEvents.ts index 24f14858..4d5a8705 100644 --- a/backend/src/data/GuildEvents.ts +++ b/backend/src/data/GuildEvents.ts @@ -1,6 +1,6 @@ import { Mute } from "./entities/Mute"; -import { ScheduledPost } from "./entities/ScheduledPost"; import { Reminder } from "./entities/Reminder"; +import { ScheduledPost } from "./entities/ScheduledPost"; import { Tempban } from "./entities/Tempban"; import { VCAlert } from "./entities/VCAlert"; diff --git a/backend/src/data/GuildRoleQueue.ts b/backend/src/data/GuildRoleQueue.ts index bad25a73..116df838 100644 --- a/backend/src/data/GuildRoleQueue.ts +++ b/backend/src/data/GuildRoleQueue.ts @@ -1,7 +1,7 @@ import { getRepository, Repository } from "typeorm"; import { BaseGuildRepository } from "./BaseGuildRepository"; -import { RoleQueueItem } from "./entities/RoleQueueItem"; import { connection } from "./db"; +import { RoleQueueItem } from "./entities/RoleQueueItem"; export class GuildRoleQueue extends BaseGuildRepository { private roleQueue: Repository; diff --git a/backend/src/data/GuildSavedMessages.ts b/backend/src/data/GuildSavedMessages.ts index 06b9d7d2..5ea29cd7 100644 --- a/backend/src/data/GuildSavedMessages.ts +++ b/backend/src/data/GuildSavedMessages.ts @@ -2,12 +2,12 @@ import { GuildChannel, Message } from "discord.js"; import moment from "moment-timezone"; import { getRepository, Repository } from "typeorm"; import { QueuedEventEmitter } from "../QueuedEventEmitter"; -import { BaseGuildRepository } from "./BaseGuildRepository"; -import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage"; -import { buildEntity } from "./buildEntity"; import { noop } from "../utils"; -import { decryptJson, encryptJson } from "../utils/cryptHelpers"; import { asyncMap } from "../utils/async"; +import { decryptJson, encryptJson } from "../utils/cryptHelpers"; +import { BaseGuildRepository } from "./BaseGuildRepository"; +import { buildEntity } from "./buildEntity"; +import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage"; export class GuildSavedMessages extends BaseGuildRepository { private messages: Repository; diff --git a/backend/src/data/Mutes.ts b/backend/src/data/Mutes.ts index e8c5fefc..17efed37 100644 --- a/backend/src/data/Mutes.ts +++ b/backend/src/data/Mutes.ts @@ -1,8 +1,8 @@ import moment from "moment-timezone"; import { getRepository, Repository } from "typeorm"; -import { Mute } from "./entities/Mute"; import { DAYS, DBDateFormat } from "../utils"; import { BaseRepository } from "./BaseRepository"; +import { Mute } from "./entities/Mute"; const OLD_EXPIRED_MUTE_THRESHOLD = 7 * DAYS; diff --git a/backend/src/data/Phisherman.ts b/backend/src/data/Phisherman.ts index 2f7b90fc..b3e16e36 100644 --- a/backend/src/data/Phisherman.ts +++ b/backend/src/data/Phisherman.ts @@ -1,12 +1,12 @@ -import { getRepository, Repository } from "typeorm"; -import { PhishermanCacheEntry } from "./entities/PhishermanCacheEntry"; -import { PhishermanDomainInfo, PhishermanUnknownDomain } from "./types/phisherman"; -import fetch, { Headers } from "node-fetch"; -import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils"; -import moment from "moment-timezone"; -import { PhishermanKeyCacheEntry } from "./entities/PhishermanKeyCacheEntry"; import crypto from "crypto"; +import moment from "moment-timezone"; +import fetch, { Headers } from "node-fetch"; +import { getRepository, Repository } from "typeorm"; import { env } from "../env"; +import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils"; +import { PhishermanCacheEntry } from "./entities/PhishermanCacheEntry"; +import { PhishermanKeyCacheEntry } from "./entities/PhishermanKeyCacheEntry"; +import { PhishermanDomainInfo, PhishermanUnknownDomain } from "./types/phisherman"; const API_URL = "https://api.phisherman.gg"; const MASTER_API_KEY = env.PHISHERMAN_API_KEY; diff --git a/backend/src/data/Reminders.ts b/backend/src/data/Reminders.ts index 7f8d2f1a..0c35c4e2 100644 --- a/backend/src/data/Reminders.ts +++ b/backend/src/data/Reminders.ts @@ -1,8 +1,8 @@ -import { getRepository, Repository } from "typeorm"; -import { Reminder } from "./entities/Reminder"; -import { BaseRepository } from "./BaseRepository"; import moment from "moment-timezone"; +import { getRepository, Repository } from "typeorm"; import { DBDateFormat } from "../utils"; +import { BaseRepository } from "./BaseRepository"; +import { Reminder } from "./entities/Reminder"; export class Reminders extends BaseRepository { private reminders: Repository; diff --git a/backend/src/data/ScheduledPosts.ts b/backend/src/data/ScheduledPosts.ts index 72f1dda4..1931ce6e 100644 --- a/backend/src/data/ScheduledPosts.ts +++ b/backend/src/data/ScheduledPosts.ts @@ -1,8 +1,8 @@ -import { getRepository, Repository } from "typeorm"; -import { ScheduledPost } from "./entities/ScheduledPost"; -import { BaseRepository } from "./BaseRepository"; import moment from "moment-timezone"; +import { getRepository, Repository } from "typeorm"; import { DBDateFormat } from "../utils"; +import { BaseRepository } from "./BaseRepository"; +import { ScheduledPost } from "./entities/ScheduledPost"; export class ScheduledPosts extends BaseRepository { private scheduledPosts: Repository; diff --git a/backend/src/data/Tempbans.ts b/backend/src/data/Tempbans.ts index 5a78c30e..a24d3fd8 100644 --- a/backend/src/data/Tempbans.ts +++ b/backend/src/data/Tempbans.ts @@ -1,8 +1,8 @@ import moment from "moment-timezone"; import { getRepository, Repository } from "typeorm"; -import { Tempban } from "./entities/Tempban"; -import { BaseRepository } from "./BaseRepository"; import { DBDateFormat } from "../utils"; +import { BaseRepository } from "./BaseRepository"; +import { Tempban } from "./entities/Tempban"; export class Tempbans extends BaseRepository { private tempbans: Repository; diff --git a/backend/src/data/VCAlerts.ts b/backend/src/data/VCAlerts.ts index 27e85f90..1296b033 100644 --- a/backend/src/data/VCAlerts.ts +++ b/backend/src/data/VCAlerts.ts @@ -1,8 +1,8 @@ -import { getRepository, Repository } from "typeorm"; -import { VCAlert } from "./entities/VCAlert"; -import { BaseRepository } from "./BaseRepository"; import moment from "moment-timezone"; +import { getRepository, Repository } from "typeorm"; import { DBDateFormat } from "../utils"; +import { BaseRepository } from "./BaseRepository"; +import { VCAlert } from "./entities/VCAlert"; export class VCAlerts extends BaseRepository { private allAlerts: Repository; diff --git a/backend/src/data/Webhooks.ts b/backend/src/data/Webhooks.ts index ce69b2c8..fb1e92ac 100644 --- a/backend/src/data/Webhooks.ts +++ b/backend/src/data/Webhooks.ts @@ -1,7 +1,7 @@ import { getRepository, Repository } from "typeorm"; -import { Webhook } from "./entities/Webhook"; -import { BaseRepository } from "./BaseRepository"; import { decrypt, encrypt } from "../utils/crypt"; +import { BaseRepository } from "./BaseRepository"; +import { Webhook } from "./entities/Webhook"; export class Webhooks extends BaseRepository { repository: Repository = getRepository(Webhook); diff --git a/backend/src/data/db.ts b/backend/src/data/db.ts index fd42f361..decfb431 100644 --- a/backend/src/data/db.ts +++ b/backend/src/data/db.ts @@ -1,8 +1,8 @@ +import path from "path"; import { Connection, createConnection } from "typeorm"; +import { backendDir } from "../paths"; import { SimpleError } from "../SimpleError"; import { QueryLogger } from "./queryLogger"; -import path from "path"; -import { backendDir } from "../paths"; const ormconfigPath = path.join(backendDir, "ormconfig.js"); const connectionOptions = require(ormconfigPath); diff --git a/backend/src/data/entities/ApiPermissionAssignment.ts b/backend/src/data/entities/ApiPermissionAssignment.ts index 0160241f..49e07878 100644 --- a/backend/src/data/entities/ApiPermissionAssignment.ts +++ b/backend/src/data/entities/ApiPermissionAssignment.ts @@ -1,6 +1,6 @@ import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm"; -import { ApiUserInfo } from "./ApiUserInfo"; import { ApiPermissionTypes } from "../ApiPermissionAssignments"; +import { ApiUserInfo } from "./ApiUserInfo"; @Entity("api_permissions") export class ApiPermissionAssignment { diff --git a/backend/src/data/entities/CounterTrigger.ts b/backend/src/data/entities/CounterTrigger.ts index 91cbf995..90cdf488 100644 --- a/backend/src/data/entities/CounterTrigger.ts +++ b/backend/src/data/entities/CounterTrigger.ts @@ -2,7 +2,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; export const TRIGGER_COMPARISON_OPS = ["=", "!=", ">", "<", ">=", "<="] as const; -export type TriggerComparisonOp = typeof TRIGGER_COMPARISON_OPS[number]; +export type TriggerComparisonOp = (typeof TRIGGER_COMPARISON_OPS)[number]; const REVERSE_OPS: Record = { "=": "!=", diff --git a/backend/src/data/loops/expiringMutesLoop.ts b/backend/src/data/loops/expiringMutesLoop.ts index 9d291745..9060e853 100644 --- a/backend/src/data/loops/expiringMutesLoop.ts +++ b/backend/src/data/loops/expiringMutesLoop.ts @@ -1,11 +1,11 @@ // tslint:disable:no-console -import { lazyMemoize, MINUTES } from "../../utils"; -import { Mutes } from "../Mutes"; -import Timeout = NodeJS.Timeout; import moment from "moment-timezone"; +import { lazyMemoize, MINUTES } from "../../utils"; import { Mute } from "../entities/Mute"; import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; +import { Mutes } from "../Mutes"; +import Timeout = NodeJS.Timeout; const LOOP_INTERVAL = 15 * MINUTES; const MAX_TRIES_PER_SERVER = 3; diff --git a/backend/src/data/loops/expiringTempbansLoop.ts b/backend/src/data/loops/expiringTempbansLoop.ts index cef9b547..3929125d 100644 --- a/backend/src/data/loops/expiringTempbansLoop.ts +++ b/backend/src/data/loops/expiringTempbansLoop.ts @@ -1,10 +1,10 @@ // tslint:disable:no-console -import { lazyMemoize, MINUTES } from "../../utils"; import moment from "moment-timezone"; +import { lazyMemoize, MINUTES } from "../../utils"; +import { Tempban } from "../entities/Tempban"; import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; import { Tempbans } from "../Tempbans"; -import { Tempban } from "../entities/Tempban"; import Timeout = NodeJS.Timeout; const LOOP_INTERVAL = 15 * MINUTES; diff --git a/backend/src/data/loops/expiringVCAlertsLoop.ts b/backend/src/data/loops/expiringVCAlertsLoop.ts index 54bb7032..dbf8c2ef 100644 --- a/backend/src/data/loops/expiringVCAlertsLoop.ts +++ b/backend/src/data/loops/expiringVCAlertsLoop.ts @@ -1,11 +1,11 @@ // tslint:disable:no-console -import { lazyMemoize, MINUTES } from "../../utils"; import moment from "moment-timezone"; -import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; -import Timeout = NodeJS.Timeout; -import { VCAlerts } from "../VCAlerts"; +import { lazyMemoize, MINUTES } from "../../utils"; import { VCAlert } from "../entities/VCAlert"; +import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; +import { VCAlerts } from "../VCAlerts"; +import Timeout = NodeJS.Timeout; const LOOP_INTERVAL = 15 * MINUTES; const MAX_TRIES_PER_SERVER = 3; diff --git a/backend/src/data/loops/upcomingRemindersLoop.ts b/backend/src/data/loops/upcomingRemindersLoop.ts index b3aa2f4b..3ecc661c 100644 --- a/backend/src/data/loops/upcomingRemindersLoop.ts +++ b/backend/src/data/loops/upcomingRemindersLoop.ts @@ -1,9 +1,9 @@ // tslint:disable:no-console -import { lazyMemoize, MINUTES } from "../../utils"; import moment from "moment-timezone"; -import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; +import { lazyMemoize, MINUTES } from "../../utils"; import { Reminder } from "../entities/Reminder"; +import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; import { Reminders } from "../Reminders"; import Timeout = NodeJS.Timeout; diff --git a/backend/src/data/loops/upcomingScheduledPostsLoop.ts b/backend/src/data/loops/upcomingScheduledPostsLoop.ts index 465939f4..edd9fdad 100644 --- a/backend/src/data/loops/upcomingScheduledPostsLoop.ts +++ b/backend/src/data/loops/upcomingScheduledPostsLoop.ts @@ -1,10 +1,10 @@ // tslint:disable:no-console -import { lazyMemoize, MINUTES } from "../../utils"; import moment from "moment-timezone"; +import { lazyMemoize, MINUTES } from "../../utils"; +import { ScheduledPost } from "../entities/ScheduledPost"; import { emitGuildEvent, hasGuildEventListener } from "../GuildEvents"; import { ScheduledPosts } from "../ScheduledPosts"; -import { ScheduledPost } from "../entities/ScheduledPost"; import Timeout = NodeJS.Timeout; const LOOP_INTERVAL = 15 * MINUTES; diff --git a/backend/src/data/queryLogger.ts b/backend/src/data/queryLogger.ts index bc38cc0e..269c19bf 100644 --- a/backend/src/data/queryLogger.ts +++ b/backend/src/data/queryLogger.ts @@ -1,5 +1,5 @@ -import { AdvancedConsoleLogger } from "typeorm/logger/AdvancedConsoleLogger"; import type { QueryRunner } from "typeorm"; +import { AdvancedConsoleLogger } from "typeorm/logger/AdvancedConsoleLogger"; let groupedQueryStats: Map = new Map(); diff --git a/backend/src/env.ts b/backend/src/env.ts index a125a744..c1712a3e 100644 --- a/backend/src/env.ts +++ b/backend/src/env.ts @@ -1,8 +1,8 @@ -import path from "path"; -import fs from "fs"; import dotenv from "dotenv"; -import { rootDir } from "./paths"; +import fs from "fs"; +import path from "path"; import { z } from "zod"; +import { rootDir } from "./paths"; const envType = z.object({ KEY: z.string().length(32), diff --git a/backend/src/index.ts b/backend/src/index.ts index f01003cf..7054ebee 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -15,39 +15,38 @@ import { Knub, PluginError } from "knub"; import { PluginLoadError } from "knub/dist/plugins/PluginLoadError"; // Always use UTC internally // This is also enforced for the database in data/db.ts +import { EventEmitter } from "events"; +import { PluginNotLoadedError } from "knub/dist/plugins/PluginNotLoadedError"; import moment from "moment-timezone"; +import { performance } from "perf_hooks"; import { AllowedGuilds } from "./data/AllowedGuilds"; import { Configs } from "./data/Configs"; import { connect } from "./data/db"; import { GuildLogs } from "./data/GuildLogs"; import { LogType } from "./data/LogType"; +import { runExpiredArchiveDeletionLoop } from "./data/loops/expiredArchiveDeletionLoop"; +import { runExpiringMutesLoop } from "./data/loops/expiringMutesLoop"; +import { runExpiringTempbansLoop } from "./data/loops/expiringTempbansLoop"; +import { runExpiringVCAlertsLoop } from "./data/loops/expiringVCAlertsLoop"; +import { runPhishermanCacheCleanupLoop, runPhishermanReportingLoop } from "./data/loops/phishermanLoops"; +import { runSavedMessageCleanupLoop } from "./data/loops/savedMessageCleanupLoop"; +import { runUpcomingRemindersLoop } from "./data/loops/upcomingRemindersLoop"; +import { runUpcomingScheduledPostsLoop } from "./data/loops/upcomingScheduledPostsLoop"; +import { hasPhishermanMasterAPIKey } from "./data/Phisherman"; +import { consumeQueryStats } from "./data/queryLogger"; import { DiscordJSError } from "./DiscordJSError"; +import { env } from "./env"; import { logger } from "./logger"; import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availablePlugins"; +import { setProfiler } from "./profiler"; +import { logRateLimit } from "./rateLimitStats"; import { RecoverablePluginError } from "./RecoverablePluginError"; import { SimpleError } from "./SimpleError"; import { startUptimeCounter } from "./uptime"; import { errorMessage, isDiscordAPIError, isDiscordHTTPError, MINUTES, SECONDS, sleep, successMessage } from "./utils"; -import { loadYamlSafely } from "./utils/loadYamlSafely"; import { DecayingCounter } from "./utils/DecayingCounter"; -import { PluginNotLoadedError } from "knub/dist/plugins/PluginNotLoadedError"; -import { logRateLimit } from "./rateLimitStats"; -import { runExpiringMutesLoop } from "./data/loops/expiringMutesLoop"; -import { runUpcomingRemindersLoop } from "./data/loops/upcomingRemindersLoop"; -import { runUpcomingScheduledPostsLoop } from "./data/loops/upcomingScheduledPostsLoop"; -import { runExpiringTempbansLoop } from "./data/loops/expiringTempbansLoop"; -import { runExpiringVCAlertsLoop } from "./data/loops/expiringVCAlertsLoop"; -import { runExpiredArchiveDeletionLoop } from "./data/loops/expiredArchiveDeletionLoop"; -import { runSavedMessageCleanupLoop } from "./data/loops/savedMessageCleanupLoop"; -import { performance } from "perf_hooks"; -import { setProfiler } from "./profiler"; import { enableProfiling } from "./utils/easyProfiler"; -import { runPhishermanCacheCleanupLoop, runPhishermanReportingLoop } from "./data/loops/phishermanLoops"; -import { hasPhishermanMasterAPIKey } from "./data/Phisherman"; -import { consumeQueryStats } from "./data/queryLogger"; -import { EventEmitter } from "events"; -import { env } from "./env"; -import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types"; +import { loadYamlSafely } from "./utils/loadYamlSafely"; // TODO: Remove this once fixed on upstream declare module "knub/dist/helpers" { diff --git a/backend/src/pluginUtils.ts b/backend/src/pluginUtils.ts index 4c110914..be507095 100644 --- a/backend/src/pluginUtils.ts +++ b/backend/src/pluginUtils.ts @@ -10,11 +10,11 @@ import { ExtendedMatchParams } from "knub/dist/config/PluginConfigManager"; // T import { AnyPluginData } from "knub/dist/plugins/PluginData"; import { logger } from "./logger"; import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin"; +import { isStaff } from "./staff"; import { TZeppelinKnub } from "./types"; import { deepKeyIntersect, errorMessage, successMessage, tDeepPartial, tNullable } from "./utils"; import { Tail } from "./utils/typeUtils"; import { decodeAndValidateStrict, StrictValidationError, validate } from "./validatorUtils"; -import { isStaff } from "./staff"; const { getMemberLevel } = helpers; diff --git a/backend/src/plugins/AutoDelete/util/onMessageCreate.ts b/backend/src/plugins/AutoDelete/util/onMessageCreate.ts index fad3e8ea..024e3cf0 100644 --- a/backend/src/plugins/AutoDelete/util/onMessageCreate.ts +++ b/backend/src/plugins/AutoDelete/util/onMessageCreate.ts @@ -1,9 +1,9 @@ import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { convertDelayStringToMS, resolveMember } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { AutoDeletePluginType, MAX_DELAY } from "../types"; import { addMessageToDeletionQueue } from "./addMessageToDeletionQueue"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export async function onMessageCreate(pluginData: GuildPluginData, msg: SavedMessage) { const member = await resolveMember(pluginData.client, pluginData.guild, msg.user_id); diff --git a/backend/src/plugins/AutoReactions/events/AddReactionsEvt.ts b/backend/src/plugins/AutoReactions/events/AddReactionsEvt.ts index 157160cb..574e500f 100644 --- a/backend/src/plugins/AutoReactions/events/AddReactionsEvt.ts +++ b/backend/src/plugins/AutoReactions/events/AddReactionsEvt.ts @@ -1,11 +1,11 @@ import { GuildTextBasedChannel, PermissionsBitField } from "discord.js"; +import { AutoReaction } from "../../../data/entities/AutoReaction"; import { isDiscordAPIError } 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"; -import { AutoReaction } from "../../../data/entities/AutoReaction"; const p = PermissionsBitField.Flags; diff --git a/backend/src/plugins/AutoReactions/types.ts b/backend/src/plugins/AutoReactions/types.ts index cb4930f9..99bbe8c8 100644 --- a/backend/src/plugins/AutoReactions/types.ts +++ b/backend/src/plugins/AutoReactions/types.ts @@ -1,9 +1,9 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; +import { AutoReaction } from "../../data/entities/AutoReaction"; import { GuildAutoReactions } from "../../data/GuildAutoReactions"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; -import { AutoReaction } from "../../data/entities/AutoReaction"; export const ConfigSchema = t.type({ can_manage: t.boolean, diff --git a/backend/src/plugins/Automod/AutomodPlugin.ts b/backend/src/plugins/Automod/AutomodPlugin.ts index 6f5023de..0bc2e648 100644 --- a/backend/src/plugins/Automod/AutomodPlugin.ts +++ b/backend/src/plugins/Automod/AutomodPlugin.ts @@ -10,9 +10,11 @@ import { registerEventListenersFromMap } from "../../utils/registerEventListener import { unregisterEventListenersFromMap } from "../../utils/unregisterEventListenersFromMap"; import { StrictValidationError } from "../../validatorUtils"; import { CountersPlugin } from "../Counters/CountersPlugin"; +import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; import { LogsPlugin } from "../Logs/LogsPlugin"; import { ModActionsPlugin } from "../ModActions/ModActionsPlugin"; import { MutesPlugin } from "../Mutes/MutesPlugin"; +import { PhishermanPlugin } from "../Phisherman/PhishermanPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { availableActions } from "./actions/availableActions"; import { AntiraidClearCmd } from "./commands/AntiraidClearCmd"; @@ -34,8 +36,6 @@ import { clearOldRecentSpam } from "./functions/clearOldRecentSpam"; import { pluginInfo } from "./info"; import { availableTriggers } from "./triggers/availableTriggers"; import { AutomodPluginType, ConfigSchema } from "./types"; -import { PhishermanPlugin } from "../Phisherman/PhishermanPlugin"; -import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; const defaultOptions = { config: { diff --git a/backend/src/plugins/Automod/actions/addToCounter.ts b/backend/src/plugins/Automod/actions/addToCounter.ts index d1876fb0..b8dae6d0 100644 --- a/backend/src/plugins/Automod/actions/addToCounter.ts +++ b/backend/src/plugins/Automod/actions/addToCounter.ts @@ -1,7 +1,7 @@ import * as t from "io-ts"; import { CountersPlugin } from "../../Counters/CountersPlugin"; -import { automodAction } from "../helpers"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { automodAction } from "../helpers"; export const AddToCounterAction = automodAction({ configType: t.type({ diff --git a/backend/src/plugins/Automod/actions/alert.ts b/backend/src/plugins/Automod/actions/alert.ts index 706552b2..eb6f3348 100644 --- a/backend/src/plugins/Automod/actions/alert.ts +++ b/backend/src/plugins/Automod/actions/alert.ts @@ -9,19 +9,19 @@ import { TemplateSafeValueContainer, } from "../../../templateFormatter"; import { + chunkMessageLines, + isTruthy, messageLink, tAllowedMentions, tNormalizedNullOptional, - isTruthy, - verboseChannelMention, validateAndParseMessageContent, - chunkMessageLines, + verboseChannelMention, } from "../../../utils"; +import { messageIsEmpty } from "../../../utils/messageIsEmpty"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { automodAction } from "../helpers"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; -import { messageIsEmpty } from "../../../utils/messageIsEmpty"; -import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; export const AlertAction = automodAction({ configType: t.type({ diff --git a/backend/src/plugins/Automod/actions/changePerms.ts b/backend/src/plugins/Automod/actions/changePerms.ts index 0ec0ead1..4db4ebfd 100644 --- a/backend/src/plugins/Automod/actions/changePerms.ts +++ b/backend/src/plugins/Automod/actions/changePerms.ts @@ -1,14 +1,14 @@ import { PermissionsBitField, PermissionsString } from "discord.js"; import * as t from "io-ts"; -import { automodAction } from "../helpers"; -import { tNullable, isValidSnowflake, tPartialDictionary } from "../../../utils"; import { noop } from "knub/dist/utils"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { isValidSnowflake, tNullable, tPartialDictionary } from "../../../utils"; import { guildToTemplateSafeGuild, savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; +import { automodAction } from "../helpers"; export const ChangePermsAction = automodAction({ configType: t.type({ diff --git a/backend/src/plugins/Automod/actions/reply.ts b/backend/src/plugins/Automod/actions/reply.ts index 56312b95..ec7ffc1b 100644 --- a/backend/src/plugins/Automod/actions/reply.ts +++ b/backend/src/plugins/Automod/actions/reply.ts @@ -1,6 +1,5 @@ import { GuildTextBasedChannel, MessageCreateOptions, PermissionsBitField, Snowflake, User } from "discord.js"; import * as t from "io-ts"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; import { convertDelayStringToMS, @@ -14,10 +13,11 @@ import { verboseChannelMention, } from "../../../utils"; import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions"; +import { messageIsEmpty } from "../../../utils/messageIsEmpty"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { automodAction } from "../helpers"; import { AutomodContext } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { messageIsEmpty } from "../../../utils/messageIsEmpty"; export const ReplyAction = automodAction({ configType: t.union([ diff --git a/backend/src/plugins/Automod/actions/setCounter.ts b/backend/src/plugins/Automod/actions/setCounter.ts index 00897ef8..2369150b 100644 --- a/backend/src/plugins/Automod/actions/setCounter.ts +++ b/backend/src/plugins/Automod/actions/setCounter.ts @@ -1,7 +1,7 @@ import * as t from "io-ts"; import { CountersPlugin } from "../../Counters/CountersPlugin"; -import { automodAction } from "../helpers"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { automodAction } from "../helpers"; export const SetCounterAction = automodAction({ configType: t.type({ diff --git a/backend/src/plugins/Automod/actions/setSlowmode.ts b/backend/src/plugins/Automod/actions/setSlowmode.ts index fc404a60..7b527f10 100644 --- a/backend/src/plugins/Automod/actions/setSlowmode.ts +++ b/backend/src/plugins/Automod/actions/setSlowmode.ts @@ -1,8 +1,8 @@ import { ChannelType, GuildTextBasedChannel, Snowflake } from "discord.js"; import * as t from "io-ts"; import { convertDelayStringToMS, isDiscordAPIError, tDelayString, tNullable } from "../../../utils"; -import { automodAction } from "../helpers"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { automodAction } from "../helpers"; export const SetSlowmodeAction = automodAction({ configType: t.type({ diff --git a/backend/src/plugins/Automod/events/runAutomodOnMessage.ts b/backend/src/plugins/Automod/events/runAutomodOnMessage.ts index dc9bab2e..915a0cd7 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnMessage.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnMessage.ts @@ -1,12 +1,12 @@ import { GuildPluginData } from "knub"; import moment from "moment-timezone"; +import { performance } from "perf_hooks"; import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { profilingEnabled } from "../../../utils/easyProfiler"; import { addRecentActionsFromMessage } from "../functions/addRecentActionsFromMessage"; import { clearRecentActionsForMessage } from "../functions/clearRecentActionsForMessage"; import { runAutomod } from "../functions/runAutomod"; import { AutomodContext, AutomodPluginType } from "../types"; -import { performance } from "perf_hooks"; -import { profilingEnabled } from "../../../utils/easyProfiler"; export async function runAutomodOnMessage( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Automod/functions/clearOldRecentActions.ts b/backend/src/plugins/Automod/functions/clearOldRecentActions.ts index 5d75e68d..881f3ff1 100644 --- a/backend/src/plugins/Automod/functions/clearOldRecentActions.ts +++ b/backend/src/plugins/Automod/functions/clearOldRecentActions.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; +import { startProfiling } from "../../../utils/easyProfiler"; import { RECENT_ACTION_EXPIRY_TIME } from "../constants"; import { AutomodPluginType } from "../types"; -import { startProfiling } from "../../../utils/easyProfiler"; export function clearOldRecentActions(pluginData: GuildPluginData) { const stopProfiling = startProfiling(pluginData.getKnubInstance().profiler, "automod:fns:clearOldRecentActions"); diff --git a/backend/src/plugins/Automod/functions/clearOldRecentSpam.ts b/backend/src/plugins/Automod/functions/clearOldRecentSpam.ts index a4b9ad1b..f240b2da 100644 --- a/backend/src/plugins/Automod/functions/clearOldRecentSpam.ts +++ b/backend/src/plugins/Automod/functions/clearOldRecentSpam.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; +import { startProfiling } from "../../../utils/easyProfiler"; import { RECENT_SPAM_EXPIRY_TIME } from "../constants"; import { AutomodPluginType } from "../types"; -import { startProfiling } from "../../../utils/easyProfiler"; export function clearOldRecentSpam(pluginData: GuildPluginData) { const stopProfiling = startProfiling(pluginData.getKnubInstance().profiler, "automod:fns:clearOldRecentSpam"); diff --git a/backend/src/plugins/Automod/functions/clearRecentActionsForMessage.ts b/backend/src/plugins/Automod/functions/clearRecentActionsForMessage.ts index 8a21f8ad..6f1fcdb6 100644 --- a/backend/src/plugins/Automod/functions/clearRecentActionsForMessage.ts +++ b/backend/src/plugins/Automod/functions/clearRecentActionsForMessage.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; -import { AutomodContext, AutomodPluginType } from "../types"; import { startProfiling } from "../../../utils/easyProfiler"; +import { AutomodContext, AutomodPluginType } from "../types"; export function clearRecentActionsForMessage(pluginData: GuildPluginData, context: AutomodContext) { const stopProfiling = startProfiling( diff --git a/backend/src/plugins/Automod/functions/findRecentSpam.ts b/backend/src/plugins/Automod/functions/findRecentSpam.ts index 809fbefd..93553b83 100644 --- a/backend/src/plugins/Automod/functions/findRecentSpam.ts +++ b/backend/src/plugins/Automod/functions/findRecentSpam.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; +import { startProfiling } from "../../../utils/easyProfiler"; import { RecentActionType } from "../constants"; import { AutomodPluginType } from "../types"; -import { startProfiling } from "../../../utils/easyProfiler"; export function findRecentSpam( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Automod/functions/getMatchingMessageRecentActions.ts b/backend/src/plugins/Automod/functions/getMatchingMessageRecentActions.ts index 48ad51d7..99dae716 100644 --- a/backend/src/plugins/Automod/functions/getMatchingMessageRecentActions.ts +++ b/backend/src/plugins/Automod/functions/getMatchingMessageRecentActions.ts @@ -1,10 +1,10 @@ import { GuildPluginData } from "knub"; import moment from "moment-timezone"; import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { startProfiling } from "../../../utils/easyProfiler"; import { RecentActionType } from "../constants"; import { AutomodPluginType } from "../types"; import { getMatchingRecentActions } from "./getMatchingRecentActions"; -import { startProfiling } from "../../../utils/easyProfiler"; export function getMatchingMessageRecentActions( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Automod/functions/getMatchingRecentActions.ts b/backend/src/plugins/Automod/functions/getMatchingRecentActions.ts index e8ecb6c2..b22817c4 100644 --- a/backend/src/plugins/Automod/functions/getMatchingRecentActions.ts +++ b/backend/src/plugins/Automod/functions/getMatchingRecentActions.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; +import { startProfiling } from "../../../utils/easyProfiler"; import { RecentActionType } from "../constants"; import { AutomodPluginType } from "../types"; -import { startProfiling } from "../../../utils/easyProfiler"; export function getMatchingRecentActions( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts b/backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts index f084bfa0..29d07cd9 100644 --- a/backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts +++ b/backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts @@ -2,8 +2,8 @@ import { ActivityType, Embed } from "discord.js"; import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { resolveMember } from "../../../utils"; -import { AutomodPluginType } from "../types"; import { DeepMutable } from "../../../utils/typeUtils.js"; +import { AutomodPluginType } from "../types"; type TextTriggerWithMultipleMatchTypes = { match_messages: boolean; diff --git a/backend/src/plugins/Automod/functions/runAutomod.ts b/backend/src/plugins/Automod/functions/runAutomod.ts index d13fe678..e9c2e3a7 100644 --- a/backend/src/plugins/Automod/functions/runAutomod.ts +++ b/backend/src/plugins/Automod/functions/runAutomod.ts @@ -1,13 +1,13 @@ import { GuildTextBasedChannel, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; +import { performance } from "perf_hooks"; +import { calculateBlocking, profilingEnabled } from "../../../utils/easyProfiler"; import { availableActions } from "../actions/availableActions"; import { CleanAction } from "../actions/clean"; import { AutomodTriggerMatchResult } from "../helpers"; import { availableTriggers } from "../triggers/availableTriggers"; import { AutomodContext, AutomodPluginType } from "../types"; import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown"; -import { performance } from "perf_hooks"; -import { calculateBlocking, profilingEnabled } from "../../../utils/easyProfiler"; export async function runAutomod(pluginData: GuildPluginData, context: AutomodContext) { const userId = context.user?.id || context.member?.id || context.message?.user_id; diff --git a/backend/src/plugins/Automod/triggers/availableTriggers.ts b/backend/src/plugins/Automod/triggers/availableTriggers.ts index ea8b6f04..822e44ff 100644 --- a/backend/src/plugins/Automod/triggers/availableTriggers.ts +++ b/backend/src/plugins/Automod/triggers/availableTriggers.ts @@ -11,9 +11,9 @@ import { KickTrigger } from "./kick"; import { LineSpamTrigger } from "./lineSpam"; import { LinkSpamTrigger } from "./linkSpam"; import { MatchAttachmentTypeTrigger } from "./matchAttachmentType"; -import { MatchMimeTypeTrigger } from "./matchMimeType"; import { MatchInvitesTrigger } from "./matchInvites"; import { MatchLinksTrigger } from "./matchLinks"; +import { MatchMimeTypeTrigger } from "./matchMimeType"; import { MatchRegexTrigger } from "./matchRegex"; import { MatchWordsTrigger } from "./matchWords"; import { MemberJoinTrigger } from "./memberJoin"; @@ -26,14 +26,14 @@ import { NoteTrigger } from "./note"; import { RoleAddedTrigger } from "./roleAdded"; import { RoleRemovedTrigger } from "./roleRemoved"; import { StickerSpamTrigger } from "./stickerSpam"; +import { ThreadArchiveTrigger } from "./threadArchive"; import { ThreadCreateTrigger } from "./threadCreate"; import { ThreadCreateSpamTrigger } from "./threadCreateSpam"; import { ThreadDeleteTrigger } from "./threadDelete"; +import { ThreadUnarchiveTrigger } from "./threadUnarchive"; import { UnbanTrigger } from "./unban"; import { UnmuteTrigger } from "./unmute"; import { WarnTrigger } from "./warn"; -import { ThreadArchiveTrigger } from "./threadArchive"; -import { ThreadUnarchiveTrigger } from "./threadUnarchive"; export const availableTriggers: Record> = { any_message: AnyMessageTrigger, diff --git a/backend/src/plugins/Automod/triggers/matchLinks.ts b/backend/src/plugins/Automod/triggers/matchLinks.ts index 068e64da..39fb7320 100644 --- a/backend/src/plugins/Automod/triggers/matchLinks.ts +++ b/backend/src/plugins/Automod/triggers/matchLinks.ts @@ -1,15 +1,15 @@ +import { escapeInlineCode } from "discord.js"; import * as t from "io-ts"; +import { phishermanDomainIsSafe } from "../../../data/Phisherman"; import { allowTimeout } from "../../../RegExpRunner"; import { getUrlsInString, tNullable } from "../../../utils"; +import { mergeRegexes } from "../../../utils/mergeRegexes"; +import { mergeWordsIntoRegex } from "../../../utils/mergeWordsIntoRegex"; import { TRegex } from "../../../validatorUtils"; +import { PhishermanPlugin } from "../../Phisherman/PhishermanPlugin"; import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary"; import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage"; import { automodTrigger } from "../helpers"; -import { mergeRegexes } from "../../../utils/mergeRegexes"; -import { mergeWordsIntoRegex } from "../../../utils/mergeWordsIntoRegex"; -import { PhishermanPlugin } from "../../Phisherman/PhishermanPlugin"; -import { phishermanDomainIsSafe } from "../../../data/Phisherman"; -import { escapeInlineCode } from "discord.js"; interface MatchResultType { type: MatchableTextType; diff --git a/backend/src/plugins/Automod/triggers/matchMimeType.ts b/backend/src/plugins/Automod/triggers/matchMimeType.ts index 23251a7e..1af12471 100644 --- a/backend/src/plugins/Automod/triggers/matchMimeType.ts +++ b/backend/src/plugins/Automod/triggers/matchMimeType.ts @@ -1,7 +1,7 @@ -import { automodTrigger } from "../helpers"; +import { escapeInlineCode } from "discord.js"; import * as t from "io-ts"; import { asSingleLine, messageSummary, verboseChannelMention } from "../../../utils"; -import { escapeInlineCode } from "discord.js"; +import { automodTrigger } from "../helpers"; interface MatchResultType { matchedType: string; diff --git a/backend/src/plugins/Automod/triggers/matchRegex.ts b/backend/src/plugins/Automod/triggers/matchRegex.ts index 0afc3c1f..7d011891 100644 --- a/backend/src/plugins/Automod/triggers/matchRegex.ts +++ b/backend/src/plugins/Automod/triggers/matchRegex.ts @@ -1,12 +1,12 @@ import * as t from "io-ts"; import { allowTimeout } from "../../../RegExpRunner"; +import { mergeRegexes } from "../../../utils/mergeRegexes"; import { normalizeText } from "../../../utils/normalizeText"; import { stripMarkdown } from "../../../utils/stripMarkdown"; import { TRegex } from "../../../validatorUtils"; import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary"; import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage"; import { automodTrigger } from "../helpers"; -import { mergeRegexes } from "../../../utils/mergeRegexes"; interface MatchResultType { pattern: string; diff --git a/backend/src/plugins/BotControl/BotControlPlugin.ts b/backend/src/plugins/BotControl/BotControlPlugin.ts index 5fc06034..7e9cf027 100644 --- a/backend/src/plugins/BotControl/BotControlPlugin.ts +++ b/backend/src/plugins/BotControl/BotControlPlugin.ts @@ -7,22 +7,22 @@ import { sendSuccessMessage } from "../../pluginUtils"; import { zeppelinGlobalPlugin } from "../ZeppelinPluginBlueprint"; import { getActiveReload, resetActiveReload } from "./activeReload"; import { AddDashboardUserCmd } from "./commands/AddDashboardUserCmd"; +import { AddServerFromInviteCmd } from "./commands/AddServerFromInviteCmd"; import { AllowServerCmd } from "./commands/AllowServerCmd"; +import { ChannelToServerCmd } from "./commands/ChannelToServerCmd"; import { DisallowServerCmd } from "./commands/DisallowServerCmd"; import { EligibleCmd } from "./commands/EligibleCmd"; import { LeaveServerCmd } from "./commands/LeaveServerCmd"; import { ListDashboardPermsCmd } from "./commands/ListDashboardPermsCmd"; import { ListDashboardUsersCmd } from "./commands/ListDashboardUsersCmd"; +import { ProfilerDataCmd } from "./commands/ProfilerDataCmd"; +import { RateLimitPerformanceCmd } from "./commands/RateLimitPerformanceCmd"; import { ReloadGlobalPluginsCmd } from "./commands/ReloadGlobalPluginsCmd"; import { ReloadServerCmd } from "./commands/ReloadServerCmd"; import { RemoveDashboardUserCmd } from "./commands/RemoveDashboardUserCmd"; +import { RestPerformanceCmd } from "./commands/RestPerformanceCmd"; import { ServersCmd } from "./commands/ServersCmd"; import { BotControlPluginType, ConfigSchema } from "./types"; -import { ProfilerDataCmd } from "./commands/ProfilerDataCmd"; -import { AddServerFromInviteCmd } from "./commands/AddServerFromInviteCmd"; -import { ChannelToServerCmd } from "./commands/ChannelToServerCmd"; -import { RestPerformanceCmd } from "./commands/RestPerformanceCmd"; -import { RateLimitPerformanceCmd } from "./commands/RateLimitPerformanceCmd"; const defaultOptions = { config: { diff --git a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts index e46dd5dc..cbf53bf4 100644 --- a/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts +++ b/backend/src/plugins/BotControl/commands/AddServerFromInviteCmd.ts @@ -1,10 +1,10 @@ import { ApiPermissions } from "@shared/apiPermissions"; +import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { DBDateFormat, isGuildInvite, resolveInvite } from "../../../utils"; -import { botControlCmd } from "../types"; -import moment from "moment-timezone"; import { isEligible } from "../functions/isEligible"; +import { botControlCmd } from "../types"; export const AddServerFromInviteCmd = botControlCmd({ trigger: ["add_server_from_invite", "allow_server_from_invite", "adv"], diff --git a/backend/src/plugins/BotControl/commands/AllowServerCmd.ts b/backend/src/plugins/BotControl/commands/AllowServerCmd.ts index b19e44c8..ce2c3b0c 100644 --- a/backend/src/plugins/BotControl/commands/AllowServerCmd.ts +++ b/backend/src/plugins/BotControl/commands/AllowServerCmd.ts @@ -1,9 +1,9 @@ import { ApiPermissions } from "@shared/apiPermissions"; +import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { isStaffPreFilter, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { DBDateFormat, isSnowflake } from "../../../utils"; import { botControlCmd } from "../types"; -import moment from "moment-timezone"; export const AllowServerCmd = botControlCmd({ trigger: ["allow_server", "allowserver", "add_server", "addserver"], diff --git a/backend/src/plugins/BotControl/commands/EligibleCmd.ts b/backend/src/plugins/BotControl/commands/EligibleCmd.ts index 969b4a11..face42a8 100644 --- a/backend/src/plugins/BotControl/commands/EligibleCmd.ts +++ b/backend/src/plugins/BotControl/commands/EligibleCmd.ts @@ -1,8 +1,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { isGuildInvite, resolveInvite } from "../../../utils"; -import { botControlCmd } from "../types"; import { isEligible } from "../functions/isEligible"; +import { botControlCmd } from "../types"; export const EligibleCmd = botControlCmd({ trigger: ["eligible", "is_eligible", "iseligible"], diff --git a/backend/src/plugins/BotControl/commands/ProfilerDataCmd.ts b/backend/src/plugins/BotControl/commands/ProfilerDataCmd.ts index e162330a..3b5a177f 100644 --- a/backend/src/plugins/BotControl/commands/ProfilerDataCmd.ts +++ b/backend/src/plugins/BotControl/commands/ProfilerDataCmd.ts @@ -1,9 +1,9 @@ +import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { GuildArchives } from "../../../data/GuildArchives"; import { getBaseUrl } from "../../../pluginUtils"; import { sorter } from "../../../utils"; import { botControlCmd } from "../types"; -import { GuildArchives } from "../../../data/GuildArchives"; -import moment from "moment-timezone"; const sortProps = { totalTime: "TOTAL TIME", diff --git a/backend/src/plugins/BotControl/commands/RateLimitPerformanceCmd.ts b/backend/src/plugins/BotControl/commands/RateLimitPerformanceCmd.ts index bdf2b153..c97b6c55 100644 --- a/backend/src/plugins/BotControl/commands/RateLimitPerformanceCmd.ts +++ b/backend/src/plugins/BotControl/commands/RateLimitPerformanceCmd.ts @@ -1,8 +1,8 @@ -import { botControlCmd } from "../types"; -import { getRateLimitStats } from "../../../rateLimitStats"; import moment from "moment-timezone"; import { GuildArchives } from "../../../data/GuildArchives"; import { getBaseUrl, sendSuccessMessage } from "../../../pluginUtils"; +import { getRateLimitStats } from "../../../rateLimitStats"; +import { botControlCmd } from "../types"; export const RateLimitPerformanceCmd = botControlCmd({ trigger: ["rate_limit_performance"], diff --git a/backend/src/plugins/BotControl/commands/RestPerformanceCmd.ts b/backend/src/plugins/BotControl/commands/RestPerformanceCmd.ts index 737f6648..a32eb8dc 100644 --- a/backend/src/plugins/BotControl/commands/RestPerformanceCmd.ts +++ b/backend/src/plugins/BotControl/commands/RestPerformanceCmd.ts @@ -1,7 +1,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { getTopRestCallStats } from "../../../restCallStats"; import { createChunkedMessage } from "../../../utils"; import { botControlCmd } from "../types"; -import { getTopRestCallStats } from "../../../restCallStats"; const leadingPathRegex = /(?<=\().+\/backend\//g; diff --git a/backend/src/plugins/BotControl/functions/isEligible.ts b/backend/src/plugins/BotControl/functions/isEligible.ts index 164430f3..ba4dd31f 100644 --- a/backend/src/plugins/BotControl/functions/isEligible.ts +++ b/backend/src/plugins/BotControl/functions/isEligible.ts @@ -1,7 +1,7 @@ import { User } from "discord.js"; -import { BotControlPluginType } from "../types"; import { GlobalPluginData } from "knub"; import { GuildInvite } from "../../../utils"; +import { BotControlPluginType } from "../types"; const REQUIRED_MEMBER_COUNT = 5000; diff --git a/backend/src/plugins/BotControl/types.ts b/backend/src/plugins/BotControl/types.ts index 28389848..6f4139f8 100644 --- a/backend/src/plugins/BotControl/types.ts +++ b/backend/src/plugins/BotControl/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, globalPluginMessageCommand, globalPluginEventListener } from "knub"; +import { BasePluginType, globalPluginEventListener, globalPluginMessageCommand } from "knub"; import { AllowedGuilds } from "../../data/AllowedGuilds"; import { ApiPermissionAssignments } from "../../data/ApiPermissionAssignments"; import { Configs } from "../../data/Configs"; diff --git a/backend/src/plugins/Cases/CasesPlugin.ts b/backend/src/plugins/Cases/CasesPlugin.ts index b74ec590..ca946dfc 100644 --- a/backend/src/plugins/Cases/CasesPlugin.ts +++ b/backend/src/plugins/Cases/CasesPlugin.ts @@ -5,6 +5,7 @@ import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; import { mapToPublicFn } from "../../pluginUtils"; import { trimPluginDescription } from "../../utils"; +import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { createCase } from "./functions/createCase"; @@ -16,7 +17,6 @@ import { getRecentCasesByMod } from "./functions/getRecentCasesByMod"; import { getTotalCasesByMod } from "./functions/getTotalCasesByMod"; import { postCaseToCaseLogChannel } from "./functions/postToCaseLogChannel"; import { CaseArgs, CaseNoteArgs, CasesPluginType, ConfigSchema } from "./types"; -import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; const defaultOptions = { config: { diff --git a/backend/src/plugins/Cases/functions/createCase.ts b/backend/src/plugins/Cases/functions/createCase.ts index 8aa39f6f..ad5dd86f 100644 --- a/backend/src/plugins/Cases/functions/createCase.ts +++ b/backend/src/plugins/Cases/functions/createCase.ts @@ -1,10 +1,10 @@ +import type { Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { logger } from "../../../logger"; import { resolveUser } from "../../../utils"; import { CaseArgs, CasesPluginType } from "../types"; import { createCaseNote } from "./createCaseNote"; import { postCaseToCaseLogChannel } from "./postToCaseLogChannel"; -import type { Snowflake } from "discord.js"; export async function createCase(pluginData: GuildPluginData, args: CaseArgs) { const user = await resolveUser(pluginData.client, args.userId); diff --git a/backend/src/plugins/Cases/functions/getCaseEmbed.ts b/backend/src/plugins/Cases/functions/getCaseEmbed.ts index 908a47b1..3ce1f590 100644 --- a/backend/src/plugins/Cases/functions/getCaseEmbed.ts +++ b/backend/src/plugins/Cases/functions/getCaseEmbed.ts @@ -1,4 +1,4 @@ -import { escapeCodeBlock, MessageEditOptions, MessageCreateOptions } from "discord.js"; +import { escapeCodeBlock, MessageCreateOptions, MessageEditOptions } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; import { CaseTypes } from "../../../data/CaseTypes"; diff --git a/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts b/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts index c0f8b1aa..efb1feb0 100644 --- a/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts +++ b/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts @@ -2,12 +2,12 @@ import { MessageCreateOptions, NewsChannel, RESTJSONErrorCodes, Snowflake, TextC import { GuildPluginData } from "knub"; import { Case } from "../../../data/entities/Case"; import { isDiscordAPIError } from "../../../utils"; +import { InternalPosterMessageResult } from "../../InternalPoster/functions/sendMessage"; +import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { CasesPluginType } from "../types"; import { getCaseEmbed } from "./getCaseEmbed"; import { resolveCaseId } from "./resolveCaseId"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; -import { InternalPosterMessageResult } from "../../InternalPoster/functions/sendMessage"; export async function postToCaseLogChannel( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts index a0dcdf58..514ee67e 100644 --- a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts +++ b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts @@ -1,4 +1,4 @@ -import { Invite, Embed } from "discord.js"; +import { Embed, Invite } from "discord.js"; import escapeStringRegexp from "escape-string-regexp"; import { GuildPluginData } from "knub"; import cloneDeep from "lodash.clonedeep"; diff --git a/backend/src/plugins/Censor/util/censorMessage.ts b/backend/src/plugins/Censor/util/censorMessage.ts index 2241417c..5471ada4 100644 --- a/backend/src/plugins/Censor/util/censorMessage.ts +++ b/backend/src/plugins/Censor/util/censorMessage.ts @@ -3,8 +3,8 @@ import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { resolveUser } from "../../../utils"; -import { CensorPluginType } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { CensorPluginType } from "../types"; export async function censorMessage( pluginData: GuildPluginData, diff --git a/backend/src/plugins/ChannelArchiver/rehostAttachment.ts b/backend/src/plugins/ChannelArchiver/rehostAttachment.ts index b166b830..8159ddb2 100644 --- a/backend/src/plugins/ChannelArchiver/rehostAttachment.ts +++ b/backend/src/plugins/ChannelArchiver/rehostAttachment.ts @@ -1,4 +1,4 @@ -import { GuildTextBasedChannel, Attachment, MessageCreateOptions } from "discord.js"; +import { Attachment, GuildTextBasedChannel, MessageCreateOptions } from "discord.js"; import fs from "fs"; import { downloadFile } from "../../utils"; const fsp = fs.promises; diff --git a/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts b/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts index cdefd637..840207dd 100644 --- a/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts +++ b/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts @@ -2,10 +2,10 @@ import { PermissionsBitField, Snowflake, StageChannel, TextChannel, VoiceChannel import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; import { isDiscordAPIError, MINUTES } from "../../../utils"; +import { filterObject } from "../../../utils/filterObject"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { CompanionChannelsPluginType, TCompanionChannelOpts } from "../types"; import { getCompanionChannelOptsForVoiceChannelId } from "./getCompanionChannelOptsForVoiceChannelId"; -import { filterObject } from "../../../utils/filterObject"; const ERROR_COOLDOWN_KEY = "errorCooldown"; const ERROR_COOLDOWN = 5 * MINUTES; diff --git a/backend/src/plugins/ContextMenus/ContextMenuPlugin.ts b/backend/src/plugins/ContextMenus/ContextMenuPlugin.ts index 6b455f7e..bc6fa5f3 100644 --- a/backend/src/plugins/ContextMenus/ContextMenuPlugin.ts +++ b/backend/src/plugins/ContextMenus/ContextMenuPlugin.ts @@ -2,11 +2,11 @@ import { PluginOptions } from "knub"; import { GuildContextMenuLinks } from "../../data/GuildContextMenuLinks"; import { LogsPlugin } from "../Logs/LogsPlugin"; import { MutesPlugin } from "../Mutes/MutesPlugin"; +import { UtilityPlugin } from "../Utility/UtilityPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { ContextClickedEvt } from "./events/ContextClickedEvt"; import { ConfigSchema, ContextMenuPluginType } from "./types"; import { loadAllCommands } from "./utils/loadAllCommands"; -import { UtilityPlugin } from "../Utility/UtilityPlugin"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/ContextMenus/utils/loadAllCommands.ts b/backend/src/plugins/ContextMenus/utils/loadAllCommands.ts index e9c2e3c6..97d73dfb 100644 --- a/backend/src/plugins/ContextMenus/utils/loadAllCommands.ts +++ b/backend/src/plugins/ContextMenus/utils/loadAllCommands.ts @@ -1,6 +1,6 @@ import { ApplicationCommandData, ApplicationCommandType } from "discord.js"; -import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin"; import { GuildPluginData } from "knub"; +import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin"; import { ContextMenuPluginType } from "../types"; import { hardcodedContext } from "./hardcodedContextOptions"; diff --git a/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts b/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts index 6f8873ea..7f0b7c97 100644 --- a/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts +++ b/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts @@ -1,18 +1,18 @@ -import { parseSignature, guildPluginMessageCommand } from "knub"; +import { GuildChannel, GuildMember, User } from "discord.js"; +import { guildPluginMessageCommand, parseSignature } from "knub"; import { commandTypes } from "../../commandTypes"; -import { UnknownUser } from "../../utils"; -import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; -import { runEvent } from "./functions/runEvent"; -import { ConfigSchema, CustomEventsPluginType } from "./types"; import { createTypedTemplateSafeValueContainer, TemplateSafeValueContainer } from "../../templateFormatter"; -import { GuildChannel, GuildMember, ThreadChannel, User } from "discord.js"; +import { UnknownUser } from "../../utils"; +import { isScalar } from "../../utils/isScalar"; import { channelToTemplateSafeChannel, memberToTemplateSafeMember, messageToTemplateSafeMessage, userToTemplateSafeUser, } from "../../utils/templateSafeObjects"; -import { isScalar } from "../../utils/isScalar"; +import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; +import { runEvent } from "./functions/runEvent"; +import { ConfigSchema, CustomEventsPluginType } from "./types"; const defaultOptions = { config: { diff --git a/backend/src/plugins/CustomEvents/actions/makeRoleMentionableAction.ts b/backend/src/plugins/CustomEvents/actions/makeRoleMentionableAction.ts index 95eb0380..a372bb0e 100644 --- a/backend/src/plugins/CustomEvents/actions/makeRoleMentionableAction.ts +++ b/backend/src/plugins/CustomEvents/actions/makeRoleMentionableAction.ts @@ -1,10 +1,10 @@ import { Snowflake } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; +import { TemplateSafeValueContainer } from "../../../templateFormatter"; import { convertDelayStringToMS, noop, tDelayString } from "../../../utils"; import { ActionError } from "../ActionError"; import { CustomEventsPluginType, TCustomEvent } from "../types"; -import { TemplateSafeValueContainer } from "../../../templateFormatter"; export const MakeRoleMentionableAction = t.type({ type: t.literal("make_role_mentionable"), diff --git a/backend/src/plugins/CustomEvents/actions/makeRoleUnmentionableAction.ts b/backend/src/plugins/CustomEvents/actions/makeRoleUnmentionableAction.ts index d245d33d..f5ab5bc8 100644 --- a/backend/src/plugins/CustomEvents/actions/makeRoleUnmentionableAction.ts +++ b/backend/src/plugins/CustomEvents/actions/makeRoleUnmentionableAction.ts @@ -1,9 +1,9 @@ import { Snowflake } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; +import { TemplateSafeValueContainer } from "../../../templateFormatter"; import { ActionError } from "../ActionError"; import { CustomEventsPluginType, TCustomEvent } from "../types"; -import { TemplateSafeValueContainer } from "../../../templateFormatter"; export const MakeRoleUnmentionableAction = t.type({ type: t.literal("make_role_unmentionable"), diff --git a/backend/src/plugins/CustomEvents/actions/setChannelPermissionOverrides.ts b/backend/src/plugins/CustomEvents/actions/setChannelPermissionOverrides.ts index c0d9e873..71cf8785 100644 --- a/backend/src/plugins/CustomEvents/actions/setChannelPermissionOverrides.ts +++ b/backend/src/plugins/CustomEvents/actions/setChannelPermissionOverrides.ts @@ -1,9 +1,9 @@ -import { Snowflake, PermissionsString, PermissionsBitField } from "discord.js"; +import { PermissionsBitField, PermissionsString, Snowflake } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; +import { TemplateSafeValueContainer } from "../../../templateFormatter"; import { ActionError } from "../ActionError"; import { CustomEventsPluginType, TCustomEvent } from "../types"; -import { TemplateSafeValueContainer } from "../../../templateFormatter"; export const SetChannelPermissionOverridesAction = t.type({ type: t.literal("set_channel_permission_overrides"), diff --git a/backend/src/plugins/CustomEvents/functions/runEvent.ts b/backend/src/plugins/CustomEvents/functions/runEvent.ts index 063b0c26..8e38b9ab 100644 --- a/backend/src/plugins/CustomEvents/functions/runEvent.ts +++ b/backend/src/plugins/CustomEvents/functions/runEvent.ts @@ -1,6 +1,7 @@ import { Message } from "discord.js"; import { GuildPluginData } from "knub"; import { sendErrorMessage } from "../../../pluginUtils"; +import { TemplateSafeValueContainer } from "../../../templateFormatter"; import { ActionError } from "../ActionError"; import { addRoleAction } from "../actions/addRoleAction"; import { createCaseAction } from "../actions/createCaseAction"; @@ -10,7 +11,6 @@ import { messageAction } from "../actions/messageAction"; import { moveToVoiceChannelAction } from "../actions/moveToVoiceChannelAction"; import { setChannelPermissionOverridesAction } from "../actions/setChannelPermissionOverrides"; import { CustomEventsPluginType, TCustomEvent } from "../types"; -import { TemplateSafeValueContainer } from "../../../templateFormatter"; export async function runEvent( pluginData: GuildPluginData, diff --git a/backend/src/plugins/GuildAccessMonitor/GuildAccessMonitorPlugin.ts b/backend/src/plugins/GuildAccessMonitor/GuildAccessMonitorPlugin.ts index f0753139..866f4eab 100644 --- a/backend/src/plugins/GuildAccessMonitor/GuildAccessMonitorPlugin.ts +++ b/backend/src/plugins/GuildAccessMonitor/GuildAccessMonitorPlugin.ts @@ -2,9 +2,9 @@ import { Guild } from "discord.js"; import * as t from "io-ts"; import { BasePluginType, GlobalPluginData, globalPluginEventListener } from "knub"; import { AllowedGuilds } from "../../data/AllowedGuilds"; -import { zeppelinGlobalPlugin } from "../ZeppelinPluginBlueprint"; -import { env } from "../../env"; import { Configs } from "../../data/Configs"; +import { env } from "../../env"; +import { zeppelinGlobalPlugin } from "../ZeppelinPluginBlueprint"; interface GuildAccessMonitorPluginType extends BasePluginType { config: {}; diff --git a/backend/src/plugins/GuildInfoSaver/GuildInfoSaverPlugin.ts b/backend/src/plugins/GuildInfoSaver/GuildInfoSaverPlugin.ts index 3ba15c30..cb7464aa 100644 --- a/backend/src/plugins/GuildInfoSaver/GuildInfoSaverPlugin.ts +++ b/backend/src/plugins/GuildInfoSaver/GuildInfoSaverPlugin.ts @@ -1,11 +1,11 @@ +import { Guild } from "discord.js"; import * as t from "io-ts"; import { guildPluginEventListener } from "knub"; import { AllowedGuilds } from "../../data/AllowedGuilds"; +import { ApiPermissionAssignments } from "../../data/ApiPermissionAssignments"; import { MINUTES } from "../../utils"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { GuildInfoSaverPluginType } from "./types"; -import { Guild } from "discord.js"; -import { ApiPermissionAssignments } from "../../data/ApiPermissionAssignments"; export const GuildInfoSaverPlugin = zeppelinGuildPlugin()({ name: "guild_info_saver", diff --git a/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts b/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts index 236025fb..c7b260e8 100644 --- a/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts +++ b/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts @@ -1,11 +1,11 @@ import { PluginOptions } from "knub"; -import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; -import { ConfigSchema, InternalPosterPluginType } from "./types"; -import { mapToPublicFn } from "../../pluginUtils"; import { Webhooks } from "../../data/Webhooks"; +import { mapToPublicFn } from "../../pluginUtils"; import { Queue } from "../../Queue"; -import { sendMessage } from "./functions/sendMessage"; +import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { editMessage } from "./functions/editMessage"; +import { sendMessage } from "./functions/sendMessage"; +import { ConfigSchema, InternalPosterPluginType } from "./types"; const defaultOptions: PluginOptions = { config: {}, diff --git a/backend/src/plugins/InternalPoster/functions/editMessage.ts b/backend/src/plugins/InternalPoster/functions/editMessage.ts index 0c11a579..ce250df0 100644 --- a/backend/src/plugins/InternalPoster/functions/editMessage.ts +++ b/backend/src/plugins/InternalPoster/functions/editMessage.ts @@ -1,7 +1,7 @@ import { Message, MessageEditOptions, WebhookClient, WebhookMessageEditOptions } from "discord.js"; import { GuildPluginData } from "knub"; -import { InternalPosterPluginType } from "../types"; import { isDiscordAPIError, noop } from "../../../utils"; +import { InternalPosterPluginType } from "../types"; /** * Sends a message using a webhook or direct API requests, preferring webhooks when possible. diff --git a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts index aea1523c..b97e2cde 100644 --- a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts +++ b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts @@ -1,6 +1,6 @@ +import { WebhookClient } from "discord.js"; import { GuildPluginData } from "knub"; import { InternalPosterPluginType } from "../types"; -import { WebhookClient } from "discord.js"; import { getOrCreateWebhookForChannel, WebhookableChannel } from "./getOrCreateWebhookForChannel"; export async function getOrCreateWebhookClientForChannel( diff --git a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts index 254a8ab7..d5784212 100644 --- a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts +++ b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts @@ -1,7 +1,7 @@ -import { GuildPluginData } from "knub"; -import { InternalPosterPluginType } from "../types"; import { GuildBasedChannel, PermissionsBitField } from "discord.js"; +import { GuildPluginData } from "knub"; import { isDiscordAPIError } from "../../../utils"; +import { InternalPosterPluginType } from "../types"; type WebhookInfo = [id: string, token: string]; diff --git a/backend/src/plugins/InternalPoster/functions/sendMessage.ts b/backend/src/plugins/InternalPoster/functions/sendMessage.ts index b577db52..ec811240 100644 --- a/backend/src/plugins/InternalPoster/functions/sendMessage.ts +++ b/backend/src/plugins/InternalPoster/functions/sendMessage.ts @@ -1,9 +1,9 @@ import { GuildTextBasedChannel, MessageCreateOptions, WebhookClient } from "discord.js"; import { GuildPluginData } from "knub"; -import { InternalPosterPluginType } from "../types"; -import { channelIsWebhookable } from "./getOrCreateWebhookForChannel"; import { isDiscordAPIError } from "../../../utils"; +import { InternalPosterPluginType } from "../types"; import { getOrCreateWebhookClientForChannel } from "./getOrCreateWebhookClientForChannel"; +import { channelIsWebhookable } from "./getOrCreateWebhookForChannel"; export type InternalPosterMessageResult = { id: string; diff --git a/backend/src/plugins/InternalPoster/types.ts b/backend/src/plugins/InternalPoster/types.ts index 54a0ed01..2c4447eb 100644 --- a/backend/src/plugins/InternalPoster/types.ts +++ b/backend/src/plugins/InternalPoster/types.ts @@ -1,8 +1,8 @@ +import { WebhookClient } from "discord.js"; import * as t from "io-ts"; import { BasePluginType } from "knub"; import { Webhooks } from "../../data/Webhooks"; import { Queue } from "../../Queue"; -import { WebhookClient } from "discord.js"; export const ConfigSchema = t.type({}); export type TConfigSchema = t.TypeOf; diff --git a/backend/src/plugins/LocateUser/LocateUserPlugin.ts b/backend/src/plugins/LocateUser/LocateUserPlugin.ts index ef479ba1..8c3cc5a3 100644 --- a/backend/src/plugins/LocateUser/LocateUserPlugin.ts +++ b/backend/src/plugins/LocateUser/LocateUserPlugin.ts @@ -1,4 +1,5 @@ import { PluginOptions } from "knub"; +import { onGuildEvent } from "../../data/GuildEvents"; import { GuildVCAlerts } from "../../data/GuildVCAlerts"; import { trimPluginDescription } from "../../utils"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; @@ -8,9 +9,8 @@ import { WhereCmd } from "./commands/WhereCmd"; import { GuildBanRemoveAlertsEvt } from "./events/BanRemoveAlertsEvt"; import { VoiceStateUpdateAlertEvt } from "./events/SendAlertsEvts"; import { ConfigSchema, LocateUserPluginType } from "./types"; -import { fillActiveAlertsList } from "./utils/fillAlertsList"; -import { onGuildEvent } from "../../data/GuildEvents"; import { clearExpiredAlert } from "./utils/clearExpiredAlert"; +import { fillActiveAlertsList } from "./utils/fillAlertsList"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/LocateUser/commands/FollowCmd.ts b/backend/src/plugins/LocateUser/commands/FollowCmd.ts index 82f84e50..1011f771 100644 --- a/backend/src/plugins/LocateUser/commands/FollowCmd.ts +++ b/backend/src/plugins/LocateUser/commands/FollowCmd.ts @@ -1,10 +1,10 @@ import humanizeDuration from "humanize-duration"; import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { registerExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { MINUTES, SECONDS } from "../../../utils"; import { locateUserCmd } from "../types"; -import { registerExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop"; export const FollowCmd = locateUserCmd({ trigger: ["follow", "f"], diff --git a/backend/src/plugins/LocateUser/commands/ListFollowCmd.ts b/backend/src/plugins/LocateUser/commands/ListFollowCmd.ts index 5db75917..d598d8a9 100644 --- a/backend/src/plugins/LocateUser/commands/ListFollowCmd.ts +++ b/backend/src/plugins/LocateUser/commands/ListFollowCmd.ts @@ -1,8 +1,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { createChunkedMessage, sorter } from "../../../utils"; import { locateUserCmd } from "../types"; -import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop"; export const ListFollowCmd = locateUserCmd({ trigger: ["follows", "fs"], diff --git a/backend/src/plugins/LocateUser/events/BanRemoveAlertsEvt.ts b/backend/src/plugins/LocateUser/events/BanRemoveAlertsEvt.ts index 42b71312..aead6776 100644 --- a/backend/src/plugins/LocateUser/events/BanRemoveAlertsEvt.ts +++ b/backend/src/plugins/LocateUser/events/BanRemoveAlertsEvt.ts @@ -1,5 +1,5 @@ -import { locateUserEvt } from "../types"; import { clearExpiringVCAlert } from "../../../data/loops/expiringVCAlertsLoop"; +import { locateUserEvt } from "../types"; export const GuildBanRemoveAlertsEvt = locateUserEvt({ event: "guildBanAdd", diff --git a/backend/src/plugins/LocateUser/types.ts b/backend/src/plugins/LocateUser/types.ts index dedfd57b..1bfb063e 100644 --- a/backend/src/plugins/LocateUser/types.ts +++ b/backend/src/plugins/LocateUser/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildVCAlerts } from "../../data/GuildVCAlerts"; export const ConfigSchema = t.type({ diff --git a/backend/src/plugins/LocateUser/utils/clearExpiredAlert.ts b/backend/src/plugins/LocateUser/utils/clearExpiredAlert.ts index 5ee86836..9683417b 100644 --- a/backend/src/plugins/LocateUser/utils/clearExpiredAlert.ts +++ b/backend/src/plugins/LocateUser/utils/clearExpiredAlert.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; +import { VCAlert } from "../../../data/entities/VCAlert"; import { LocateUserPluginType } from "../types"; import { removeUserIdFromActiveAlerts } from "./removeUserIdFromActiveAlerts"; -import { VCAlert } from "../../../data/entities/VCAlert"; export async function clearExpiredAlert(pluginData: GuildPluginData, alert: VCAlert) { await pluginData.state.alerts.delete(alert.id); diff --git a/backend/src/plugins/LocateUser/utils/moveMember.ts b/backend/src/plugins/LocateUser/utils/moveMember.ts index 81d1d896..8d044d59 100644 --- a/backend/src/plugins/LocateUser/utils/moveMember.ts +++ b/backend/src/plugins/LocateUser/utils/moveMember.ts @@ -1,4 +1,4 @@ -import { GuildMember, Snowflake, GuildTextBasedChannel } from "discord.js"; +import { GuildMember, GuildTextBasedChannel, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { sendErrorMessage } from "../../../pluginUtils"; import { LocateUserPluginType } from "../types"; diff --git a/backend/src/plugins/Logs/LogsPlugin.ts b/backend/src/plugins/Logs/LogsPlugin.ts index 665c715e..f9ea27e7 100644 --- a/backend/src/plugins/Logs/LogsPlugin.ts +++ b/backend/src/plugins/Logs/LogsPlugin.ts @@ -6,18 +6,12 @@ import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { LogType } from "../../data/LogType"; import { logger } from "../../logger"; +import { mapToPublicFn } from "../../pluginUtils"; import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners"; +import { createTypedTemplateSafeValueContainer, TypedTemplateSafeValueContainer } from "../../templateFormatter"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { LogsChannelCreateEvt, LogsChannelDeleteEvt, LogsChannelUpdateEvt } from "./events/LogsChannelModifyEvts"; -import { LogsGuildMemberAddEvt } from "./events/LogsGuildMemberAddEvt"; -import { LogsGuildMemberRemoveEvt } from "./events/LogsGuildMemberRemoveEvt"; -import { LogsRoleCreateEvt, LogsRoleDeleteEvt, LogsRoleUpdateEvt } from "./events/LogsRoleModifyEvts"; -import { - LogsStageInstanceCreateEvt, - LogsStageInstanceDeleteEvt, - LogsStageInstanceUpdateEvt, -} from "./events/LogsStageInstanceModifyEvts"; import { LogsEmojiCreateEvt, LogsEmojiDeleteEvt, @@ -26,6 +20,14 @@ import { LogsStickerDeleteEvt, LogsStickerUpdateEvt, } from "./events/LogsEmojiAndStickerModifyEvts"; +import { LogsGuildMemberAddEvt } from "./events/LogsGuildMemberAddEvt"; +import { LogsGuildMemberRemoveEvt } from "./events/LogsGuildMemberRemoveEvt"; +import { LogsRoleCreateEvt, LogsRoleDeleteEvt, LogsRoleUpdateEvt } from "./events/LogsRoleModifyEvts"; +import { + LogsStageInstanceCreateEvt, + LogsStageInstanceDeleteEvt, + LogsStageInstanceUpdateEvt, +} from "./events/LogsStageInstanceModifyEvts"; import { LogsThreadCreateEvt, LogsThreadDeleteEvt, LogsThreadUpdateEvt } from "./events/LogsThreadModifyEvts"; import { LogsGuildMemberUpdateEvt } from "./events/LogsUserUpdateEvts"; import { LogsVoiceStateUpdateEvt } from "./events/LogsVoiceChannelEvts"; @@ -35,9 +37,9 @@ import { log } from "./util/log"; import { onMessageDelete } from "./util/onMessageDelete"; import { onMessageDeleteBulk } from "./util/onMessageDeleteBulk"; import { onMessageUpdate } from "./util/onMessageUpdate"; -import { createTypedTemplateSafeValueContainer, TypedTemplateSafeValueContainer } from "../../templateFormatter"; -import { mapToPublicFn } from "../../pluginUtils"; +import { escapeCodeBlock } from "discord.js"; +import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; import { logAutomodAction } from "./logFunctions/logAutomodAction"; import { logBotAlert } from "./logFunctions/logBotAlert"; import { logCaseCreate } from "./logFunctions/logCaseCreate"; @@ -48,6 +50,7 @@ import { logChannelCreate } from "./logFunctions/logChannelCreate"; import { logChannelDelete } from "./logFunctions/logChannelDelete"; import { logChannelUpdate } from "./logFunctions/logChannelUpdate"; import { logClean } from "./logFunctions/logClean"; +import { logDmFailed } from "./logFunctions/logDmFailed"; import { logEmojiCreate } from "./logFunctions/logEmojiCreate"; import { logEmojiDelete } from "./logFunctions/logEmojiDelete"; import { logEmojiUpdate } from "./logFunctions/logEmojiUpdate"; @@ -71,6 +74,7 @@ import { logMemberRoleChanges } from "./logFunctions/logMemberRoleChanges"; import { logMemberRoleRemove } from "./logFunctions/logMemberRoleRemove"; import { logMemberTimedBan } from "./logFunctions/logMemberTimedBan"; import { logMemberTimedMute } from "./logFunctions/logMemberTimedMute"; +import { logMemberTimedUnban } from "./logFunctions/logMemberTimedUnban"; import { logMemberTimedUnmute } from "./logFunctions/logMemberTimedUnmute"; import { logMemberUnban } from "./logFunctions/logMemberUnban"; import { logMemberUnmute } from "./logFunctions/logMemberUnmute"; @@ -105,10 +109,6 @@ import { logVoiceChannelForceMove } from "./logFunctions/logVoiceChannelForceMov import { logVoiceChannelJoin } from "./logFunctions/logVoiceChannelJoin"; import { logVoiceChannelLeave } from "./logFunctions/logVoiceChannelLeave"; import { logVoiceChannelMove } from "./logFunctions/logVoiceChannelMove"; -import { logMemberTimedUnban } from "./logFunctions/logMemberTimedUnban"; -import { logDmFailed } from "./logFunctions/logDmFailed"; -import { InternalPosterPlugin } from "../InternalPoster/InternalPosterPlugin"; -import { escapeCodeBlock } from "discord.js"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts b/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts index 2a2e2639..79c06dcf 100644 --- a/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts @@ -1,10 +1,10 @@ +import { TextChannel, VoiceChannel } from "discord.js"; import { differenceToString, getScalarDifference } from "../../../utils"; -import { logsEvt } from "../types"; +import { filterObject } from "../../../utils/filterObject"; import { logChannelCreate } from "../logFunctions/logChannelCreate"; import { logChannelDelete } from "../logFunctions/logChannelDelete"; import { logChannelUpdate } from "../logFunctions/logChannelUpdate"; -import { TextChannel, VoiceChannel } from "discord.js"; -import { filterObject } from "../../../utils/filterObject"; +import { logsEvt } from "../types"; export const LogsChannelCreateEvt = logsEvt({ event: "channelCreate", diff --git a/backend/src/plugins/Logs/events/LogsEmojiAndStickerModifyEvts.ts b/backend/src/plugins/Logs/events/LogsEmojiAndStickerModifyEvts.ts index c253ca18..414073cf 100644 --- a/backend/src/plugins/Logs/events/LogsEmojiAndStickerModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsEmojiAndStickerModifyEvts.ts @@ -1,13 +1,13 @@ +import { GuildEmoji, Sticker } from "discord.js"; import { differenceToString, getScalarDifference } from "../../../utils"; -import { logsEvt } from "../types"; +import { filterObject } from "../../../utils/filterObject"; import { logEmojiCreate } from "../logFunctions/logEmojiCreate"; import { logEmojiDelete } from "../logFunctions/logEmojiDelete"; import { logEmojiUpdate } from "../logFunctions/logEmojiUpdate"; import { logStickerCreate } from "../logFunctions/logStickerCreate"; import { logStickerDelete } from "../logFunctions/logStickerDelete"; import { logStickerUpdate } from "../logFunctions/logStickerUpdate"; -import { GuildEmoji, Sticker } from "discord.js"; -import { filterObject } from "../../../utils/filterObject"; +import { logsEvt } from "../types"; export const LogsEmojiCreateEvt = logsEvt({ event: "emojiCreate", diff --git a/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts b/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts index ce33cb6d..1fda8b80 100644 --- a/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts +++ b/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts @@ -1,10 +1,10 @@ import { AuditLogEvent } from "discord.js"; import { LogType } from "../../../data/LogType"; -import { logsEvt } from "../types"; -import { logMemberBan } from "../logFunctions/logMemberBan"; -import { isLogIgnored } from "../util/isLogIgnored"; -import { logMemberUnban } from "../logFunctions/logMemberUnban"; import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; +import { logMemberBan } from "../logFunctions/logMemberBan"; +import { logMemberUnban } from "../logFunctions/logMemberUnban"; +import { logsEvt } from "../types"; +import { isLogIgnored } from "../util/isLogIgnored"; export const LogsGuildBanAddEvt = logsEvt({ event: "guildBanAdd", diff --git a/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts b/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts index fca30f99..31e3ecd0 100644 --- a/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts +++ b/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts @@ -1,5 +1,5 @@ -import { logsEvt } from "../types"; import { logMemberJoin } from "../logFunctions/logMemberJoin"; +import { logsEvt } from "../types"; export const LogsGuildMemberAddEvt = logsEvt({ event: "guildMemberAdd", diff --git a/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts b/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts index 858d3bc8..5c3fc923 100644 --- a/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts +++ b/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts @@ -1,5 +1,5 @@ -import { logsEvt } from "../types"; import { logMemberLeave } from "../logFunctions/logMemberLeave"; +import { logsEvt } from "../types"; export const LogsGuildMemberRemoveEvt = logsEvt({ event: "guildMemberRemove", diff --git a/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts b/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts index b865e10c..c44a4894 100644 --- a/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts @@ -1,10 +1,10 @@ +import { Role } from "discord.js"; import { differenceToString, getScalarDifference } from "../../../utils"; -import { logsEvt } from "../types"; +import { filterObject } from "../../../utils/filterObject"; import { logRoleCreate } from "../logFunctions/logRoleCreate"; import { logRoleDelete } from "../logFunctions/logRoleDelete"; import { logRoleUpdate } from "../logFunctions/logRoleUpdate"; -import { Role } from "discord.js"; -import { filterObject } from "../../../utils/filterObject"; +import { logsEvt } from "../types"; export const LogsRoleCreateEvt = logsEvt({ event: "roleCreate", diff --git a/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts b/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts index bcfeb62e..202fee0d 100644 --- a/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts @@ -1,10 +1,10 @@ -import { differenceToString, getScalarDifference } from "../../../utils"; -import { logsEvt } from "../types"; -import { logStageInstanceCreate } from "../logFunctions/logStageInstanceCreate"; import { StageChannel, StageInstance } from "discord.js"; +import { differenceToString, getScalarDifference } from "../../../utils"; +import { filterObject } from "../../../utils/filterObject"; +import { logStageInstanceCreate } from "../logFunctions/logStageInstanceCreate"; import { logStageInstanceDelete } from "../logFunctions/logStageInstanceDelete"; import { logStageInstanceUpdate } from "../logFunctions/logStageInstanceUpdate"; -import { filterObject } from "../../../utils/filterObject"; +import { logsEvt } from "../types"; export const LogsStageInstanceCreateEvt = logsEvt({ event: "stageInstanceCreate", diff --git a/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts b/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts index d3dba8d0..2568a1bc 100644 --- a/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts @@ -1,10 +1,10 @@ +import { ThreadChannel } from "discord.js"; import { differenceToString, getScalarDifference } from "../../../utils"; -import { logsEvt } from "../types"; +import { filterObject } from "../../../utils/filterObject"; import { logThreadCreate } from "../logFunctions/logThreadCreate"; import { logThreadDelete } from "../logFunctions/logThreadDelete"; import { logThreadUpdate } from "../logFunctions/logThreadUpdate"; -import { ThreadChannel } from "discord.js"; -import { filterObject } from "../../../utils/filterObject"; +import { logsEvt } from "../types"; export const LogsThreadCreateEvt = logsEvt({ event: "threadCreate", diff --git a/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts b/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts index 2ffe0f90..2fee32ab 100644 --- a/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts +++ b/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts @@ -1,11 +1,11 @@ import diff from "lodash.difference"; import isEqual from "lodash.isequal"; import { LogType } from "../../../data/LogType"; -import { logsEvt } from "../types"; import { logMemberNickChange } from "../logFunctions/logMemberNickChange"; -import { logMemberRoleChanges } from "../logFunctions/logMemberRoleChanges"; import { logMemberRoleAdd } from "../logFunctions/logMemberRoleAdd"; +import { logMemberRoleChanges } from "../logFunctions/logMemberRoleChanges"; import { logMemberRoleRemove } from "../logFunctions/logMemberRoleRemove"; +import { logsEvt } from "../types"; export const LogsGuildMemberUpdateEvt = logsEvt({ event: "guildMemberUpdate", diff --git a/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts b/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts index 484650e9..4b21610e 100644 --- a/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts +++ b/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts @@ -1,7 +1,7 @@ -import { logsEvt } from "../types"; -import { logVoiceChannelLeave } from "../logFunctions/logVoiceChannelLeave"; import { logVoiceChannelJoin } from "../logFunctions/logVoiceChannelJoin"; +import { logVoiceChannelLeave } from "../logFunctions/logVoiceChannelLeave"; import { logVoiceChannelMove } from "../logFunctions/logVoiceChannelMove"; +import { logsEvt } from "../types"; export const LogsVoiceStateUpdateEvt = logsEvt({ event: "voiceStateUpdate", diff --git a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts index d7046826..2a2fd69c 100644 --- a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts +++ b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogAutomodActionData { rule: string; diff --git a/backend/src/plugins/Logs/logFunctions/logBotAlert.ts b/backend/src/plugins/Logs/logFunctions/logBotAlert.ts index 9f47dea0..1438b249 100644 --- a/backend/src/plugins/Logs/logFunctions/logBotAlert.ts +++ b/backend/src/plugins/Logs/logFunctions/logBotAlert.ts @@ -1,8 +1,8 @@ import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogBotAlertData { body: string; diff --git a/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts b/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts index 412dc8fa..d2fe96b9 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogCaseCreateData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts index 85c2e0d8..adc3bfa0 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; -import { caseToTemplateSafeCase, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; import { Case } from "../../../data/entities/Case"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { caseToTemplateSafeCase, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogCaseDeleteData { mod: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts b/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts index d8db4499..4c8b8fd6 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogCaseUpdateData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logCensor.ts b/backend/src/plugins/Logs/logFunctions/logCensor.ts index b5106f45..e6572a0f 100644 --- a/backend/src/plugins/Logs/logFunctions/logCensor.ts +++ b/backend/src/plugins/Logs/logFunctions/logCensor.ts @@ -1,18 +1,18 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { deactivateMentions, disableCodeBlocks } from "knub/dist/helpers"; +import { resolveChannelIds } from "src/utils/resolveChannelIds"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { UnknownUser } from "../../../utils"; import { channelToTemplateSafeChannel, savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; -import { UnknownUser } from "../../../utils"; -import { deactivateMentions, disableCodeBlocks } from "knub/dist/helpers"; -import { resolveChannelIds } from "src/utils/resolveChannelIds"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogCensorData { user: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts b/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts index 0ccf81ad..be8adf8c 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogChannelCreateData { channel: GuildBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts b/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts index c96a1a29..6078f311 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogChannelDeleteData { channel: GuildBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts b/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts index 0aa850ef..2963520a 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogChannelUpdateData { oldChannel: GuildBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logClean.ts b/backend/src/plugins/Logs/logFunctions/logClean.ts index be47b69f..2a156868 100644 --- a/backend/src/plugins/Logs/logFunctions/logClean.ts +++ b/backend/src/plugins/Logs/logFunctions/logClean.ts @@ -1,11 +1,11 @@ +import { GuildTextBasedChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { User, GuildTextBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogCleanData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logDmFailed.ts b/backend/src/plugins/Logs/logFunctions/logDmFailed.ts index 32ba3bde..4b540624 100644 --- a/backend/src/plugins/Logs/logFunctions/logDmFailed.ts +++ b/backend/src/plugins/Logs/logFunctions/logDmFailed.ts @@ -1,11 +1,11 @@ +import { User } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; -import { User } from "discord.js"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogDmFailedData { source: string; diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts b/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts index d49d940b..11c6c0d9 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Emoji } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogEmojiCreateData { emoji: Emoji; diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts b/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts index 6f5b717c..4ef31c4e 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Emoji } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogEmojiDeleteData { emoji: Emoji; diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts b/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts index 9934a045..3d455530 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Emoji } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogEmojiUpdateData { oldEmoji: Emoji; diff --git a/backend/src/plugins/Logs/logFunctions/logMassBan.ts b/backend/src/plugins/Logs/logFunctions/logMassBan.ts index e920fe03..6f2695cc 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassBan.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMassBanData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMassMute.ts b/backend/src/plugins/Logs/logFunctions/logMassMute.ts index f7a510a9..74c8694b 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassMute.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMassMuteData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMassUnban.ts b/backend/src/plugins/Logs/logFunctions/logMassUnban.ts index 138c5be9..59709bef 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassUnban.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMassUnbanData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberBan.ts b/backend/src/plugins/Logs/logFunctions/logMemberBan.ts index dd6184db..cdeaec62 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberBan.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberBanData { mod: User | UnknownUser | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts b/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts index 2f9acaa3..dc47736c 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, Snowflake } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberForcebanData { mod: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts b/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts index 0daf7a33..f1368209 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts @@ -1,12 +1,12 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; -import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; -import moment from "moment-timezone"; import humanizeDuration from "humanize-duration"; +import { GuildPluginData } from "knub"; +import moment from "moment-timezone"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberJoinData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts b/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts index 92ca6cb7..01cbd81f 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberJoinWithPriorRecordsData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberKick.ts b/backend/src/plugins/Logs/logFunctions/logMemberKick.ts index 72d3bf37..e60f1124 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberKick.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberKick.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberKickData { mod: User | UnknownUser | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts b/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts index 05460a20..8753b68b 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, PartialGuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberLeaveData { member: GuildMember | PartialGuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMute.ts b/backend/src/plugins/Logs/logFunctions/logMemberMute.ts index a4366902..76e7f352 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMute.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberMuteData { mod: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts b/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts index 1a969120..24e52aba 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts @@ -1,15 +1,15 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { UnknownUser } from "../../../utils"; import { memberToTemplateSafeMember, TemplateSafeUnknownMember, TemplateSafeUnknownUser, } from "../../../utils/templateSafeObjects"; -import { UnknownUser } from "../../../utils"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberMuteExpiredData { member: GuildMember | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts b/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts index fcd9a641..455a13d8 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberMuteRejoinData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts b/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts index ddab9b08..437dfa02 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberNickChangeData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberNote.ts b/backend/src/plugins/Logs/logFunctions/logMemberNote.ts index 4f05c9a9..c81ccb7a 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberNote.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberNote.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberNoteData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts b/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts index d6eab53f..b93b5558 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberRestoreData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts index 2db68838..e5175e3d 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, Role, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberRoleAddData { mod: User | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts index 7eee36a9..3af76352 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, Role, User } from "discord.js"; -import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberRoleChangesData { mod: User | UnknownUser | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts index 54dfff29..67ce1c38 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, Role, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberRoleRemoveData { mod: User | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts index aa4c7846..ecc1d2a2 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberTimedBanData { mod: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts index 70fd663c..4ef04bed 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberTimedMuteData { mod: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts index 8716157b..ada44504 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberTimedUnbanData { mod: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts index 72ccea64..ce036761 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberTimedUnmuteData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts b/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts index 25b4c82e..305bbada 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Snowflake, User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberUnbanData { mod: User | UnknownUser | null; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts b/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts index 4af6dfc5..5afbf075 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberUnmuteData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts index 180582b1..8cdc533b 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMemberWarnData { mod: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts index 2531030d..4e04c49f 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts @@ -1,19 +1,19 @@ -import { GuildPluginData } from "knub"; -import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import moment from "moment-timezone"; +import { ISavedMessageAttachmentData, SavedMessage } from "../../../data/entities/SavedMessage"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { UnknownUser, useMediaUrls } from "../../../utils"; +import { resolveChannelIds } from "../../../utils/resolveChannelIds"; import { channelToTemplateSafeChannel, savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import moment from "moment-timezone"; -import { ISavedMessageAttachmentData, SavedMessage } from "../../../data/entities/SavedMessage"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; -import { UnknownUser, useMediaUrls } from "../../../utils"; -import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageDeleteData { user: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts index af43512f..32cfcfa7 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts @@ -1,17 +1,17 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildBasedChannel, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { UnknownUser } from "../../../utils"; +import { resolveChannelIds } from "../../../utils/resolveChannelIds"; import { channelToTemplateSafeChannel, savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; -import { UnknownUser } from "../../../utils"; -import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageDeleteAutoData { message: SavedMessage; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts index f9289f36..8e1787ab 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageDeleteBareData { messageId: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts index c7f8af26..46ca1648 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageDeleteBulkData { count: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts index be2e8f27..73c669ef 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts @@ -1,17 +1,17 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { UnknownUser } from "../../../utils"; +import { resolveChannelIds } from "../../../utils/resolveChannelIds"; import { channelToTemplateSafeChannel, savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; -import { UnknownUser } from "../../../utils"; -import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageEditData { user: User | UnknownUser; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts b/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts index 34244060..5a79e5ab 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember, GuildTextBasedChannel } from "discord.js"; -import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogMessageSpamDetectedData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts b/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts index d4c4d0c5..9cbd8b25 100644 --- a/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts +++ b/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogOtherSpamDetectedData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts b/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts index 98f7e171..e92d0292 100644 --- a/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; -import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogPostedScheduledMessageData { author: User; diff --git a/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts b/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts index 5fa1d39c..227ca7f7 100644 --- a/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; -import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogRepeatedMessageData { author: User; diff --git a/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts b/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts index b4137bf2..9bb177d6 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Role } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogRoleCreateData { role: Role; diff --git a/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts b/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts index bce63794..0ec6e87a 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Role } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogRoleDeleteData { role: Role; diff --git a/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts b/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts index be36dfda..caf8b0c5 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Role } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogRoleUpdateData { oldRole: Role; diff --git a/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts b/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts index dce8874c..098b7918 100644 --- a/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; -import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogScheduledMessageData { author: User; diff --git a/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts b/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts index 2a289e2a..dc4c4200 100644 --- a/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { GuildTextBasedChannel, User } from "discord.js"; -import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogScheduledRepeatedMessageData { author: User; diff --git a/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts b/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts index 5e3261a7..6c841eeb 100644 --- a/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts +++ b/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts @@ -1,8 +1,8 @@ import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogSetAntiraidAutoData { level: string; diff --git a/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts b/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts index bd65a67d..7d43423b 100644 --- a/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts +++ b/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { User } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogSetAntiraidUserData { level: string; diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts index 6172a2bc..31d900c4 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { StageChannel, StageInstance } from "discord.js"; -import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStageInstanceCreateData { stageInstance: StageInstance; diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts index 844af38b..ff69b13f 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { StageChannel, StageInstance } from "discord.js"; -import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStageInstanceDeleteData { stageInstance: StageInstance; diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts index d84f0e52..be53b598 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { StageChannel, StageInstance } from "discord.js"; -import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStageInstanceUpdateData { oldStageInstance: StageInstance | null; diff --git a/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts b/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts index 4e8a46be..6c715235 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Sticker } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStickerCreateData { sticker: Sticker; diff --git a/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts b/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts index 59f7128a..99c4532f 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Sticker } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStickerDeleteData { sticker: Sticker; diff --git a/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts b/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts index b1f7ea04..e1e2e727 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { Sticker } from "discord.js"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogStickerUpdateData { oldSticker: Sticker; diff --git a/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts b/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts index e05697d1..62f9a47c 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { AnyThreadChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogThreadCreateData { thread: AnyThreadChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts b/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts index fddb57f3..52dd4908 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { AnyThreadChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogThreadDeleteData { thread: AnyThreadChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts b/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts index 77a6f1ad..f73bab5d 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts @@ -1,11 +1,11 @@ -import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; -import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; -import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { AnyThreadChannel } from "discord.js"; -import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; +import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogThreadUpdateData { oldThread: AnyThreadChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts index 37e7982a..79efc844 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts @@ -1,15 +1,15 @@ +import { GuildMember, User, VoiceBasedChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { VoiceBasedChannel, GuildMember, User } from "discord.js"; +import { resolveChannelIds } from "../../../utils/resolveChannelIds"; import { channelToTemplateSafeChannel, memberToTemplateSafeMember, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogVoiceChannelForceDisconnectData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts index 3045e4fb..70978304 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts @@ -1,15 +1,15 @@ +import { GuildMember, User, VoiceBasedChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { VoiceBasedChannel, GuildMember, User } from "discord.js"; +import { resolveChannelIds } from "../../../utils/resolveChannelIds"; import { channelToTemplateSafeChannel, memberToTemplateSafeMember, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogVoiceChannelForceMoveData { mod: User; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts index 50be9ec4..f91cf4a2 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts @@ -1,11 +1,11 @@ +import { GuildMember, VoiceBasedChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { VoiceBasedChannel, GuildMember } from "discord.js"; -import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogVoiceChannelJoinData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts index bb9a5df2..99b35155 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts @@ -1,11 +1,11 @@ +import { GuildMember, VoiceBasedChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { VoiceBasedChannel, GuildMember } from "discord.js"; -import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogVoiceChannelLeaveData { member: GuildMember; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts index f11a9673..679c66d3 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts @@ -1,11 +1,11 @@ +import { GuildMember, VoiceBasedChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; -import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { VoiceBasedChannel, GuildMember } from "discord.js"; -import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; +import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { LogsPluginType } from "../types"; +import { log } from "../util/log"; interface LogVoiceChannelMoveData { member: GuildMember; diff --git a/backend/src/plugins/Logs/types.ts b/backend/src/plugins/Logs/types.ts index b10cfcb9..654b72de 100644 --- a/backend/src/plugins/Logs/types.ts +++ b/backend/src/plugins/Logs/types.ts @@ -1,14 +1,14 @@ import * as t from "io-ts"; -import { z } from "zod"; import { BasePluginType, CooldownManager, guildPluginEventListener } from "knub"; +import { z } from "zod"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; +import { LogType } from "../../data/LogType"; import { RegExpRunner } from "../../RegExpRunner"; import { tMessageContent, tNullable } from "../../utils"; -import { TRegex } from "../../validatorUtils"; -import { LogType } from "../../data/LogType"; +import { MessageBuffer } from "../../utils/MessageBuffer"; import { TemplateSafeCase, TemplateSafeChannel, @@ -22,7 +22,7 @@ import { TemplateSafeUnknownUser, TemplateSafeUser, } from "../../utils/templateSafeObjects"; -import { MessageBuffer } from "../../utils/MessageBuffer"; +import { TRegex } from "../../validatorUtils"; export const tLogFormats = t.record(t.string, t.union([t.string, tMessageContent])); export type TLogFormats = t.TypeOf; diff --git a/backend/src/plugins/Logs/util/getLogMessage.ts b/backend/src/plugins/Logs/util/getLogMessage.ts index 647ad67c..4887cb82 100644 --- a/backend/src/plugins/Logs/util/getLogMessage.ts +++ b/backend/src/plugins/Logs/util/getLogMessage.ts @@ -18,14 +18,14 @@ import { verboseUserMention, verboseUserName, } from "../../../utils"; -import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; -import { FORMAT_NO_TIMESTAMP, ILogTypeData, LogsPluginType, TLogChannel } from "../types"; import { getTemplateSafeMemberLevel, - TemplateSafeMember, memberToTemplateSafeMember, + TemplateSafeMember, TemplateSafeUser, } from "../../../utils/templateSafeObjects"; +import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; +import { FORMAT_NO_TIMESTAMP, ILogTypeData, LogsPluginType, TLogChannel } from "../types"; export async function getLogMessage( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Logs/util/isLogIgnored.ts b/backend/src/plugins/Logs/util/isLogIgnored.ts index 093fb9a6..eb23b927 100644 --- a/backend/src/plugins/Logs/util/isLogIgnored.ts +++ b/backend/src/plugins/Logs/util/isLogIgnored.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; -import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; +import { LogsPluginType } from "../types"; export function isLogIgnored(pluginData: GuildPluginData, type: LogType, ignoreId: string) { return pluginData.state.guildLogs.isLogIgnored(type, ignoreId); diff --git a/backend/src/plugins/Logs/util/log.ts b/backend/src/plugins/Logs/util/log.ts index def4665b..05416aa4 100644 --- a/backend/src/plugins/Logs/util/log.ts +++ b/backend/src/plugins/Logs/util/log.ts @@ -1,13 +1,13 @@ import { APIEmbed, MessageMentionTypes, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; +import { LogType } from "../../../data/LogType"; import { allowTimeout } from "../../../RegExpRunner"; +import { TypedTemplateSafeValueContainer } from "../../../templateFormatter"; +import { isDiscordAPIError, MINUTES } from "../../../utils"; +import { MessageBuffer } from "../../../utils/MessageBuffer"; +import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; import { ILogTypeData, LogsPluginType, TLogChannel, TLogChannelMap } from "../types"; import { getLogMessage } from "./getLogMessage"; -import { TypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { LogType } from "../../../data/LogType"; -import { MessageBuffer } from "../../../utils/MessageBuffer"; -import { isDiscordAPIError, MINUTES } from "../../../utils"; -import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; const excludedUserProps = ["user", "member", "mod"]; const excludedRoleProps = ["message.member.roles", "member.roles"]; diff --git a/backend/src/plugins/Logs/util/onMessageDelete.ts b/backend/src/plugins/Logs/util/onMessageDelete.ts index 3bc20312..e21967b8 100644 --- a/backend/src/plugins/Logs/util/onMessageDelete.ts +++ b/backend/src/plugins/Logs/util/onMessageDelete.ts @@ -3,10 +3,10 @@ import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { resolveUser } from "../../../utils"; -import { LogsPluginType } from "../types"; import { logMessageDelete } from "../logFunctions/logMessageDelete"; -import { isLogIgnored } from "./isLogIgnored"; import { logMessageDeleteBare } from "../logFunctions/logMessageDeleteBare"; +import { LogsPluginType } from "../types"; +import { isLogIgnored } from "./isLogIgnored"; export async function onMessageDelete(pluginData: GuildPluginData, savedMessage: SavedMessage) { const user = await resolveUser(pluginData.client, savedMessage.user_id); diff --git a/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts b/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts index 0d077508..d5a6366e 100644 --- a/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts +++ b/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts @@ -3,8 +3,8 @@ import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { getBaseUrl } from "../../../pluginUtils"; -import { LogsPluginType } from "../types"; import { logMessageDeleteBulk } from "../logFunctions/logMessageDeleteBulk"; +import { LogsPluginType } from "../types"; import { isLogIgnored } from "./isLogIgnored"; export async function onMessageDeleteBulk(pluginData: GuildPluginData, savedMessages: SavedMessage[]) { diff --git a/backend/src/plugins/Logs/util/onMessageUpdate.ts b/backend/src/plugins/Logs/util/onMessageUpdate.ts index 2b291569..a94b1fe6 100644 --- a/backend/src/plugins/Logs/util/onMessageUpdate.ts +++ b/backend/src/plugins/Logs/util/onMessageUpdate.ts @@ -3,8 +3,8 @@ import { GuildPluginData } from "knub"; import cloneDeep from "lodash.clonedeep"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { resolveUser } from "../../../utils"; -import { LogsPluginType } from "../types"; import { logMessageEdit } from "../logFunctions/logMessageEdit"; +import { LogsPluginType } from "../types"; export async function onMessageUpdate( pluginData: GuildPluginData, diff --git a/backend/src/plugins/MessageSaver/types.ts b/backend/src/plugins/MessageSaver/types.ts index 588df88f..2fdef665 100644 --- a/backend/src/plugins/MessageSaver/types.ts +++ b/backend/src/plugins/MessageSaver/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; export const ConfigSchema = t.type({ diff --git a/backend/src/plugins/ModActions/ModActionsPlugin.ts b/backend/src/plugins/ModActions/ModActionsPlugin.ts index 9f08dc68..93acd687 100644 --- a/backend/src/plugins/ModActions/ModActionsPlugin.ts +++ b/backend/src/plugins/ModActions/ModActionsPlugin.ts @@ -1,6 +1,7 @@ import { GuildMember, Message, Snowflake } from "discord.js"; import { EventEmitter } from "events"; import { GuildCases } from "../../data/GuildCases"; +import { onGuildEvent } from "../../data/GuildEvents"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildMutes } from "../../data/GuildMutes"; import { GuildTempbans } from "../../data/GuildTempbans"; @@ -8,6 +9,7 @@ import { mapToPublicFn } from "../../pluginUtils"; import { Queue } from "../../Queue"; import { MINUTES, trimPluginDescription } from "../../utils"; import { CasesPlugin } from "../Cases/CasesPlugin"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { MutesPlugin } from "../Mutes/MutesPlugin"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; @@ -37,6 +39,7 @@ import { CreateBanCaseOnManualBanEvt } from "./events/CreateBanCaseOnManualBanEv import { CreateUnbanCaseOnManualUnbanEvt } from "./events/CreateUnbanCaseOnManualUnbanEvt"; import { PostAlertOnMemberJoinEvt } from "./events/PostAlertOnMemberJoinEvt"; import { banUserId } from "./functions/banUserId"; +import { clearTempban } from "./functions/clearTempban"; import { hasMutePermission } from "./functions/hasMutePerm"; import { kickMember } from "./functions/kickMember"; import { offModActionsEvent } from "./functions/offModActionsEvent"; @@ -44,9 +47,6 @@ import { onModActionsEvent } from "./functions/onModActionsEvent"; import { updateCase } from "./functions/updateCase"; import { warnMember } from "./functions/warnMember"; import { BanOptions, ConfigSchema, KickOptions, ModActionsPluginType, WarnOptions } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; -import { onGuildEvent } from "../../data/GuildEvents"; -import { clearTempban } from "./functions/clearTempban"; const defaultOptions = { config: { diff --git a/backend/src/plugins/ModActions/commands/AddCaseCmd.ts b/backend/src/plugins/ModActions/commands/AddCaseCmd.ts index b65f69a1..567bfac6 100644 --- a/backend/src/plugins/ModActions/commands/AddCaseCmd.ts +++ b/backend/src/plugins/ModActions/commands/AddCaseCmd.ts @@ -4,9 +4,9 @@ import { Case } from "../../../data/entities/Case"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveMember, resolveUser } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; const opts = { mod: ct.member({ option: true }), diff --git a/backend/src/plugins/ModActions/commands/BanCmd.ts b/backend/src/plugins/ModActions/commands/BanCmd.ts index 03aa6d14..d2abfdeb 100644 --- a/backend/src/plugins/ModActions/commands/BanCmd.ts +++ b/backend/src/plugins/ModActions/commands/BanCmd.ts @@ -2,18 +2,18 @@ import humanizeDuration from "humanize-duration"; import { getMemberLevel } from "knub/dist/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; +import { clearExpiringTempban, registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveMember, resolveUser } from "../../../utils"; import { banLock } from "../../../utils/lockNameHelpers"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { banUserId } from "../functions/banUserId"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { isBanned } from "../functions/isBanned"; import { readContactMethodsFromArgs } from "../functions/readContactMethodsFromArgs"; import { modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { clearExpiringTempban, registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; const opts = { mod: ct.member({ option: true }), diff --git a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts index e323eb25..efdc8cdd 100644 --- a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts +++ b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts @@ -5,11 +5,11 @@ import { LogType } from "../../../data/LogType"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { DAYS, MINUTES, resolveMember, resolveUser } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; import { isBanned } from "../functions/isBanned"; import { IgnoredEventType, modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; const opts = { mod: ct.member({ option: true }), diff --git a/backend/src/plugins/ModActions/commands/MassBanCmd.ts b/backend/src/plugins/ModActions/commands/MassBanCmd.ts index d554bbba..e1dd44b2 100644 --- a/backend/src/plugins/ModActions/commands/MassBanCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassBanCmd.ts @@ -7,11 +7,11 @@ import { LogType } from "../../../data/LogType"; import { humanizeDurationShort } from "../../../humanizeDurationShort"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { DAYS, MINUTES, SECONDS, noop } from "../../../utils"; +import { DAYS, MINUTES, noop, SECONDS } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; import { IgnoredEventType, modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export const MassbanCmd = modActionsCmd({ trigger: "massban", diff --git a/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts b/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts index eb44f9c2..d536b760 100644 --- a/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts @@ -5,11 +5,11 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; import { isBanned } from "../functions/isBanned"; import { IgnoredEventType, modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export const MassunbanCmd = modActionsCmd({ trigger: "massunban", diff --git a/backend/src/plugins/ModActions/commands/MassmuteCmd.ts b/backend/src/plugins/ModActions/commands/MassmuteCmd.ts index 8146b069..c7165433 100644 --- a/backend/src/plugins/ModActions/commands/MassmuteCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassmuteCmd.ts @@ -5,9 +5,9 @@ import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export const MassmuteCmd = modActionsCmd({ trigger: "massmute", diff --git a/backend/src/plugins/ModActions/commands/NoteCmd.ts b/backend/src/plugins/ModActions/commands/NoteCmd.ts index 80bf63a9..ad183ba1 100644 --- a/backend/src/plugins/ModActions/commands/NoteCmd.ts +++ b/backend/src/plugins/ModActions/commands/NoteCmd.ts @@ -3,9 +3,9 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveUser } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export const NoteCmd = modActionsCmd({ trigger: "note", diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts index f883ccd6..cda36959 100644 --- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts @@ -2,14 +2,14 @@ import { Snowflake } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; +import { clearExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveUser } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; import { IgnoredEventType, modActionsCmd } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { clearExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; const opts = { mod: ct.member({ option: true }), diff --git a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts index dc57f88f..929c1e25 100644 --- a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts @@ -1,14 +1,14 @@ import { AuditLogEvent, User } from "discord.js"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { resolveUser, UnknownUser } from "../../../utils"; +import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; import { isEventIgnored } from "../functions/isEventIgnored"; import { IgnoredEventType, modActionsEvt } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; /** * Create a BAN case automatically when a user is banned manually. diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts index 53eea12c..d03d3763 100644 --- a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts @@ -3,12 +3,12 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { logger } from "../../../logger"; import { resolveUser, UnknownUser } from "../../../utils"; +import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; import { isEventIgnored } from "../functions/isEventIgnored"; import { IgnoredEventType, modActionsEvt } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; /** * Create a KICK case automatically when a user is kicked manually. diff --git a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts index d6856d49..e6e8fbb3 100644 --- a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts @@ -2,12 +2,12 @@ import { AuditLogEvent, User } from "discord.js"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { resolveUser, UnknownUser } from "../../../utils"; +import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; import { isEventIgnored } from "../functions/isEventIgnored"; import { IgnoredEventType, modActionsEvt } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; /** * Create an UNBAN case automatically when a user is unbanned manually. diff --git a/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts b/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts index fdc28173..015dd4c6 100644 --- a/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts +++ b/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts @@ -3,7 +3,7 @@ import { GuildPluginData } from "knub"; import { hasPermission } from "knub/dist/helpers"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { DAYS, SECONDS, errorMessage, resolveMember, resolveUser } from "../../../utils"; +import { DAYS, errorMessage, resolveMember, resolveUser, SECONDS } from "../../../utils"; import { IgnoredEventType, ModActionsPluginType } from "../types"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; import { ignoreEvent } from "./ignoreEvent"; diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index 364c43a8..6a9dc7d5 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -1,9 +1,9 @@ import { DiscordAPIError, Snowflake, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; +import { registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; import { logger } from "../../../logger"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; import { @@ -15,12 +15,12 @@ import { ucfirst, UserNotificationResult, } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { BanOptions, BanResult, IgnoredEventType, ModActionsPluginType } from "../types"; import { getDefaultContactMethods } from "./getDefaultContactMethods"; import { ignoreEvent } from "./ignoreEvent"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; /** * Ban the specified user id, whether or not they're actually on the server at the time. Generates a case. diff --git a/backend/src/plugins/ModActions/functions/clearTempban.ts b/backend/src/plugins/ModActions/functions/clearTempban.ts index c6ab0ad1..25807df8 100644 --- a/backend/src/plugins/ModActions/functions/clearTempban.ts +++ b/backend/src/plugins/ModActions/functions/clearTempban.ts @@ -5,14 +5,14 @@ import moment from "moment-timezone"; import { LogType } from "src/data/LogType"; import { logger } from "src/logger"; import { CaseTypes } from "../../../data/CaseTypes"; +import { Tempban } from "../../../data/entities/Tempban"; import { resolveUser } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { IgnoredEventType, ModActionsPluginType } from "../types"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; import { ignoreEvent } from "./ignoreEvent"; import { isBanned } from "./isBanned"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { Tempban } from "../../../data/entities/Tempban"; export async function clearTempban(pluginData: GuildPluginData, tempban: Tempban) { if (!(await isBanned(pluginData, tempban.user_id))) { diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts index d70722a1..89559364 100644 --- a/backend/src/plugins/ModActions/functions/kickMember.ts +++ b/backend/src/plugins/ModActions/functions/kickMember.ts @@ -1,15 +1,15 @@ import { GuildMember } from "discord.js"; import { GuildPluginData } from "knub"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { IgnoredEventType, KickOptions, KickResult, ModActionsPluginType } from "../types"; import { getDefaultContactMethods } from "./getDefaultContactMethods"; import { ignoreEvent } from "./ignoreEvent"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; /** * Kick the specified server member. Generates a case. diff --git a/backend/src/plugins/ModActions/functions/updateCase.ts b/backend/src/plugins/ModActions/functions/updateCase.ts index 4c1c48a2..ac6b65af 100644 --- a/backend/src/plugins/ModActions/functions/updateCase.ts +++ b/backend/src/plugins/ModActions/functions/updateCase.ts @@ -3,8 +3,8 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; export async function updateCase(pluginData, msg: Message, args) { let theCase: Case | undefined; diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index 515651fb..c5357ee1 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -1,14 +1,14 @@ import { GuildMember, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; import { CasesPlugin } from "../../Cases/CasesPlugin"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { ModActionsPluginType, WarnOptions, WarnResult } from "../types"; import { getDefaultContactMethods } from "./getDefaultContactMethods"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export async function warnMember( pluginData: GuildPluginData, diff --git a/backend/src/plugins/ModActions/types.ts b/backend/src/plugins/ModActions/types.ts index b2e10338..a0341b12 100644 --- a/backend/src/plugins/ModActions/types.ts +++ b/backend/src/plugins/ModActions/types.ts @@ -1,7 +1,7 @@ import { GuildTextBasedChannel } from "discord.js"; import { EventEmitter } from "events"; import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { Case } from "../../data/entities/Case"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; diff --git a/backend/src/plugins/Mutes/MutesPlugin.ts b/backend/src/plugins/Mutes/MutesPlugin.ts index 943716cf..6b3c9aff 100644 --- a/backend/src/plugins/Mutes/MutesPlugin.ts +++ b/backend/src/plugins/Mutes/MutesPlugin.ts @@ -2,6 +2,7 @@ import { GuildMember, Snowflake } from "discord.js"; import { EventEmitter } from "events"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildCases } from "../../data/GuildCases"; +import { onGuildEvent } from "../../data/GuildEvents"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildMutes } from "../../data/GuildMutes"; import { mapToPublicFn } from "../../pluginUtils"; @@ -14,13 +15,12 @@ import { ClearMutesWithoutRoleCmd } from "./commands/ClearMutesWithoutRoleCmd"; import { MutesCmd } from "./commands/MutesCmd"; import { ClearActiveMuteOnMemberBanEvt } from "./events/ClearActiveMuteOnMemberBanEvt"; import { ReapplyActiveMuteOnJoinEvt } from "./events/ReapplyActiveMuteOnJoinEvt"; +import { clearMute } from "./functions/clearMute"; import { muteUser } from "./functions/muteUser"; import { offMutesEvent } from "./functions/offMutesEvent"; import { onMutesEvent } from "./functions/onMutesEvent"; import { unmuteUser } from "./functions/unmuteUser"; import { ConfigSchema, MutesPluginType } from "./types"; -import { onGuildEvent } from "../../data/GuildEvents"; -import { clearMute } from "./functions/clearMute"; const defaultOptions = { config: { diff --git a/backend/src/plugins/Mutes/commands/MutesCmd.ts b/backend/src/plugins/Mutes/commands/MutesCmd.ts index fa11ba54..df476fba 100644 --- a/backend/src/plugins/Mutes/commands/MutesCmd.ts +++ b/backend/src/plugins/Mutes/commands/MutesCmd.ts @@ -1,10 +1,10 @@ import { + ActionRowBuilder, + ButtonBuilder, + ButtonStyle, GuildMember, MessageComponentInteraction, Snowflake, - ButtonBuilder, - ButtonStyle, - ActionRowBuilder, } from "discord.js"; import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; diff --git a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts index 86605905..8c8c5396 100644 --- a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts +++ b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts @@ -1,7 +1,7 @@ import { Snowflake } from "discord.js"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; -import { mutesEvt } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { mutesEvt } from "../types"; /** * Reapply active mutes on join diff --git a/backend/src/plugins/Mutes/functions/clearMute.ts b/backend/src/plugins/Mutes/functions/clearMute.ts index e7167474..e4a28c92 100644 --- a/backend/src/plugins/Mutes/functions/clearMute.ts +++ b/backend/src/plugins/Mutes/functions/clearMute.ts @@ -1,11 +1,11 @@ +import { GuildMember } from "discord.js"; +import { GuildPluginData } from "knub"; import { Mute } from "../../../data/entities/Mute"; +import { clearExpiringMute } from "../../../data/loops/expiringMutesLoop"; import { resolveMember, verboseUserMention } from "../../../utils"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { GuildPluginData } from "knub"; import { MutesPluginType } from "../types"; -import { clearExpiringMute } from "../../../data/loops/expiringMutesLoop"; -import { GuildMember } from "discord.js"; export async function clearMute( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Mutes/functions/muteUser.ts b/backend/src/plugins/Mutes/functions/muteUser.ts index fd836e9e..8677c162 100644 --- a/backend/src/plugins/Mutes/functions/muteUser.ts +++ b/backend/src/plugins/Mutes/functions/muteUser.ts @@ -1,9 +1,10 @@ import { Snowflake, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CaseTypes } from "../../../data/CaseTypes"; 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 { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; @@ -16,10 +17,9 @@ import { UserNotificationResult, } from "../../../utils"; import { muteLock } from "../../../utils/lockNameHelpers"; +import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { MuteOptions, MutesPluginType } from "../types"; -import { Mute } from "../../../data/entities/Mute"; -import { registerExpiringMute } from "../../../data/loops/expiringMutesLoop"; /** * TODO: Clean up this function diff --git a/backend/src/plugins/Mutes/functions/unmuteUser.ts b/backend/src/plugins/Mutes/functions/unmuteUser.ts index 48bad17b..00a7123a 100644 --- a/backend/src/plugins/Mutes/functions/unmuteUser.ts +++ b/backend/src/plugins/Mutes/functions/unmuteUser.ts @@ -5,10 +5,10 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { resolveMember, resolveUser } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CaseArgs } from "../../Cases/types"; -import { MutesPluginType, UnmuteResult } from "../types"; -import { memberHasMutedRole } from "./memberHasMutedRole"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { MutesPluginType, UnmuteResult } from "../types"; import { clearMute } from "./clearMute"; +import { memberHasMutedRole } from "./memberHasMutedRole"; export async function unmuteUser( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Mutes/types.ts b/backend/src/plugins/Mutes/types.ts index e634adec..9fe1e575 100644 --- a/backend/src/plugins/Mutes/types.ts +++ b/backend/src/plugins/Mutes/types.ts @@ -1,7 +1,7 @@ import { GuildMember } from "discord.js"; import { EventEmitter } from "events"; import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { Case } from "../../data/entities/Case"; import { Mute } from "../../data/entities/Mute"; import { GuildArchives } from "../../data/GuildArchives"; diff --git a/backend/src/plugins/NameHistory/types.ts b/backend/src/plugins/NameHistory/types.ts index f74c2a53..f2c81db1 100644 --- a/backend/src/plugins/NameHistory/types.ts +++ b/backend/src/plugins/NameHistory/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildNicknameHistory } from "../../data/GuildNicknameHistory"; import { UsernameHistory } from "../../data/UsernameHistory"; import { Queue } from "../../Queue"; diff --git a/backend/src/plugins/Persist/events/LoadDataEvt.ts b/backend/src/plugins/Persist/events/LoadDataEvt.ts index 002771ad..ef97c616 100644 --- a/backend/src/plugins/Persist/events/LoadDataEvt.ts +++ b/backend/src/plugins/Persist/events/LoadDataEvt.ts @@ -1,4 +1,4 @@ -import { PermissionFlagsBits, GuildMemberEditOptions } from "discord.js"; +import { GuildMemberEditOptions, PermissionFlagsBits } from "discord.js"; import intersection from "lodash.intersection"; import { canAssignRole } from "../../../utils/canAssignRole"; import { getMissingPermissions } from "../../../utils/getMissingPermissions"; diff --git a/backend/src/plugins/Phisherman/PhishermanPlugin.ts b/backend/src/plugins/Phisherman/PhishermanPlugin.ts index c2970940..1e5d2aa5 100644 --- a/backend/src/plugins/Phisherman/PhishermanPlugin.ts +++ b/backend/src/plugins/Phisherman/PhishermanPlugin.ts @@ -1,10 +1,10 @@ import { PluginOptions } from "knub"; -import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; -import { ConfigSchema, PhishermanPluginType } from "./types"; import { hasPhishermanMasterAPIKey, phishermanApiKeyIsValid } from "../../data/Phisherman"; import { mapToPublicFn } from "../../pluginUtils"; +import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { getDomainInfo } from "./functions/getDomainInfo"; import { pluginInfo } from "./info"; +import { ConfigSchema, PhishermanPluginType } from "./types"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Phisherman/functions/getDomainInfo.ts b/backend/src/plugins/Phisherman/functions/getDomainInfo.ts index 8f61bd41..2714ec01 100644 --- a/backend/src/plugins/Phisherman/functions/getDomainInfo.ts +++ b/backend/src/plugins/Phisherman/functions/getDomainInfo.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; -import { PhishermanPluginType } from "../types"; -import { PhishermanDomainInfo } from "../../../data/types/phisherman"; import { getPhishermanDomainInfo, phishermanDomainIsSafe, trackPhishermanCaughtDomain } from "../../../data/Phisherman"; +import { PhishermanDomainInfo } from "../../../data/types/phisherman"; +import { PhishermanPluginType } from "../types"; export async function getDomainInfo( pluginData: GuildPluginData, diff --git a/backend/src/plugins/PingableRoles/types.ts b/backend/src/plugins/PingableRoles/types.ts index 56328bf3..8c942459 100644 --- a/backend/src/plugins/PingableRoles/types.ts +++ b/backend/src/plugins/PingableRoles/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { PingableRole } from "../../data/entities/PingableRole"; import { GuildPingableRoles } from "../../data/GuildPingableRoles"; diff --git a/backend/src/plugins/Post/PostPlugin.ts b/backend/src/plugins/Post/PostPlugin.ts index 7854b853..8fbbf704 100644 --- a/backend/src/plugins/Post/PostPlugin.ts +++ b/backend/src/plugins/Post/PostPlugin.ts @@ -1,7 +1,9 @@ import { PluginOptions } from "knub"; +import { onGuildEvent } from "../../data/GuildEvents"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { GuildScheduledPosts } from "../../data/GuildScheduledPosts"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { EditCmd } from "./commands/EditCmd"; @@ -12,8 +14,6 @@ import { ScheduledPostsDeleteCmd } from "./commands/ScheduledPostsDeleteCmd"; import { ScheduledPostsListCmd } from "./commands/ScheduledPostsListCmd"; import { ScheduledPostsShowCmd } from "./commands/ScheduledPostsShowCmd"; import { ConfigSchema, PostPluginType } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; -import { onGuildEvent } from "../../data/GuildEvents"; import { postScheduledPost } from "./util/postScheduledPost"; const defaultOptions: PluginOptions = { diff --git a/backend/src/plugins/Post/commands/ScheduledPostsDeleteCmd.ts b/backend/src/plugins/Post/commands/ScheduledPostsDeleteCmd.ts index 2a08344f..78becae8 100644 --- a/backend/src/plugins/Post/commands/ScheduledPostsDeleteCmd.ts +++ b/backend/src/plugins/Post/commands/ScheduledPostsDeleteCmd.ts @@ -1,8 +1,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { clearUpcomingScheduledPost } from "../../../data/loops/upcomingScheduledPostsLoop"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sorter } from "../../../utils"; import { postCmd } from "../types"; -import { clearUpcomingScheduledPost } from "../../../data/loops/upcomingScheduledPostsLoop"; export const ScheduledPostsDeleteCmd = postCmd({ trigger: ["scheduled_posts delete", "scheduled_posts d"], diff --git a/backend/src/plugins/Post/util/actualPostCmd.ts b/backend/src/plugins/Post/util/actualPostCmd.ts index 6604a317..dbd0e2b2 100644 --- a/backend/src/plugins/Post/util/actualPostCmd.ts +++ b/backend/src/plugins/Post/util/actualPostCmd.ts @@ -2,14 +2,14 @@ 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, StrictMessageContent } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { PostPluginType } from "../types"; import { parseScheduleTime } from "./parseScheduleTime"; import { postMessage } from "./postMessage"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { registerUpcomingScheduledPost } from "../../../data/loops/upcomingScheduledPostsLoop"; const MIN_REPEAT_TIME = 5 * MINUTES; const MAX_REPEAT_TIME = Math.pow(2, 32); diff --git a/backend/src/plugins/Post/util/postScheduledPost.ts b/backend/src/plugins/Post/util/postScheduledPost.ts index cc9c8a22..e4a3e1e0 100644 --- a/backend/src/plugins/Post/util/postScheduledPost.ts +++ b/backend/src/plugins/Post/util/postScheduledPost.ts @@ -1,13 +1,13 @@ import { Snowflake, User } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { logger } from "../../../logger"; -import { DBDateFormat, verboseChannelMention, verboseUserMention } from "../../../utils"; -import { PostPluginType } from "../types"; -import { postMessage } from "./postMessage"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; import { ScheduledPost } from "../../../data/entities/ScheduledPost"; import { registerUpcomingScheduledPost } from "../../../data/loops/upcomingScheduledPostsLoop"; +import { logger } from "../../../logger"; +import { DBDateFormat, verboseChannelMention, verboseUserMention } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { PostPluginType } from "../types"; +import { postMessage } from "./postMessage"; export async function postScheduledPost(pluginData: GuildPluginData, post: ScheduledPost) { // First, update the scheduled post or delete it from the database *before* we try posting it. diff --git a/backend/src/plugins/ReactionRoles/types.ts b/backend/src/plugins/ReactionRoles/types.ts index 61c8f0e1..19ba38c6 100644 --- a/backend/src/plugins/ReactionRoles/types.ts +++ b/backend/src/plugins/ReactionRoles/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildReactionRoles } from "../../data/GuildReactionRoles"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { Queue } from "../../Queue"; diff --git a/backend/src/plugins/Reminders/RemindersPlugin.ts b/backend/src/plugins/Reminders/RemindersPlugin.ts index 4316cf18..43ed2b1f 100644 --- a/backend/src/plugins/Reminders/RemindersPlugin.ts +++ b/backend/src/plugins/Reminders/RemindersPlugin.ts @@ -1,13 +1,13 @@ import { PluginOptions } from "knub"; +import { onGuildEvent } from "../../data/GuildEvents"; import { GuildReminders } from "../../data/GuildReminders"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { RemindCmd } from "./commands/RemindCmd"; import { RemindersCmd } from "./commands/RemindersCmd"; import { RemindersDeleteCmd } from "./commands/RemindersDeleteCmd"; -import { ConfigSchema, RemindersPluginType } from "./types"; -import { onGuildEvent } from "../../data/GuildEvents"; import { postReminder } from "./functions/postReminder"; +import { ConfigSchema, RemindersPluginType } from "./types"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Reminders/commands/RemindCmd.ts b/backend/src/plugins/Reminders/commands/RemindCmd.ts index 122c9e3d..c4655771 100644 --- a/backend/src/plugins/Reminders/commands/RemindCmd.ts +++ b/backend/src/plugins/Reminders/commands/RemindCmd.ts @@ -1,11 +1,11 @@ import humanizeDuration from "humanize-duration"; import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { registerUpcomingReminder } from "../../../data/loops/upcomingRemindersLoop"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { convertDelayStringToMS, messageLink } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { remindersCmd } from "../types"; -import { registerUpcomingReminder } from "../../../data/loops/upcomingRemindersLoop"; export const RemindCmd = remindersCmd({ trigger: ["remind", "remindme", "reminder"], diff --git a/backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts b/backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts index 0690b434..25713a4f 100644 --- a/backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts +++ b/backend/src/plugins/Reminders/commands/RemindersDeleteCmd.ts @@ -1,8 +1,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { clearUpcomingReminder } from "../../../data/loops/upcomingRemindersLoop"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sorter } from "../../../utils"; import { remindersCmd } from "../types"; -import { clearUpcomingReminder } from "../../../data/loops/upcomingRemindersLoop"; export const RemindersDeleteCmd = remindersCmd({ trigger: ["reminders delete", "reminders d"], diff --git a/backend/src/plugins/Reminders/functions/postReminder.ts b/backend/src/plugins/Reminders/functions/postReminder.ts index 6f6c741c..91d9d96f 100644 --- a/backend/src/plugins/Reminders/functions/postReminder.ts +++ b/backend/src/plugins/Reminders/functions/postReminder.ts @@ -1,10 +1,10 @@ -import { GuildPluginData } from "knub"; -import { RemindersPluginType } from "../types"; -import { Reminder } from "../../../data/entities/Reminder"; import { HTTPError, Snowflake } from "discord.js"; -import moment from "moment-timezone"; +import { GuildPluginData } from "knub"; import { disableLinkPreviews } from "knub/dist/helpers"; +import moment from "moment-timezone"; +import { Reminder } from "../../../data/entities/Reminder"; import { DBDateFormat } from "../../../utils"; +import { RemindersPluginType } from "../types"; export async function postReminder(pluginData: GuildPluginData, reminder: Reminder) { const channel = pluginData.guild.channels.cache.get(reminder.channel_id as Snowflake); diff --git a/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts b/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts index 7126a495..04f60d4c 100644 --- a/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts +++ b/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts @@ -1,15 +1,15 @@ -import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; -import { ConfigSchema, RoleButtonsPluginType } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; -import { applyAllRoleButtons } from "./functions/applyAllRoleButtons"; import { GuildRoleButtons } from "../../data/GuildRoleButtons"; -import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin"; import { StrictValidationError } from "../../validatorUtils"; +import { LogsPlugin } from "../Logs/LogsPlugin"; +import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin"; +import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; +import { resetButtonsCmd } from "./commands/resetButtons"; import { onButtonInteraction } from "./events/buttonInteraction"; -import { pluginInfo } from "./info"; +import { applyAllRoleButtons } from "./functions/applyAllRoleButtons"; import { createButtonComponents } from "./functions/createButtonComponents"; import { TooManyComponentsError } from "./functions/TooManyComponentsError"; -import { resetButtonsCmd } from "./commands/resetButtons"; +import { pluginInfo } from "./info"; +import { ConfigSchema, RoleButtonsPluginType } from "./types"; export const RoleButtonsPlugin = zeppelinGuildPlugin()({ name: "role_buttons", diff --git a/backend/src/plugins/RoleButtons/commands/resetButtons.ts b/backend/src/plugins/RoleButtons/commands/resetButtons.ts index 2e082a77..cca8e643 100644 --- a/backend/src/plugins/RoleButtons/commands/resetButtons.ts +++ b/backend/src/plugins/RoleButtons/commands/resetButtons.ts @@ -1,8 +1,8 @@ import { guildPluginMessageCommand } from "knub"; -import { RoleButtonsPluginType } from "../types"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { applyAllRoleButtons } from "../functions/applyAllRoleButtons"; +import { RoleButtonsPluginType } from "../types"; export const resetButtonsCmd = guildPluginMessageCommand()({ trigger: "role_buttons reset", diff --git a/backend/src/plugins/RoleButtons/events/buttonInteraction.ts b/backend/src/plugins/RoleButtons/events/buttonInteraction.ts index 2b734a38..380371e0 100644 --- a/backend/src/plugins/RoleButtons/events/buttonInteraction.ts +++ b/backend/src/plugins/RoleButtons/events/buttonInteraction.ts @@ -1,9 +1,9 @@ -import { guildPluginEventListener } from "knub"; -import { RoleButtonsPluginType, TRoleButtonOption } from "../types"; -import { RoleManagerPlugin } from "../../RoleManager/RoleManagerPlugin"; import { GuildMember } from "discord.js"; -import { getAllRolesInButtons } from "../functions/getAllRolesInButtons"; +import { guildPluginEventListener } from "knub"; import { parseCustomId } from "../../../utils/parseCustomId"; +import { RoleManagerPlugin } from "../../RoleManager/RoleManagerPlugin"; +import { getAllRolesInButtons } from "../functions/getAllRolesInButtons"; +import { RoleButtonsPluginType, TRoleButtonOption } from "../types"; export const onButtonInteraction = guildPluginEventListener()({ event: "interactionCreate", diff --git a/backend/src/plugins/RoleButtons/functions/applyAllRoleButtons.ts b/backend/src/plugins/RoleButtons/functions/applyAllRoleButtons.ts index e956377b..bb50f3d5 100644 --- a/backend/src/plugins/RoleButtons/functions/applyAllRoleButtons.ts +++ b/backend/src/plugins/RoleButtons/functions/applyAllRoleButtons.ts @@ -1,6 +1,6 @@ +import { createHash } from "crypto"; import { GuildPluginData } from "knub"; import { RoleButtonsPluginType } from "../types"; -import { createHash } from "crypto"; import { applyRoleButtons } from "./applyRoleButtons"; export async function applyAllRoleButtons(pluginData: GuildPluginData) { diff --git a/backend/src/plugins/RoleButtons/functions/applyRoleButtons.ts b/backend/src/plugins/RoleButtons/functions/applyRoleButtons.ts index 45af1c18..bb8ec367 100644 --- a/backend/src/plugins/RoleButtons/functions/applyRoleButtons.ts +++ b/backend/src/plugins/RoleButtons/functions/applyRoleButtons.ts @@ -1,8 +1,8 @@ +import { Message, MessageCreateOptions, MessageEditOptions } from "discord.js"; import { GuildPluginData } from "knub"; -import { RoleButtonsPluginType, TRoleButtonsConfigItem } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { Message, MessageEditOptions, MessageCreateOptions } from "discord.js"; import { RoleButtonsItem } from "../../../data/entities/RoleButtonsItem"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { RoleButtonsPluginType, TRoleButtonsConfigItem } from "../types"; import { createButtonComponents } from "./createButtonComponents"; export async function applyRoleButtons( diff --git a/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts b/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts index bd6e0276..fb287f39 100644 --- a/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts +++ b/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts @@ -1,8 +1,8 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js"; -import { TRoleButtonsConfigItem } from "../types"; import { buildCustomId } from "../../../utils/buildCustomId"; -import { TooManyComponentsError } from "./TooManyComponentsError"; +import { TRoleButtonsConfigItem } from "../types"; import { convertButtonStyleStringToEnum } from "./convertButtonStyleStringToEnum.js"; +import { TooManyComponentsError } from "./TooManyComponentsError"; export function createButtonComponents(configItem: TRoleButtonsConfigItem): Array> { const rows: Array> = []; diff --git a/backend/src/plugins/RoleButtons/types.ts b/backend/src/plugins/RoleButtons/types.ts index f8bcfcd5..f5792f36 100644 --- a/backend/src/plugins/RoleButtons/types.ts +++ b/backend/src/plugins/RoleButtons/types.ts @@ -1,8 +1,8 @@ +import { ButtonStyle } from "discord.js"; import * as t from "io-ts"; import { BasePluginType } from "knub"; -import { tMessageContent, tNullable } from "../../utils"; import { GuildRoleButtons } from "../../data/GuildRoleButtons"; -import { ButtonStyle } from "discord.js"; +import { tMessageContent, tNullable } from "../../utils"; const RoleButtonOption = t.type({ role_id: t.string, diff --git a/backend/src/plugins/RoleManager/RoleManagerPlugin.ts b/backend/src/plugins/RoleManager/RoleManagerPlugin.ts index 65527456..0acddac2 100644 --- a/backend/src/plugins/RoleManager/RoleManagerPlugin.ts +++ b/backend/src/plugins/RoleManager/RoleManagerPlugin.ts @@ -1,13 +1,13 @@ -import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; -import { ConfigSchema, RoleManagerPluginType } from "./types"; import { GuildRoleQueue } from "../../data/GuildRoleQueue"; import { mapToPublicFn } from "../../pluginUtils"; -import { addRole } from "./functions/addRole"; -import { removeRole } from "./functions/removeRole"; -import { addPriorityRole } from "./functions/addPriorityRole"; -import { removePriorityRole } from "./functions/removePriorityRole"; -import { runRoleAssignmentLoop } from "./functions/runRoleAssignmentLoop"; import { LogsPlugin } from "../Logs/LogsPlugin"; +import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; +import { addPriorityRole } from "./functions/addPriorityRole"; +import { addRole } from "./functions/addRole"; +import { removePriorityRole } from "./functions/removePriorityRole"; +import { removeRole } from "./functions/removeRole"; +import { runRoleAssignmentLoop } from "./functions/runRoleAssignmentLoop"; +import { ConfigSchema, RoleManagerPluginType } from "./types"; export const RoleManagerPlugin = zeppelinGuildPlugin()({ name: "role_manager", diff --git a/backend/src/plugins/RoleManager/functions/addPriorityRole.ts b/backend/src/plugins/RoleManager/functions/addPriorityRole.ts index a6aab5cb..2c9534f6 100644 --- a/backend/src/plugins/RoleManager/functions/addPriorityRole.ts +++ b/backend/src/plugins/RoleManager/functions/addPriorityRole.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; -import { RoleManagerPluginType } from "../types"; import { PRIORITY_ROLE_PRIORITY } from "../constants"; +import { RoleManagerPluginType } from "../types"; import { runRoleAssignmentLoop } from "./runRoleAssignmentLoop"; export async function addPriorityRole( diff --git a/backend/src/plugins/RoleManager/functions/removePriorityRole.ts b/backend/src/plugins/RoleManager/functions/removePriorityRole.ts index 1b120659..4192a762 100644 --- a/backend/src/plugins/RoleManager/functions/removePriorityRole.ts +++ b/backend/src/plugins/RoleManager/functions/removePriorityRole.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; -import { RoleManagerPluginType } from "../types"; import { PRIORITY_ROLE_PRIORITY } from "../constants"; +import { RoleManagerPluginType } from "../types"; import { runRoleAssignmentLoop } from "./runRoleAssignmentLoop"; export async function removePriorityRole( diff --git a/backend/src/plugins/RoleManager/functions/runRoleAssignmentLoop.ts b/backend/src/plugins/RoleManager/functions/runRoleAssignmentLoop.ts index 2ed7c2ea..2c62295e 100644 --- a/backend/src/plugins/RoleManager/functions/runRoleAssignmentLoop.ts +++ b/backend/src/plugins/RoleManager/functions/runRoleAssignmentLoop.ts @@ -1,8 +1,8 @@ import { GuildPluginData } from "knub"; -import { RoleManagerPluginType } from "../types"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { logger } from "../../../logger"; import { RoleQueueItem } from "../../../data/entities/RoleQueueItem"; +import { logger } from "../../../logger"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { RoleManagerPluginType } from "../types"; const ROLE_ASSIGNMENTS_PER_BATCH = 20; diff --git a/backend/src/plugins/Roles/RolesPlugin.ts b/backend/src/plugins/Roles/RolesPlugin.ts index 6a50201e..a6c3c949 100644 --- a/backend/src/plugins/Roles/RolesPlugin.ts +++ b/backend/src/plugins/Roles/RolesPlugin.ts @@ -1,13 +1,13 @@ import { PluginOptions } from "knub"; import { GuildLogs } from "../../data/GuildLogs"; import { trimPluginDescription } from "../../utils"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { AddRoleCmd } from "./commands/AddRoleCmd"; import { MassAddRoleCmd } from "./commands/MassAddRoleCmd"; import { MassRemoveRoleCmd } from "./commands/MassRemoveRoleCmd"; import { RemoveRoleCmd } from "./commands/RemoveRoleCmd"; import { ConfigSchema, RolesPluginType } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Roles/commands/AddRoleCmd.ts b/backend/src/plugins/Roles/commands/AddRoleCmd.ts index 708f140b..49c21d23 100644 --- a/backend/src/plugins/Roles/commands/AddRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/AddRoleCmd.ts @@ -3,8 +3,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveRoleId, verboseUserMention } from "../../../utils"; -import { rolesCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { rolesCmd } from "../types"; export const AddRoleCmd = rolesCmd({ trigger: "addrole", diff --git a/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts b/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts index c5193ce6..4c3f1ab6 100644 --- a/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts @@ -4,8 +4,8 @@ import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { canActOn, sendErrorMessage } from "../../../pluginUtils"; import { resolveMember, resolveRoleId, successMessage } from "../../../utils"; -import { rolesCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { rolesCmd } from "../types"; export const MassAddRoleCmd = rolesCmd({ trigger: "massaddrole", diff --git a/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts b/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts index 02931f10..2bc4cfe3 100644 --- a/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts @@ -4,8 +4,8 @@ import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { canActOn, sendErrorMessage } from "../../../pluginUtils"; import { resolveMember, resolveRoleId, successMessage } from "../../../utils"; -import { rolesCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { rolesCmd } from "../types"; export const MassRemoveRoleCmd = rolesCmd({ trigger: "massremoverole", diff --git a/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts b/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts index 0251a4eb..589b9980 100644 --- a/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts @@ -3,8 +3,8 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { resolveRoleId, verboseUserMention } from "../../../utils"; -import { rolesCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { rolesCmd } from "../types"; export const RemoveRoleCmd = rolesCmd({ trigger: "removerole", diff --git a/backend/src/plugins/Slowmode/types.ts b/backend/src/plugins/Slowmode/types.ts index 49f853d0..61b468b3 100644 --- a/backend/src/plugins/Slowmode/types.ts +++ b/backend/src/plugins/Slowmode/types.ts @@ -1,9 +1,9 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; +import { SlowmodeChannel } from "../../data/entities/SlowmodeChannel"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { GuildSlowmodes } from "../../data/GuildSlowmodes"; -import { SlowmodeChannel } from "../../data/entities/SlowmodeChannel"; export const ConfigSchema = t.type({ use_native_slowmode: t.boolean, diff --git a/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts b/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts index ae43f27d..27da9d72 100644 --- a/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts +++ b/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts @@ -3,8 +3,8 @@ import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { isDiscordAPIError, UnknownUser, verboseChannelMention, verboseUserMention } from "../../../utils"; -import { SlowmodePluginType } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { SlowmodePluginType } from "../types"; export async function applyBotSlowmodeToUserId( pluginData: GuildPluginData, diff --git a/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts b/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts index fc736528..d2f840fa 100644 --- a/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts +++ b/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts @@ -2,9 +2,9 @@ import { GuildChannel, Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import { logger } from "../../../logger"; import { UnknownUser, verboseChannelMention, verboseUserMention } from "../../../utils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { SlowmodePluginType } from "../types"; import { clearBotSlowmodeFromUserId } from "./clearBotSlowmodeFromUserId"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export async function clearExpiredSlowmodes(pluginData: GuildPluginData) { const expiredSlowmodeUsers = await pluginData.state.slowmodes.getExpiredSlowmodeUsers(); diff --git a/backend/src/plugins/Slowmode/util/onMessageCreate.ts b/backend/src/plugins/Slowmode/util/onMessageCreate.ts index 7fc56016..a83c315b 100644 --- a/backend/src/plugins/Slowmode/util/onMessageCreate.ts +++ b/backend/src/plugins/Slowmode/util/onMessageCreate.ts @@ -1,6 +1,7 @@ import { ChannelType, GuildTextBasedChannel, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { SlowmodeChannel } from "../../../data/entities/SlowmodeChannel"; import { hasPermission } from "../../../pluginUtils"; import { resolveMember } from "../../../utils"; import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions"; @@ -10,7 +11,6 @@ import { LogsPlugin } from "../../Logs/LogsPlugin"; import { BOT_SLOWMODE_PERMISSIONS } from "../requiredPermissions"; import { SlowmodePluginType } from "../types"; import { applyBotSlowmodeToUserId } from "./applyBotSlowmodeToUserId"; -import { SlowmodeChannel } from "../../../data/entities/SlowmodeChannel"; export async function onMessageCreate(pluginData: GuildPluginData, msg: SavedMessage) { if (msg.is_bot) return; diff --git a/backend/src/plugins/Starboard/types.ts b/backend/src/plugins/Starboard/types.ts index 84409284..223501e3 100644 --- a/backend/src/plugins/Starboard/types.ts +++ b/backend/src/plugins/Starboard/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { GuildStarboardMessages } from "../../data/GuildStarboardMessages"; import { GuildStarboardReactions } from "../../data/GuildStarboardReactions"; diff --git a/backend/src/plugins/Tags/TagsPlugin.ts b/backend/src/plugins/Tags/TagsPlugin.ts index c070c41b..587615b8 100644 --- a/backend/src/plugins/Tags/TagsPlugin.ts +++ b/backend/src/plugins/Tags/TagsPlugin.ts @@ -9,6 +9,7 @@ import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { GuildTags } from "../../data/GuildTags"; import { mapToPublicFn } from "../../pluginUtils"; import { convertDelayStringToMS, trimPluginDescription } from "../../utils"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { TagCreateCmd } from "./commands/TagCreateCmd"; @@ -16,14 +17,13 @@ import { TagDeleteCmd } from "./commands/TagDeleteCmd"; import { TagEvalCmd } from "./commands/TagEvalCmd"; import { TagListCmd } from "./commands/TagListCmd"; import { TagSourceCmd } from "./commands/TagSourceCmd"; +import { generateTemplateMarkdown } from "./docs"; +import { TemplateFunctions } from "./templateFunctions"; import { ConfigSchema, TagsPluginType } from "./types"; import { findTagByName } from "./util/findTagByName"; import { onMessageCreate } from "./util/onMessageCreate"; import { onMessageDelete } from "./util/onMessageDelete"; import { renderTagBody } from "./util/renderTagBody"; -import { LogsPlugin } from "../Logs/LogsPlugin"; -import { generateTemplateMarkdown } from "./docs"; -import { TemplateFunctions } from "./templateFunctions"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Tags/commands/TagEvalCmd.ts b/backend/src/plugins/Tags/commands/TagEvalCmd.ts index 3c5e7f24..55659d30 100644 --- a/backend/src/plugins/Tags/commands/TagEvalCmd.ts +++ b/backend/src/plugins/Tags/commands/TagEvalCmd.ts @@ -1,10 +1,10 @@ -import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; +import { MessageCreateOptions } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; import { TemplateParseError } from "../../../templateFormatter"; +import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { tagsCmd } from "../types"; import { renderTagBody } from "../util/renderTagBody"; -import { MessageCreateOptions } from "discord.js"; export const TagEvalCmd = tagsCmd({ trigger: "tag eval", diff --git a/backend/src/plugins/Tags/commands/TagListCmd.ts b/backend/src/plugins/Tags/commands/TagListCmd.ts index aaa42ec4..59d63dee 100644 --- a/backend/src/plugins/Tags/commands/TagListCmd.ts +++ b/backend/src/plugins/Tags/commands/TagListCmd.ts @@ -1,7 +1,7 @@ +import escapeStringRegexp from "escape-string-regexp"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { createChunkedMessage } from "../../../utils"; import { tagsCmd } from "../types"; -import escapeStringRegexp from "escape-string-regexp"; export const TagListCmd = tagsCmd({ trigger: ["tag list", "tags", "taglist"], diff --git a/backend/src/plugins/Tags/types.ts b/backend/src/plugins/Tags/types.ts index 7ff9328f..3a7eb2b3 100644 --- a/backend/src/plugins/Tags/types.ts +++ b/backend/src/plugins/Tags/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; diff --git a/backend/src/plugins/Tags/util/onMessageCreate.ts b/backend/src/plugins/Tags/util/onMessageCreate.ts index b0e7c419..ba5a14da 100644 --- a/backend/src/plugins/Tags/util/onMessageCreate.ts +++ b/backend/src/plugins/Tags/util/onMessageCreate.ts @@ -5,9 +5,9 @@ import { SavedMessage } from "../../../data/entities/SavedMessage"; import { convertDelayStringToMS, resolveMember, tStrictMessageContent } from "../../../utils"; import { messageIsEmpty } from "../../../utils/messageIsEmpty"; import { validate } from "../../../validatorUtils"; +import { LogsPlugin } from "../../Logs/LogsPlugin"; import { TagsPluginType } from "../types"; import { matchAndRenderTagFromString } from "./matchAndRenderTagFromString"; -import { LogsPlugin } from "../../Logs/LogsPlugin"; export async function onMessageCreate(pluginData: GuildPluginData, msg: SavedMessage) { if (msg.is_bot) return; diff --git a/backend/src/plugins/Tags/util/renderTagFromString.ts b/backend/src/plugins/Tags/util/renderTagFromString.ts index b482741d..84d1759f 100644 --- a/backend/src/plugins/Tags/util/renderTagFromString.ts +++ b/backend/src/plugins/Tags/util/renderTagFromString.ts @@ -1,9 +1,9 @@ import { GuildMember } from "discord.js"; import { GuildPluginData } from "knub"; import { parseArguments } from "knub-command-manager"; -import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { TemplateParseError } from "../../../templateFormatter"; import { StrictMessageContent, validateAndParseMessageContent } from "../../../utils"; +import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { TagsPluginType, TTag } from "../types"; import { renderTagBody } from "./renderTagBody"; diff --git a/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts b/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts index 9a96f834..db425c50 100644 --- a/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts +++ b/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts @@ -1,6 +1,6 @@ import { PluginOptions } from "knub"; import { GuildMemberTimezones } from "../../data/GuildMemberTimezones"; -import { getPluginConfigParser, mapToPublicFn } from "../../pluginUtils"; +import { mapToPublicFn } from "../../pluginUtils"; import { trimPluginDescription } from "../../utils"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { ResetTimezoneCmd } from "./commands/ResetTimezoneCmd"; diff --git a/backend/src/plugins/Utility/UtilityPlugin.ts b/backend/src/plugins/Utility/UtilityPlugin.ts index d26ed836..603c4ee6 100644 --- a/backend/src/plugins/Utility/UtilityPlugin.ts +++ b/backend/src/plugins/Utility/UtilityPlugin.ts @@ -7,6 +7,7 @@ import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { Supporters } from "../../data/Supporters"; import { sendSuccessMessage } from "../../pluginUtils"; import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { ModActionsPlugin } from "../ModActions/ModActionsPlugin"; import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; @@ -42,7 +43,6 @@ import { hasPermission } from "./functions/hasPermission"; import { activeReloads } from "./guildReloads"; import { refreshMembersIfNeeded } from "./refreshMembers"; import { ConfigSchema, UtilityPluginType } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Utility/commands/AboutCmd.ts b/backend/src/plugins/Utility/commands/AboutCmd.ts index 41015e35..3e6443ef 100644 --- a/backend/src/plugins/Utility/commands/AboutCmd.ts +++ b/backend/src/plugins/Utility/commands/AboutCmd.ts @@ -1,13 +1,13 @@ import { APIEmbed, GuildChannel } from "discord.js"; import humanizeDuration from "humanize-duration"; import LCL from "last-commit-log"; +import { shuffle } from "lodash"; import moment from "moment-timezone"; import { rootDir } from "../../../paths"; import { getCurrentUptime } from "../../../uptime"; import { resolveMember, sorter } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { utilityCmd } from "../types"; -import { shuffle } from "lodash"; export const AboutCmd = utilityCmd({ trigger: "about", diff --git a/backend/src/plugins/Utility/commands/AvatarCmd.ts b/backend/src/plugins/Utility/commands/AvatarCmd.ts index e1518ca0..4db271f3 100644 --- a/backend/src/plugins/Utility/commands/AvatarCmd.ts +++ b/backend/src/plugins/Utility/commands/AvatarCmd.ts @@ -1,4 +1,4 @@ -import { ImageFormat, APIEmbed } from "discord.js"; +import { APIEmbed, ImageFormat } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; import { UnknownUser } from "../../../utils"; diff --git a/backend/src/plugins/Utility/commands/CleanCmd.ts b/backend/src/plugins/Utility/commands/CleanCmd.ts index 5e99cecc..673d7e12 100644 --- a/backend/src/plugins/Utility/commands/CleanCmd.ts +++ b/backend/src/plugins/Utility/commands/CleanCmd.ts @@ -3,13 +3,13 @@ import { GuildPluginData } from "knub"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { humanizeDurationShort } from "../../../humanizeDurationShort"; import { ModActionsPlugin } from "../../../plugins/ModActions/ModActionsPlugin"; import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { allowTimeout } from "../../../RegExpRunner"; import { DAYS, getInviteCodesInString, noop, SECONDS } from "../../../utils"; -import { utilityCmd, UtilityPluginType } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { humanizeDurationShort } from "../../../humanizeDurationShort"; +import { utilityCmd, UtilityPluginType } from "../types"; const MAX_CLEAN_COUNT = 150; const MAX_CLEAN_TIME = 1 * DAYS; diff --git a/backend/src/plugins/Utility/commands/EmojiInfoCmd.ts b/backend/src/plugins/Utility/commands/EmojiInfoCmd.ts index 7a60eda6..5c89f3eb 100644 --- a/backend/src/plugins/Utility/commands/EmojiInfoCmd.ts +++ b/backend/src/plugins/Utility/commands/EmojiInfoCmd.ts @@ -1,7 +1,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; -import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed"; import { getCustomEmojiId } from "../functions/getCustomEmojiId"; +import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed"; import { utilityCmd } from "../types"; export const EmojiInfoCmd = utilityCmd({ diff --git a/backend/src/plugins/Utility/commands/InfoCmd.ts b/backend/src/plugins/Utility/commands/InfoCmd.ts index 5dcf3456..567ce1ea 100644 --- a/backend/src/plugins/Utility/commands/InfoCmd.ts +++ b/backend/src/plugins/Utility/commands/InfoCmd.ts @@ -3,19 +3,19 @@ import { getChannelId, getRoleId } from "knub/dist/utils"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; import { isValidSnowflake, noop, parseInviteCodeInput, resolveInvite, resolveUser } from "../../../utils"; -import { getUserInfoEmbed } from "../functions/getUserInfoEmbed"; import { canReadChannel } from "../../../utils/canReadChannel"; import { resolveMessageTarget } from "../../../utils/resolveMessageTarget"; import { getChannelInfoEmbed } from "../functions/getChannelInfoEmbed"; +import { getCustomEmojiId } from "../functions/getCustomEmojiId"; +import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed"; import { getGuildPreview } from "../functions/getGuildPreview"; import { getInviteInfoEmbed } from "../functions/getInviteInfoEmbed"; import { getMessageInfoEmbed } from "../functions/getMessageInfoEmbed"; import { getRoleInfoEmbed } from "../functions/getRoleInfoEmbed"; -import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed"; -import { getCustomEmojiId } from "../functions/getCustomEmojiId"; -import { utilityCmd } from "../types"; import { getServerInfoEmbed } from "../functions/getServerInfoEmbed"; import { getSnowflakeInfoEmbed } from "../functions/getSnowflakeInfoEmbed"; +import { getUserInfoEmbed } from "../functions/getUserInfoEmbed"; +import { utilityCmd } from "../types"; export const InfoCmd = utilityCmd({ trigger: "info", diff --git a/backend/src/plugins/Utility/commands/JumboCmd.ts b/backend/src/plugins/Utility/commands/JumboCmd.ts index e60acf5b..bc9f70ab 100644 --- a/backend/src/plugins/Utility/commands/JumboCmd.ts +++ b/backend/src/plugins/Utility/commands/JumboCmd.ts @@ -1,6 +1,6 @@ +import photon from "@silvia-odwyer/photon-node"; import { AttachmentBuilder } from "discord.js"; import fs from "fs"; -import photon from "@silvia-odwyer/photon-node"; import twemoji from "twemoji"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; diff --git a/backend/src/plugins/Utility/commands/NicknameCmd.ts b/backend/src/plugins/Utility/commands/NicknameCmd.ts index 6f4b6073..9821ef32 100644 --- a/backend/src/plugins/Utility/commands/NicknameCmd.ts +++ b/backend/src/plugins/Utility/commands/NicknameCmd.ts @@ -1,8 +1,8 @@ -import { commandTypeHelpers as ct } from "../../../commandTypes"; -import { errorMessage } from "../../../utils"; -import { canActOn, sendSuccessMessage } from "../../../pluginUtils"; -import { utilityCmd } from "../types"; import { escapeBold } from "discord.js"; +import { commandTypeHelpers as ct } from "../../../commandTypes"; +import { canActOn, sendSuccessMessage } from "../../../pluginUtils"; +import { errorMessage } from "../../../utils"; +import { utilityCmd } from "../types"; export const NicknameCmd = utilityCmd({ trigger: ["nickname", "nick"], diff --git a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts index cbe476aa..1cfc305b 100644 --- a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts +++ b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts @@ -1,8 +1,8 @@ import { VoiceChannel } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { utilityCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { utilityCmd } from "../types"; export const VcdisconnectCmd = utilityCmd({ trigger: ["vcdisconnect", "vcdisc", "vcdc", "vckick", "vck"], diff --git a/backend/src/plugins/Utility/commands/VcmoveCmd.ts b/backend/src/plugins/Utility/commands/VcmoveCmd.ts index 798a5120..bc0481fc 100644 --- a/backend/src/plugins/Utility/commands/VcmoveCmd.ts +++ b/backend/src/plugins/Utility/commands/VcmoveCmd.ts @@ -2,8 +2,8 @@ import { ChannelType, Snowflake, VoiceChannel } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { channelMentionRegex, isSnowflake, simpleClosestStringMatch } from "../../../utils"; -import { utilityCmd } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { utilityCmd } from "../types"; export const VcmoveCmd = utilityCmd({ trigger: "vcmove", diff --git a/backend/src/plugins/Utility/types.ts b/backend/src/plugins/Utility/types.ts index 949d3042..134c0f48 100644 --- a/backend/src/plugins/Utility/types.ts +++ b/backend/src/plugins/Utility/types.ts @@ -1,5 +1,5 @@ import * as t from "io-ts"; -import { BasePluginType, guildPluginMessageCommand, guildPluginEventListener } from "knub"; +import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; diff --git a/backend/src/plugins/WelcomeMessage/WelcomeMessagePlugin.ts b/backend/src/plugins/WelcomeMessage/WelcomeMessagePlugin.ts index 60d7ca07..bb319b57 100644 --- a/backend/src/plugins/WelcomeMessage/WelcomeMessagePlugin.ts +++ b/backend/src/plugins/WelcomeMessage/WelcomeMessagePlugin.ts @@ -1,9 +1,9 @@ import { PluginOptions } from "knub"; import { GuildLogs } from "../../data/GuildLogs"; +import { LogsPlugin } from "../Logs/LogsPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { SendWelcomeMessageEvt } from "./events/SendWelcomeMessageEvt"; import { ConfigSchema, WelcomeMessagePluginType } from "./types"; -import { LogsPlugin } from "../Logs/LogsPlugin"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts index c74fd04f..fac26322 100644 --- a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts +++ b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts @@ -1,14 +1,14 @@ import { Snowflake, TextChannel } from "discord.js"; +import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { createChunkedMessage, verboseChannelMention, verboseUserMention } from "../../../utils"; +import { sendDM } from "../../../utils/sendDM"; import { guildToTemplateSafeGuild, memberToTemplateSafeMember, userToTemplateSafeUser, } from "../../../utils/templateSafeObjects"; -import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter"; -import { createChunkedMessage, verboseChannelMention, verboseUserMention } from "../../../utils"; -import { sendDM } from "../../../utils/sendDM"; -import { welcomeMessageEvt } from "../types"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { welcomeMessageEvt } from "../types"; export const SendWelcomeMessageEvt = welcomeMessageEvt({ event: "guildMemberAdd", diff --git a/backend/src/plugins/ZeppelinPluginBlueprint.ts b/backend/src/plugins/ZeppelinPluginBlueprint.ts index 783d327d..a2ab9869 100644 --- a/backend/src/plugins/ZeppelinPluginBlueprint.ts +++ b/backend/src/plugins/ZeppelinPluginBlueprint.ts @@ -1,12 +1,12 @@ import * as t from "io-ts"; import { BasePluginType, + globalPlugin, GlobalPluginBlueprint, GlobalPluginData, + guildPlugin, GuildPluginBlueprint, GuildPluginData, - globalPlugin, - guildPlugin, } from "knub"; import { PluginOptions } from "knub/dist/config/configTypes"; import { Awaitable } from "knub/dist/utils"; diff --git a/backend/src/plugins/availablePlugins.ts b/backend/src/plugins/availablePlugins.ts index d47df12f..ab8bfc1e 100644 --- a/backend/src/plugins/availablePlugins.ts +++ b/backend/src/plugins/availablePlugins.ts @@ -12,6 +12,7 @@ import { CustomEventsPlugin } from "./CustomEvents/CustomEventsPlugin"; import { GuildAccessMonitorPlugin } from "./GuildAccessMonitor/GuildAccessMonitorPlugin"; import { GuildConfigReloaderPlugin } from "./GuildConfigReloader/GuildConfigReloaderPlugin"; import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin"; +import { InternalPosterPlugin } from "./InternalPoster/InternalPosterPlugin"; import { LocateUserPlugin } from "./LocateUser/LocateUserPlugin"; import { LogsPlugin } from "./Logs/LogsPlugin"; import { MessageSaverPlugin } from "./MessageSaver/MessageSaverPlugin"; @@ -19,10 +20,13 @@ import { ModActionsPlugin } from "./ModActions/ModActionsPlugin"; import { MutesPlugin } from "./Mutes/MutesPlugin"; import { NameHistoryPlugin } from "./NameHistory/NameHistoryPlugin"; import { PersistPlugin } from "./Persist/PersistPlugin"; +import { PhishermanPlugin } from "./Phisherman/PhishermanPlugin"; import { PingableRolesPlugin } from "./PingableRoles/PingableRolesPlugin"; import { PostPlugin } from "./Post/PostPlugin"; import { ReactionRolesPlugin } from "./ReactionRoles/ReactionRolesPlugin"; import { RemindersPlugin } from "./Reminders/RemindersPlugin"; +import { RoleButtonsPlugin } from "./RoleButtons/RoleButtonsPlugin"; +import { RoleManagerPlugin } from "./RoleManager/RoleManagerPlugin"; import { RolesPlugin } from "./Roles/RolesPlugin"; import { SelfGrantableRolesPlugin } from "./SelfGrantableRoles/SelfGrantableRolesPlugin"; import { SlowmodePlugin } from "./Slowmode/SlowmodePlugin"; @@ -34,10 +38,6 @@ import { UsernameSaverPlugin } from "./UsernameSaver/UsernameSaverPlugin"; import { UtilityPlugin } from "./Utility/UtilityPlugin"; import { WelcomeMessagePlugin } from "./WelcomeMessage/WelcomeMessagePlugin"; import { ZeppelinGlobalPluginBlueprint, ZeppelinGuildPluginBlueprint } from "./ZeppelinPluginBlueprint"; -import { PhishermanPlugin } from "./Phisherman/PhishermanPlugin"; -import { InternalPosterPlugin } from "./InternalPoster/InternalPosterPlugin"; -import { RoleManagerPlugin } from "./RoleManager/RoleManagerPlugin"; -import { RoleButtonsPlugin } from "./RoleButtons/RoleButtonsPlugin"; // prettier-ignore export const guildPlugins: Array> = [ diff --git a/backend/src/utils.ts b/backend/src/utils.ts index dfd4b1ea..396493d4 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -34,17 +34,17 @@ import humanizeDuration from "humanize-duration"; import * as t from "io-ts"; import { isEqual } from "lodash"; import moment from "moment-timezone"; +import { performance } from "perf_hooks"; import tlds from "tlds"; import tmp from "tmp"; import { URL } from "url"; +import { z, ZodError } from "zod"; import { ISavedMessageAttachmentData, SavedMessage } from "./data/entities/SavedMessage"; +import { getProfiler } from "./profiler"; import { SimpleCache } from "./SimpleCache"; import { sendDM } from "./utils/sendDM"; import { waitForButtonConfirm } from "./utils/waitForInteraction"; import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils"; -import { z, ZodError } from "zod"; -import { getProfiler } from "./profiler"; -import { performance } from "perf_hooks"; const fsp = fs.promises; diff --git a/backend/src/utils/MessageBuffer.ts b/backend/src/utils/MessageBuffer.ts index 17022357..7cef009c 100644 --- a/backend/src/utils/MessageBuffer.ts +++ b/backend/src/utils/MessageBuffer.ts @@ -1,6 +1,6 @@ import { StrictMessageContent } from "../utils"; -import Timeout = NodeJS.Timeout; import { calculateEmbedSize } from "./calculateEmbedSize"; +import Timeout = NodeJS.Timeout; type ConsumeFn = (part: StrictMessageContent) => void; diff --git a/backend/src/utils/crypt.ts b/backend/src/utils/crypt.ts index 2b602bc7..026892ec 100644 --- a/backend/src/utils/crypt.ts +++ b/backend/src/utils/crypt.ts @@ -1,6 +1,6 @@ -import { spawn, Worker, Pool } from "threads"; -import { MINUTES } from "../utils"; +import { Pool, spawn, Worker } from "threads"; import { env } from "../env"; +import { MINUTES } from "../utils"; const pool = Pool(() => spawn(new Worker("./cryptWorker"), { timeout: 10 * MINUTES }), 8); diff --git a/backend/src/utils/easyProfiler.ts b/backend/src/utils/easyProfiler.ts index b26c68b4..5a7ae065 100644 --- a/backend/src/utils/easyProfiler.ts +++ b/backend/src/utils/easyProfiler.ts @@ -1,6 +1,6 @@ import { Profiler } from "knub/dist/Profiler"; import { performance } from "perf_hooks"; -import { SECONDS, noop } from "../utils"; +import { noop, SECONDS } from "../utils"; let _profilingEnabled = false; diff --git a/backend/src/utils/messageIsEmpty.ts b/backend/src/utils/messageIsEmpty.ts index 8b4a80b9..4721f7eb 100644 --- a/backend/src/utils/messageIsEmpty.ts +++ b/backend/src/utils/messageIsEmpty.ts @@ -1,6 +1,6 @@ import { MessageCreateOptions } from "discord.js"; -import { messageHasContent } from "./messageHasContent"; import { StrictMessageContent } from "../utils.js"; +import { messageHasContent } from "./messageHasContent"; export function messageIsEmpty(content: string | MessageCreateOptions | StrictMessageContent): boolean { return !messageHasContent(content); diff --git a/backend/src/utils/templateSafeObjects.ts b/backend/src/utils/templateSafeObjects.ts index 3616b154..05e3f08f 100644 --- a/backend/src/utils/templateSafeObjects.ts +++ b/backend/src/utils/templateSafeObjects.ts @@ -12,9 +12,9 @@ import { StickerFormatType, User, } from "discord.js"; -import { UnknownUser } from "src/utils"; import { GuildPluginData } from "knub"; -import { TemplateSafeValueContainer, TypedTemplateSafeValueContainer } from "../templateFormatter"; +import { UnknownUser } from "src/utils"; +import { Case } from "../data/entities/Case"; import { ISavedMessageAttachmentData, ISavedMessageData, @@ -22,7 +22,7 @@ import { ISavedMessageStickerData, SavedMessage, } from "../data/entities/SavedMessage"; -import { Case } from "../data/entities/Case"; +import { TemplateSafeValueContainer, TypedTemplateSafeValueContainer } from "../templateFormatter"; type InputProps = Omit< { diff --git a/dashboard/src/init-vue.ts b/dashboard/src/init-vue.ts index 614b5609..1c1cbbd8 100644 --- a/dashboard/src/init-vue.ts +++ b/dashboard/src/init-vue.ts @@ -4,11 +4,11 @@ import Vue from "vue"; import hljs from "highlight.js/lib/highlight.js"; import hljsYaml from "highlight.js/lib/languages/yaml.js"; -import VueHighlightJS from "vue-highlightjs"; import "highlight.js/styles/ocean.css"; +import VueHighlightJS from "vue-highlightjs"; -import { RootStore } from "./store"; import { router } from "./routes"; +import { RootStore } from "./store"; import "./directives/trim-indents"; diff --git a/dashboard/src/routes.ts b/dashboard/src/routes.ts index e442f615..15ac3d96 100644 --- a/dashboard/src/routes.ts +++ b/dashboard/src/routes.ts @@ -1,5 +1,5 @@ import Vue from "vue"; -import VueRouter, { RouteConfig } from "vue-router"; +import VueRouter from "vue-router"; import { authGuard, authRedirectGuard, loginCallbackGuard } from "./auth"; Vue.use(VueRouter); diff --git a/dashboard/src/store/auth.ts b/dashboard/src/store/auth.ts index 457284b3..ff2de198 100644 --- a/dashboard/src/store/auth.ts +++ b/dashboard/src/store/auth.ts @@ -1,5 +1,5 @@ -import { get, post } from "../api"; -import { ActionTree, Module } from "vuex"; +import { Module } from "vuex"; +import { post } from "../api"; import { AuthState, IntervalType, RootState } from "./types"; // Refresh auth every 15 minutes diff --git a/dashboard/src/store/docs.ts b/dashboard/src/store/docs.ts index 5ef5e0d2..842cd1a1 100644 --- a/dashboard/src/store/docs.ts +++ b/dashboard/src/store/docs.ts @@ -1,5 +1,5 @@ -import { get } from "../api"; import { Module } from "vuex"; +import { get } from "../api"; import { DocsState, RootState } from "./types"; export const DocsStore: Module = { diff --git a/dashboard/src/store/guilds.ts b/dashboard/src/store/guilds.ts index bfdbe71b..0064aace 100644 --- a/dashboard/src/store/guilds.ts +++ b/dashboard/src/store/guilds.ts @@ -1,8 +1,7 @@ -import { get, post } from "../api"; -import { Module } from "vuex"; -import { GuildState, LoadStatus, RootState } from "./types"; -import { ApiPermissions } from "@shared/apiPermissions"; import Vue from "vue"; +import { Module } from "vuex"; +import { get, post } from "../api"; +import { GuildState, LoadStatus, RootState } from "./types"; export const GuildStore: Module = { namespaced: true, diff --git a/dashboard/src/store/index.ts b/dashboard/src/store/index.ts index c4aadd83..6c7b3792 100644 --- a/dashboard/src/store/index.ts +++ b/dashboard/src/store/index.ts @@ -3,10 +3,10 @@ import Vuex, { Store } from "vuex"; Vue.use(Vuex); -import { RootState } from "./types"; import { AuthStore } from "./auth"; -import { GuildStore } from "./guilds"; import { DocsStore } from "./docs"; +import { GuildStore } from "./guilds"; +import { RootState } from "./types"; export const RootStore = new Vuex.Store({ modules: { diff --git a/dashboard/src/store/staff.ts b/dashboard/src/store/staff.ts index c6855598..293d2888 100644 --- a/dashboard/src/store/staff.ts +++ b/dashboard/src/store/staff.ts @@ -1,5 +1,5 @@ -import { get, post } from "../api"; import { Module } from "vuex"; +import { get } from "../api"; import { RootState, StaffState } from "./types"; export const StaffStore: Module = { diff --git a/package-lock.json b/package-lock.json index 734f757c..e0caec99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "husky": "^3.0.9", "lint-staged": "^9.4.2", "prettier": "^2.8.4", + "prettier-plugin-organize-imports": "^3.2.2", "tslint": "^5.13.1", "tslint-config-prettier": "^1.18.0", "typescript": "~4.9.5" @@ -1808,6 +1809,26 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/prettier-plugin-organize-imports": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.2.tgz", + "integrity": "sha512-e97lE6odGSiHonHJMTYC0q0iLXQyw0u5z/PJpvP/3vRy6/Zi9kLBwFAbEGjDzIowpjQv8b+J04PDamoUSQbzGA==", + "dev": true, + "peerDependencies": { + "@volar/vue-language-plugin-pug": "^1.0.4", + "@volar/vue-typescript": "^1.0.4", + "prettier": ">=2.0", + "typescript": ">=2.9" + }, + "peerDependenciesMeta": { + "@volar/vue-language-plugin-pug": { + "optional": true + }, + "@volar/vue-typescript": { + "optional": true + } + } + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -3755,6 +3776,13 @@ "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==", "dev": true }, + "prettier-plugin-organize-imports": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.2.tgz", + "integrity": "sha512-e97lE6odGSiHonHJMTYC0q0iLXQyw0u5z/PJpvP/3vRy6/Zi9kLBwFAbEGjDzIowpjQv8b+J04PDamoUSQbzGA==", + "dev": true, + "requires": {} + }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", diff --git a/package.json b/package.json index 165561ec..1ef0c5fe 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "husky": "^3.0.9", "lint-staged": "^9.4.2", "prettier": "^2.8.4", + "prettier-plugin-organize-imports": "^3.2.2", "tslint": "^5.13.1", "tslint-config-prettier": "^1.18.0", "typescript": "~4.9.5" diff --git a/presetup-configurator/src/App.tsx b/presetup-configurator/src/App.tsx index 54e9e365..b0eb1e1f 100644 --- a/presetup-configurator/src/App.tsx +++ b/presetup-configurator/src/App.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Configurator } from "./Configurator"; import "./App.css"; +import { Configurator } from "./Configurator"; export function App() { return ( diff --git a/presetup-configurator/src/Configurator.tsx b/presetup-configurator/src/Configurator.tsx index 02fd9d7d..8a8da679 100644 --- a/presetup-configurator/src/Configurator.tsx +++ b/presetup-configurator/src/Configurator.tsx @@ -1,8 +1,8 @@ +import yaml from "js-yaml"; import React, { useEffect, useState } from "react"; +import "./Configurator.css"; import { LevelEntry, Levels } from "./Levels"; import { LogChannel, LogChannels } from "./LogChannels"; -import yaml from "js-yaml"; -import "./Configurator.css"; export function Configurator() { const [prefix, setPrefix] = useState("!"); diff --git a/presetup-configurator/src/Levels.tsx b/presetup-configurator/src/Levels.tsx index cb1cc8a9..81f860c7 100644 --- a/presetup-configurator/src/Levels.tsx +++ b/presetup-configurator/src/Levels.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React from "react"; const LEVEL_ADMIN = 100; const LEVEL_MODERATOR = 50; diff --git a/presetup-configurator/src/LogChannels.tsx b/presetup-configurator/src/LogChannels.tsx index 82a6a59d..40c0ca0f 100644 --- a/presetup-configurator/src/LogChannels.tsx +++ b/presetup-configurator/src/LogChannels.tsx @@ -1,4 +1,4 @@ -import React, { SetStateAction, useState } from "react"; +import React, { SetStateAction } from "react"; import "./LogChannels.css"; const LOG_TYPES = { diff --git a/shared/src/apiPermissions.test.ts b/shared/src/apiPermissions.test.ts index 98d8752b..365e4f08 100644 --- a/shared/src/apiPermissions.test.ts +++ b/shared/src/apiPermissions.test.ts @@ -1,5 +1,5 @@ -import { ApiPermissions, hasPermission } from "./apiPermissions"; import test from "ava"; +import { ApiPermissions, hasPermission } from "./apiPermissions"; test("Directly granted permissions match", (t) => { t.is(hasPermission(new Set([ApiPermissions.ManageAccess]), ApiPermissions.ManageAccess), true);