diff --git a/backend/src/api/guilds.ts b/backend/src/api/guilds.ts index c85f5b1e..ba937093 100644 --- a/backend/src/api/guilds.ts +++ b/backend/src/api/guilds.ts @@ -2,13 +2,13 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; import { YAMLException } from "js-yaml"; import moment from "moment-timezone"; +import { Queue } from "../Queue"; 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 { AuditLogEventTypes } from "../data/apiAuditLogTypes"; import { isSnowflake } from "../utils"; import { loadYamlSafely } from "../utils/loadYamlSafely"; import { ObjectAliasError } from "../utils/validateNoObjectAliases"; diff --git a/backend/src/api/guilds/importExport.ts b/backend/src/api/guilds/importExport.ts index 9e91f4af..35428347 100644 --- a/backend/src/api/guilds/importExport.ts +++ b/backend/src/api/guilds/importExport.ts @@ -2,8 +2,8 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; import moment from "moment-timezone"; import { z } from "zod"; -import { Case } from "../../data/entities/Case"; import { GuildCases } from "../../data/GuildCases"; +import { Case } from "../../data/entities/Case"; import { MINUTES } from "../../utils"; import { requireGuildPermission } from "../permissions"; import { rateLimit } from "../rateLimits"; diff --git a/backend/src/api/guilds/misc.ts b/backend/src/api/guilds/misc.ts index 8ec25d56..b512b62c 100644 --- a/backend/src/api/guilds/misc.ts +++ b/backend/src/api/guilds/misc.ts @@ -2,13 +2,13 @@ import { ApiPermissions } from "@shared/apiPermissions"; import express, { Request, Response } from "express"; import { YAMLException } from "js-yaml"; import moment from "moment-timezone"; +import { Queue } from "../../Queue"; 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 { AuditLogEventTypes } from "../../data/apiAuditLogTypes"; import { isSnowflake } from "../../utils"; import { loadYamlSafely } from "../../utils/loadYamlSafely"; import { ObjectAliasError } from "../../utils/validateNoObjectAliases"; diff --git a/backend/src/configValidator.ts b/backend/src/configValidator.ts index 4d62536f..3bb602a4 100644 --- a/backend/src/configValidator.ts +++ b/backend/src/configValidator.ts @@ -1,9 +1,9 @@ import { ConfigValidationError, PluginConfigManager } from "knub"; import moment from "moment-timezone"; -import { guildPlugins } from "./plugins/availablePlugins"; import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin"; +import { guildPlugins } from "./plugins/availablePlugins"; import { PartialZeppelinGuildConfigSchema, ZeppelinGuildConfig } from "./types"; -import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils"; +import { StrictValidationError, decodeAndValidateStrict } from "./validatorUtils"; const pluginNameToPlugin = new Map(); for (const plugin of guildPlugins) { diff --git a/backend/src/data/ApiUserInfo.ts b/backend/src/data/ApiUserInfo.ts index b7cd34ae..2ef43f87 100644 --- a/backend/src/data/ApiUserInfo.ts +++ b/backend/src/data/ApiUserInfo.ts @@ -3,7 +3,7 @@ import { getRepository, Repository } from "typeorm"; import { DBDateFormat } from "../utils"; import { BaseRepository } from "./BaseRepository"; import { connection } from "./db"; -import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo"; +import { ApiUserInfoData, ApiUserInfo as ApiUserInfoEntity } from "./entities/ApiUserInfo"; export class ApiUserInfo extends BaseRepository { private apiUserInfo: Repository; diff --git a/backend/src/data/GuildArchives.ts b/backend/src/data/GuildArchives.ts index 297028a3..bc1df143 100644 --- a/backend/src/data/GuildArchives.ts +++ b/backend/src/data/GuildArchives.ts @@ -1,8 +1,8 @@ import { Guild, Snowflake } from "discord.js"; import moment from "moment-timezone"; import { isDefaultSticker } from "src/utils/isDefaultSticker"; -import { getRepository, Repository } from "typeorm"; -import { renderTemplate, TemplateSafeValueContainer } from "../templateFormatter"; +import { Repository, getRepository } from "typeorm"; +import { TemplateSafeValueContainer, renderTemplate } from "../templateFormatter"; import { trimLines } from "../utils"; import { decrypt, encrypt } from "../utils/crypt"; import { channelToTemplateSafeChannel, guildToTemplateSafeGuild } from "../utils/templateSafeObjects"; diff --git a/backend/src/data/GuildSavedMessages.ts b/backend/src/data/GuildSavedMessages.ts index 5ea29cd7..7ec06fbc 100644 --- a/backend/src/data/GuildSavedMessages.ts +++ b/backend/src/data/GuildSavedMessages.ts @@ -1,6 +1,6 @@ import { GuildChannel, Message } from "discord.js"; import moment from "moment-timezone"; -import { getRepository, Repository } from "typeorm"; +import { Repository, getRepository } from "typeorm"; import { QueuedEventEmitter } from "../QueuedEventEmitter"; import { noop } from "../utils"; import { asyncMap } from "../utils/async"; diff --git a/backend/src/data/db.ts b/backend/src/data/db.ts index decfb431..82c4c3f5 100644 --- a/backend/src/data/db.ts +++ b/backend/src/data/db.ts @@ -1,7 +1,7 @@ import path from "path"; import { Connection, createConnection } from "typeorm"; -import { backendDir } from "../paths"; import { SimpleError } from "../SimpleError"; +import { backendDir } from "../paths"; import { QueryLogger } from "./queryLogger"; const ormconfigPath = path.join(backendDir, "ormconfig.js"); diff --git a/backend/src/pluginUtils.ts b/backend/src/pluginUtils.ts index e9138d3d..4d7cf6a7 100644 --- a/backend/src/pluginUtils.ts +++ b/backend/src/pluginUtils.ts @@ -17,15 +17,15 @@ import { ConfigValidationError, ExtendedMatchParams, GuildPluginData, - helpers, PluginOverrideCriteria, + helpers, } from "knub"; import { logger } from "./logger"; import { isStaff } from "./staff"; import { TZeppelinKnub } from "./types"; import { errorMessage, successMessage, tNullable } from "./utils"; import { Tail } from "./utils/typeUtils"; -import { parseIoTsSchema, StrictValidationError } from "./validatorUtils"; +import { StrictValidationError, parseIoTsSchema } from "./validatorUtils"; const { getMemberLevel } = helpers; diff --git a/backend/src/plugins/AutoDelete/types.ts b/backend/src/plugins/AutoDelete/types.ts index 2294f222..24389860 100644 --- a/backend/src/plugins/AutoDelete/types.ts +++ b/backend/src/plugins/AutoDelete/types.ts @@ -1,8 +1,8 @@ import * as t from "io-ts"; import { BasePluginType } from "knub"; -import { SavedMessage } from "../../data/entities/SavedMessage"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; +import { SavedMessage } from "../../data/entities/SavedMessage"; import { MINUTES, tDelayString } from "../../utils"; import Timeout = NodeJS.Timeout; diff --git a/backend/src/plugins/AutoReactions/types.ts b/backend/src/plugins/AutoReactions/types.ts index 99bbe8c8..a02c3c26 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, 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/actions/changePerms.ts b/backend/src/plugins/Automod/actions/changePerms.ts index 3f22948c..6c67eb8d 100644 --- a/backend/src/plugins/Automod/actions/changePerms.ts +++ b/backend/src/plugins/Automod/actions/changePerms.ts @@ -1,6 +1,6 @@ import { PermissionsBitField, PermissionsString } from "discord.js"; import * as t from "io-ts"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { isValidSnowflake, noop, tNullable, tPartialDictionary } from "../../../utils"; import { guildToTemplateSafeGuild, diff --git a/backend/src/plugins/Automod/actions/reply.ts b/backend/src/plugins/Automod/actions/reply.ts index ec7ffc1b..6239cee8 100644 --- a/backend/src/plugins/Automod/actions/reply.ts +++ b/backend/src/plugins/Automod/actions/reply.ts @@ -1,6 +1,6 @@ import { GuildTextBasedChannel, MessageCreateOptions, PermissionsBitField, Snowflake, User } from "discord.js"; import * as t from "io-ts"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { convertDelayStringToMS, noop, diff --git a/backend/src/plugins/Automod/actions/startThread.ts b/backend/src/plugins/Automod/actions/startThread.ts index 055c9493..b5d75285 100644 --- a/backend/src/plugins/Automod/actions/startThread.ts +++ b/backend/src/plugins/Automod/actions/startThread.ts @@ -6,8 +6,8 @@ import { ThreadChannel, } from "discord.js"; import * as t from "io-ts"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; -import { convertDelayStringToMS, MINUTES, noop, tDelayString, tNullable } from "../../../utils"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; +import { MINUTES, convertDelayStringToMS, noop, tDelayString, tNullable } from "../../../utils"; import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { automodAction } from "../helpers"; diff --git a/backend/src/plugins/Automod/functions/addRecentActionsFromMessage.ts b/backend/src/plugins/Automod/functions/addRecentActionsFromMessage.ts index 4f533182..74451c9e 100644 --- a/backend/src/plugins/Automod/functions/addRecentActionsFromMessage.ts +++ b/backend/src/plugins/Automod/functions/addRecentActionsFromMessage.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; import { getEmojiInString, getRoleMentions, getUrlsInString, getUserMentions } from "../../../utils"; -import { RecentActionType, RECENT_ACTION_EXPIRY_TIME } from "../constants"; +import { RECENT_ACTION_EXPIRY_TIME, RecentActionType } from "../constants"; import { AutomodContext, AutomodPluginType } from "../types"; export function addRecentActionsFromMessage(pluginData: GuildPluginData, context: AutomodContext) { diff --git a/backend/src/plugins/Automod/functions/resolveActionContactMethods.ts b/backend/src/plugins/Automod/functions/resolveActionContactMethods.ts index d26c318b..24d3ac6a 100644 --- a/backend/src/plugins/Automod/functions/resolveActionContactMethods.ts +++ b/backend/src/plugins/Automod/functions/resolveActionContactMethods.ts @@ -1,7 +1,7 @@ import { Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; -import { disableUserNotificationStrings, UserNotificationMethod } from "../../../utils"; +import { UserNotificationMethod, disableUserNotificationStrings } from "../../../utils"; import { AutomodPluginType } from "../types"; export function resolveActionContactMethods( diff --git a/backend/src/plugins/Automod/triggers/matchLinks.ts b/backend/src/plugins/Automod/triggers/matchLinks.ts index 39fb7320..5a8de7de 100644 --- a/backend/src/plugins/Automod/triggers/matchLinks.ts +++ b/backend/src/plugins/Automod/triggers/matchLinks.ts @@ -1,7 +1,7 @@ import { escapeInlineCode } from "discord.js"; import * as t from "io-ts"; -import { phishermanDomainIsSafe } from "../../../data/Phisherman"; import { allowTimeout } from "../../../RegExpRunner"; +import { phishermanDomainIsSafe } from "../../../data/Phisherman"; import { getUrlsInString, tNullable } from "../../../utils"; import { mergeRegexes } from "../../../utils/mergeRegexes"; import { mergeWordsIntoRegex } from "../../../utils/mergeWordsIntoRegex"; diff --git a/backend/src/plugins/Automod/triggers/threadArchive.ts b/backend/src/plugins/Automod/triggers/threadArchive.ts index 6177983e..0e65b10a 100644 --- a/backend/src/plugins/Automod/triggers/threadArchive.ts +++ b/backend/src/plugins/Automod/triggers/threadArchive.ts @@ -1,4 +1,4 @@ -import { escapeBold, User, type Snowflake } from "discord.js"; +import { User, escapeBold, type Snowflake } from "discord.js"; import * as t from "io-ts"; import { tNullable } from "../../../utils"; import { automodTrigger } from "../helpers"; diff --git a/backend/src/plugins/Automod/triggers/threadCreate.ts b/backend/src/plugins/Automod/triggers/threadCreate.ts index 640432c3..7b8aca71 100644 --- a/backend/src/plugins/Automod/triggers/threadCreate.ts +++ b/backend/src/plugins/Automod/triggers/threadCreate.ts @@ -1,4 +1,4 @@ -import { escapeBold, User, type Snowflake } from "discord.js"; +import { User, escapeBold, type Snowflake } from "discord.js"; import * as t from "io-ts"; import { automodTrigger } from "../helpers"; diff --git a/backend/src/plugins/Automod/triggers/threadDelete.ts b/backend/src/plugins/Automod/triggers/threadDelete.ts index 25a93268..489b5b4c 100644 --- a/backend/src/plugins/Automod/triggers/threadDelete.ts +++ b/backend/src/plugins/Automod/triggers/threadDelete.ts @@ -1,4 +1,4 @@ -import { escapeBold, User, type Snowflake } from "discord.js"; +import { User, escapeBold, type Snowflake } from "discord.js"; import * as t from "io-ts"; import { automodTrigger } from "../helpers"; diff --git a/backend/src/plugins/Automod/triggers/threadUnarchive.ts b/backend/src/plugins/Automod/triggers/threadUnarchive.ts index 897f685e..f6047f48 100644 --- a/backend/src/plugins/Automod/triggers/threadUnarchive.ts +++ b/backend/src/plugins/Automod/triggers/threadUnarchive.ts @@ -1,4 +1,4 @@ -import { escapeBold, User, type Snowflake } from "discord.js"; +import { User, escapeBold, type Snowflake } from "discord.js"; import * as t from "io-ts"; import { tNullable } from "../../../utils"; import { automodTrigger } from "../helpers"; diff --git a/backend/src/plugins/Automod/types.ts b/backend/src/plugins/Automod/types.ts index 0711d76b..bd3f05ee 100644 --- a/backend/src/plugins/Automod/types.ts +++ b/backend/src/plugins/Automod/types.ts @@ -1,16 +1,16 @@ import { GuildMember, GuildTextBasedChannel, PartialGuildMember, ThreadChannel, User } from "discord.js"; import * as t from "io-ts"; import { BasePluginType, CooldownManager } from "knub"; -import { SavedMessage } from "../../data/entities/SavedMessage"; +import { Queue } from "../../Queue"; +import { RegExpRunner } from "../../RegExpRunner"; import { GuildAntiraidLevels } from "../../data/GuildAntiraidLevels"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; -import { Queue } from "../../Queue"; -import { RegExpRunner } from "../../RegExpRunner"; +import { SavedMessage } from "../../data/entities/SavedMessage"; import { tNullable } from "../../utils"; import { CounterEvents } from "../Counters/types"; -import { ModActionsEvents, ModActionType } from "../ModActions/types"; +import { ModActionType, ModActionsEvents } from "../ModActions/types"; import { MutesEvents } from "../Mutes/types"; import { AvailableActions } from "./actions/availableActions"; import { RecentActionType } from "./constants"; diff --git a/backend/src/plugins/Cases/functions/createCaseNote.ts b/backend/src/plugins/Cases/functions/createCaseNote.ts index 30f0ac2e..09573ccc 100644 --- a/backend/src/plugins/Cases/functions/createCaseNote.ts +++ b/backend/src/plugins/Cases/functions/createCaseNote.ts @@ -1,6 +1,6 @@ import { GuildPluginData } from "knub"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { CaseNoteArgs, CasesPluginType } from "../types"; import { postCaseToCaseLogChannel } from "./postToCaseLogChannel"; import { resolveCaseId } from "./resolveCaseId"; diff --git a/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts b/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts index efb1feb0..e11e0f01 100644 --- a/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts +++ b/backend/src/plugins/Cases/functions/postToCaseLogChannel.ts @@ -2,8 +2,8 @@ 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 { InternalPosterMessageResult } from "../../InternalPoster/functions/sendMessage"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { CasesPluginType } from "../types"; import { getCaseEmbed } from "./getCaseEmbed"; diff --git a/backend/src/plugins/Censor/types.ts b/backend/src/plugins/Censor/types.ts index 1363baef..5a1984ce 100644 --- a/backend/src/plugins/Censor/types.ts +++ b/backend/src/plugins/Censor/types.ts @@ -1,8 +1,8 @@ import * as t from "io-ts"; import { BasePluginType } from "knub"; +import { RegExpRunner } from "../../RegExpRunner"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; -import { RegExpRunner } from "../../RegExpRunner"; import { tNullable } from "../../utils"; import { TRegex } from "../../validatorUtils"; diff --git a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts index 514ee67e..65ad62ed 100644 --- a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts +++ b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts @@ -2,9 +2,9 @@ import { Embed, Invite } from "discord.js"; import escapeStringRegexp from "escape-string-regexp"; import { GuildPluginData } from "knub"; import cloneDeep from "lodash.clonedeep"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; -import { ZalgoRegex } from "../../../data/Zalgo"; import { allowTimeout } from "../../../RegExpRunner"; +import { ZalgoRegex } from "../../../data/Zalgo"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { getInviteCodesInString, getUrlsInString, isGuildInvite, resolveInvite, resolveMember } from "../../../utils"; import { CensorPluginType } from "../types"; import { censorMessage } from "./censorMessage"; diff --git a/backend/src/plugins/Censor/util/censorMessage.ts b/backend/src/plugins/Censor/util/censorMessage.ts index 5471ada4..93889c83 100644 --- a/backend/src/plugins/Censor/util/censorMessage.ts +++ b/backend/src/plugins/Censor/util/censorMessage.ts @@ -1,7 +1,7 @@ import { GuildTextBasedChannel, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { resolveUser } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { CensorPluginType } from "../types"; diff --git a/backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts b/backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts index 9b8b2239..1ed47f9b 100644 --- a/backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts +++ b/backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts @@ -2,7 +2,7 @@ import { Snowflake } from "discord.js"; import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { isOwner, sendErrorMessage } from "../../../pluginUtils"; -import { confirm, noop, SECONDS } from "../../../utils"; +import { SECONDS, confirm, noop } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { rehostAttachment } from "../rehostAttachment"; import { channelArchiverCmd } from "../types"; diff --git a/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts b/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts index f8738305..6be8ffe1 100644 --- a/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts +++ b/backend/src/plugins/CompanionChannels/functions/handleCompanionPermissions.ts @@ -1,7 +1,7 @@ import { PermissionsBitField, Snowflake, StageChannel, TextChannel, VoiceChannel } from "discord.js"; import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; -import { isDiscordAPIError, MINUTES } from "../../../utils"; +import { MINUTES, isDiscordAPIError } from "../../../utils"; import { filterObject } from "../../../utils/filterObject"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { CompanionChannelsPluginType, TCompanionChannelOpts } from "../types"; diff --git a/backend/src/plugins/ContextMenus/actions/clean.ts b/backend/src/plugins/ContextMenus/actions/clean.ts index 262fb393..a9d2384b 100644 --- a/backend/src/plugins/ContextMenus/actions/clean.ts +++ b/backend/src/plugins/ContextMenus/actions/clean.ts @@ -1,7 +1,7 @@ import { ContextMenuCommandInteraction, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { UtilityPlugin } from "../../../plugins/Utility/UtilityPlugin"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; +import { UtilityPlugin } from "../../../plugins/Utility/UtilityPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { ContextMenuPluginType } from "../types"; diff --git a/backend/src/plugins/ContextMenus/actions/mute.ts b/backend/src/plugins/ContextMenus/actions/mute.ts index 9dbe529a..7fe2f5d5 100644 --- a/backend/src/plugins/ContextMenus/actions/mute.ts +++ b/backend/src/plugins/ContextMenus/actions/mute.ts @@ -1,8 +1,8 @@ import { ContextMenuCommandInteraction } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { ModActionsPlugin } from "src/plugins/ModActions/ModActionsPlugin"; import { canActOn } from "src/pluginUtils"; +import { ModActionsPlugin } from "src/plugins/ModActions/ModActionsPlugin"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { convertDelayStringToMS } from "../../../utils"; import { CaseArgs } from "../../Cases/types"; diff --git a/backend/src/plugins/Counters/commands/AddCounterCmd.ts b/backend/src/plugins/Counters/commands/AddCounterCmd.ts index ac8c3698..a71418df 100644 --- a/backend/src/plugins/Counters/commands/AddCounterCmd.ts +++ b/backend/src/plugins/Counters/commands/AddCounterCmd.ts @@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub"; import { waitForReply } from "knub/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { changeCounterValue } from "../functions/changeCounterValue"; import { CountersPluginType } from "../types"; diff --git a/backend/src/plugins/Counters/commands/ResetCounterCmd.ts b/backend/src/plugins/Counters/commands/ResetCounterCmd.ts index 21191abf..00c91eb7 100644 --- a/backend/src/plugins/Counters/commands/ResetCounterCmd.ts +++ b/backend/src/plugins/Counters/commands/ResetCounterCmd.ts @@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub"; import { waitForReply } from "knub/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { setCounterValue } from "../functions/setCounterValue"; import { CountersPluginType } from "../types"; diff --git a/backend/src/plugins/Counters/commands/SetCounterCmd.ts b/backend/src/plugins/Counters/commands/SetCounterCmd.ts index 98ffcc9b..ba6fbc3a 100644 --- a/backend/src/plugins/Counters/commands/SetCounterCmd.ts +++ b/backend/src/plugins/Counters/commands/SetCounterCmd.ts @@ -3,7 +3,7 @@ import { guildPluginMessageCommand } from "knub"; import { waitForReply } from "knub/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { setCounterValue } from "../functions/setCounterValue"; import { CountersPluginType } from "../types"; diff --git a/backend/src/plugins/Counters/types.ts b/backend/src/plugins/Counters/types.ts index 57bc69d6..4187c9e4 100644 --- a/backend/src/plugins/Counters/types.ts +++ b/backend/src/plugins/Counters/types.ts @@ -1,8 +1,8 @@ import { EventEmitter } from "events"; import * as t from "io-ts"; import { BasePluginType } from "knub"; -import { CounterTrigger } from "../../data/entities/CounterTrigger"; import { GuildCounters } from "../../data/GuildCounters"; +import { CounterTrigger } from "../../data/entities/CounterTrigger"; import { tDelayString, tNullable } from "../../utils"; import Timeout = NodeJS.Timeout; diff --git a/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts b/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts index 50ad7833..6d5ba2ba 100644 --- a/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts +++ b/backend/src/plugins/CustomEvents/CustomEventsPlugin.ts @@ -3,7 +3,7 @@ import { guildPluginMessageCommand, parseSignature } from "knub"; import { TSignature } from "knub-command-manager"; import { commandTypes } from "../../commandTypes"; import { makeIoTsConfigParser } from "../../pluginUtils"; -import { createTypedTemplateSafeValueContainer, TemplateSafeValueContainer } from "../../templateFormatter"; +import { TemplateSafeValueContainer, createTypedTemplateSafeValueContainer } from "../../templateFormatter"; import { UnknownUser } from "../../utils"; import { isScalar } from "../../utils/isScalar"; import { diff --git a/backend/src/plugins/CustomEvents/actions/messageAction.ts b/backend/src/plugins/CustomEvents/actions/messageAction.ts index 3c4bba46..f06534ad 100644 --- a/backend/src/plugins/CustomEvents/actions/messageAction.ts +++ b/backend/src/plugins/CustomEvents/actions/messageAction.ts @@ -1,7 +1,7 @@ import { Snowflake, TextChannel } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { ActionError } from "../ActionError"; import { CustomEventsPluginType } from "../types"; diff --git a/backend/src/plugins/CustomEvents/actions/moveToVoiceChannelAction.ts b/backend/src/plugins/CustomEvents/actions/moveToVoiceChannelAction.ts index 73c6725c..8ef746cd 100644 --- a/backend/src/plugins/CustomEvents/actions/moveToVoiceChannelAction.ts +++ b/backend/src/plugins/CustomEvents/actions/moveToVoiceChannelAction.ts @@ -2,7 +2,7 @@ import { Snowflake, VoiceChannel } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; import { canActOn } from "../../../pluginUtils"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { resolveMember } from "../../../utils"; import { ActionError } from "../ActionError"; import { CustomEventsPluginType, TCustomEvent } from "../types"; diff --git a/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts b/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts index b0827058..3fbcbbf8 100644 --- a/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts +++ b/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts @@ -1,7 +1,7 @@ import { PluginOptions } from "knub"; +import { Queue } from "../../Queue"; import { Webhooks } from "../../data/Webhooks"; import { makeIoTsConfigParser, mapToPublicFn } from "../../pluginUtils"; -import { Queue } from "../../Queue"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { editMessage } from "./functions/editMessage"; import { sendMessage } from "./functions/sendMessage"; diff --git a/backend/src/plugins/InternalPoster/types.ts b/backend/src/plugins/InternalPoster/types.ts index 2c4447eb..7a3e4d41 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 { Webhooks } from "../../data/Webhooks"; export const ConfigSchema = t.type({}); export type TConfigSchema = t.TypeOf; diff --git a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts index adc3bfa0..8c701cc5 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts @@ -1,7 +1,7 @@ import { GuildMember } from "discord.js"; import { GuildPluginData } from "knub"; -import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; +import { Case } from "../../../data/entities/Case"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { caseToTemplateSafeCase, memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; diff --git a/backend/src/plugins/Logs/logFunctions/logCensor.ts b/backend/src/plugins/Logs/logFunctions/logCensor.ts index 1d9affdd..cec6e441 100644 --- a/backend/src/plugins/Logs/logFunctions/logCensor.ts +++ b/backend/src/plugins/Logs/logFunctions/logCensor.ts @@ -2,8 +2,8 @@ import { GuildTextBasedChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; import { deactivateMentions, disableCodeBlocks } from "knub/helpers"; import { resolveChannelIds } from "src/utils/resolveChannelIds"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; import { diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts index 4e04c49f..0596869c 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts @@ -1,8 +1,8 @@ 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 { ISavedMessageAttachmentData, SavedMessage } from "../../../data/entities/SavedMessage"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser, useMediaUrls } from "../../../utils"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts index 32cfcfa7..1b2b1fe3 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts @@ -1,7 +1,7 @@ import { GuildBasedChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts index 73c669ef..6e31605d 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts @@ -1,7 +1,7 @@ import { GuildTextBasedChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; import { UnknownUser } from "../../../utils"; import { resolveChannelIds } from "../../../utils/resolveChannelIds"; diff --git a/backend/src/plugins/Logs/types.ts b/backend/src/plugins/Logs/types.ts index 654b72de..714d1de5 100644 --- a/backend/src/plugins/Logs/types.ts +++ b/backend/src/plugins/Logs/types.ts @@ -1,12 +1,12 @@ import * as t from "io-ts"; import { BasePluginType, CooldownManager, guildPluginEventListener } from "knub"; import { z } from "zod"; +import { RegExpRunner } from "../../RegExpRunner"; 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 { MessageBuffer } from "../../utils/MessageBuffer"; import { diff --git a/backend/src/plugins/Logs/util/log.ts b/backend/src/plugins/Logs/util/log.ts index 05416aa4..b6c7441e 100644 --- a/backend/src/plugins/Logs/util/log.ts +++ b/backend/src/plugins/Logs/util/log.ts @@ -1,9 +1,9 @@ import { APIEmbed, MessageMentionTypes, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { LogType } from "../../../data/LogType"; import { allowTimeout } from "../../../RegExpRunner"; +import { LogType } from "../../../data/LogType"; import { TypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { isDiscordAPIError, MINUTES } from "../../../utils"; +import { MINUTES, isDiscordAPIError } from "../../../utils"; import { MessageBuffer } from "../../../utils/MessageBuffer"; import { InternalPosterPlugin } from "../../InternalPoster/InternalPosterPlugin"; import { ILogTypeData, LogsPluginType, TLogChannel, TLogChannelMap } from "../types"; diff --git a/backend/src/plugins/Logs/util/onMessageDelete.ts b/backend/src/plugins/Logs/util/onMessageDelete.ts index e21967b8..01d91123 100644 --- a/backend/src/plugins/Logs/util/onMessageDelete.ts +++ b/backend/src/plugins/Logs/util/onMessageDelete.ts @@ -1,7 +1,7 @@ import { Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { resolveUser } from "../../../utils"; import { logMessageDelete } from "../logFunctions/logMessageDelete"; import { logMessageDeleteBare } from "../logFunctions/logMessageDeleteBare"; diff --git a/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts b/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts index d5a6366e..5fc79da0 100644 --- a/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts +++ b/backend/src/plugins/Logs/util/onMessageDeleteBulk.ts @@ -1,7 +1,7 @@ import { Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { getBaseUrl } from "../../../pluginUtils"; import { logMessageDeleteBulk } from "../logFunctions/logMessageDeleteBulk"; import { LogsPluginType } from "../types"; diff --git a/backend/src/plugins/ModActions/ModActionsPlugin.ts b/backend/src/plugins/ModActions/ModActionsPlugin.ts index 21b7d2a5..dae2aea2 100644 --- a/backend/src/plugins/ModActions/ModActionsPlugin.ts +++ b/backend/src/plugins/ModActions/ModActionsPlugin.ts @@ -1,12 +1,12 @@ import { GuildMember, Message, Snowflake } from "discord.js"; import { EventEmitter } from "events"; +import { Queue } from "../../Queue"; 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"; import { makeIoTsConfigParser, mapToPublicFn } from "../../pluginUtils"; -import { Queue } from "../../Queue"; import { MINUTES, trimPluginDescription } from "../../utils"; import { CasesPlugin } from "../Cases/CasesPlugin"; import { LogsPlugin } from "../Logs/LogsPlugin"; @@ -25,8 +25,8 @@ import { ForceUnmuteCmd } from "./commands/ForceunmuteCmd"; import { HideCaseCmd } from "./commands/HideCaseCmd"; import { KickCmd } from "./commands/KickCmd"; import { MassbanCmd } from "./commands/MassBanCmd"; -import { MassmuteCmd } from "./commands/MassmuteCmd"; import { MassunbanCmd } from "./commands/MassUnbanCmd"; +import { MassmuteCmd } from "./commands/MassmuteCmd"; import { MuteCmd } from "./commands/MuteCmd"; import { NoteCmd } from "./commands/NoteCmd"; import { SoftbanCmd } from "./commands/SoftbanCommand"; diff --git a/backend/src/plugins/ModActions/commands/BanCmd.ts b/backend/src/plugins/ModActions/commands/BanCmd.ts index 630ad95d..91b57000 100644 --- a/backend/src/plugins/ModActions/commands/BanCmd.ts +++ b/backend/src/plugins/ModActions/commands/BanCmd.ts @@ -3,8 +3,8 @@ import { getMemberLevel } from "knub/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 { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { resolveMember, resolveUser } from "../../../utils"; import { banLock } from "../../../utils/lockNameHelpers"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts index 7a8aa89b..222f6aa8 100644 --- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts +++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts @@ -1,9 +1,9 @@ import { APIEmbed, User } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; -import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { sendErrorMessage } from "../../../pluginUtils"; -import { chunkArray, emptyEmbedValue, resolveUser, trimLines, UnknownUser } from "../../../utils"; +import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; +import { UnknownUser, chunkArray, emptyEmbedValue, resolveUser, trimLines } from "../../../utils"; import { asyncMap } from "../../../utils/async"; import { getChunkedEmbedFields } from "../../../utils/getChunkedEmbedFields"; import { getGuildPrefix } from "../../../utils/getGuildPrefix"; diff --git a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts index efdc8cdd..4ddef154 100644 --- a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts +++ b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts @@ -2,8 +2,8 @@ import { Snowflake } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; -import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; +import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { DAYS, MINUTES, resolveMember, resolveUser } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; diff --git a/backend/src/plugins/ModActions/commands/MassBanCmd.ts b/backend/src/plugins/ModActions/commands/MassBanCmd.ts index afef9f1f..d31aadd7 100644 --- a/backend/src/plugins/ModActions/commands/MassBanCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassBanCmd.ts @@ -5,9 +5,9 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { humanizeDurationShort } from "../../../humanizeDurationShort"; -import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { DAYS, MINUTES, noop, SECONDS } from "../../../utils"; +import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; +import { DAYS, MINUTES, SECONDS, noop } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; diff --git a/backend/src/plugins/ModActions/commands/MassmuteCmd.ts b/backend/src/plugins/ModActions/commands/MassmuteCmd.ts index acdd880f..a62c029e 100644 --- a/backend/src/plugins/ModActions/commands/MassmuteCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassmuteCmd.ts @@ -3,8 +3,8 @@ import { waitForReply } from "knub/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; -import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; +import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { modActionsCmd } from "../types"; diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts index cda36959..53363ee0 100644 --- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts @@ -3,8 +3,8 @@ 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 { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { resolveUser } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; diff --git a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts index 929c1e25..237454ba 100644 --- a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts @@ -1,7 +1,7 @@ import { AuditLogEvent, User } from "discord.js"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts index d03d3763..0f840910 100644 --- a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts @@ -2,7 +2,7 @@ import { AuditLogEvent, User } from "discord.js"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { logger } from "../../../logger"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; diff --git a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts index e6e8fbb3..9400c732 100644 --- a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts @@ -1,7 +1,7 @@ import { AuditLogEvent, User } from "discord.js"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { UnknownUser, resolveUser } from "../../../utils"; import { findMatchingAuditLogEntry } from "../../../utils/findMatchingAuditLogEntry"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; diff --git a/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts b/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts index bd7c3f3d..7b7d7129 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/helpers"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { DAYS, errorMessage, resolveMember, resolveUser, SECONDS } from "../../../utils"; +import { DAYS, SECONDS, errorMessage, resolveMember, resolveUser } from "../../../utils"; import { IgnoredEventType, ModActionsPluginType } from "../types"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; import { ignoreEvent } from "./ignoreEvent"; diff --git a/backend/src/plugins/ModActions/functions/actualMuteUserCmd.ts b/backend/src/plugins/ModActions/functions/actualMuteUserCmd.ts index fce169b7..abb3daab 100644 --- a/backend/src/plugins/ModActions/functions/actualMuteUserCmd.ts +++ b/backend/src/plugins/ModActions/functions/actualMuteUserCmd.ts @@ -1,10 +1,10 @@ import { GuildMember, GuildTextBasedChannel, Message, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; +import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { logger } from "../../../logger"; import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; -import { asSingleLine, isDiscordAPIError, UnknownUser } from "../../../utils"; +import { UnknownUser, asSingleLine, isDiscordAPIError } from "../../../utils"; import { MutesPlugin } from "../../Mutes/MutesPlugin"; import { MuteResult } from "../../Mutes/types"; import { ModActionsPluginType } from "../types"; diff --git a/backend/src/plugins/ModActions/functions/actualUnmuteUserCmd.ts b/backend/src/plugins/ModActions/functions/actualUnmuteUserCmd.ts index ee1557eb..2e60a32b 100644 --- a/backend/src/plugins/ModActions/functions/actualUnmuteUserCmd.ts +++ b/backend/src/plugins/ModActions/functions/actualUnmuteUserCmd.ts @@ -1,9 +1,9 @@ import { GuildMember, Message, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { asSingleLine, UnknownUser } from "../../../utils"; +import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; +import { UnknownUser, asSingleLine } from "../../../utils"; import { ModActionsPluginType } from "../types"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index 4d576a60..d9d1454b 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -5,16 +5,16 @@ import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { registerExpiringTempban } from "../../../data/loops/expiringTempbansLoop"; import { logger } from "../../../logger"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { - createUserNotificationError, DAYS, + SECONDS, + UserNotificationResult, + createUserNotificationError, notifyUser, resolveMember, resolveUser, - SECONDS, ucfirst, - UserNotificationResult, } from "../../../utils"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; diff --git a/backend/src/plugins/ModActions/functions/isBanned.ts b/backend/src/plugins/ModActions/functions/isBanned.ts index 839adf8d..50dc4823 100644 --- a/backend/src/plugins/ModActions/functions/isBanned.ts +++ b/backend/src/plugins/ModActions/functions/isBanned.ts @@ -1,6 +1,6 @@ import { PermissionsBitField, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { isDiscordAPIError, isDiscordHTTPError, SECONDS, sleep } from "../../../utils"; +import { SECONDS, isDiscordAPIError, isDiscordHTTPError, sleep } from "../../../utils"; import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { ModActionsPluginType } from "../types"; diff --git a/backend/src/plugins/ModActions/functions/updateCase.ts b/backend/src/plugins/ModActions/functions/updateCase.ts index ac6b65af..c19c9d06 100644 --- a/backend/src/plugins/ModActions/functions/updateCase.ts +++ b/backend/src/plugins/ModActions/functions/updateCase.ts @@ -1,8 +1,8 @@ import { Message } from "discord.js"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; -import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; +import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index c5357ee1..9bc0fda9 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -1,8 +1,8 @@ import { GuildMember, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { CaseTypes } from "../../../data/CaseTypes"; -import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; -import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils"; +import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; +import { UserNotificationResult, createUserNotificationError, notifyUser, resolveUser, ucfirst } from "../../../utils"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; import { CasesPlugin } from "../../Cases/CasesPlugin"; diff --git a/backend/src/plugins/ModActions/types.ts b/backend/src/plugins/ModActions/types.ts index a0341b12..447b9638 100644 --- a/backend/src/plugins/ModActions/types.ts +++ b/backend/src/plugins/ModActions/types.ts @@ -2,13 +2,13 @@ import { GuildTextBasedChannel } from "discord.js"; import { EventEmitter } from "events"; import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; -import { Case } from "../../data/entities/Case"; +import { Queue } from "../../Queue"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildMutes } from "../../data/GuildMutes"; import { GuildTempbans } from "../../data/GuildTempbans"; -import { Queue } from "../../Queue"; -import { tNullable, UserNotificationMethod, UserNotificationResult } from "../../utils"; +import { Case } from "../../data/entities/Case"; +import { UserNotificationMethod, UserNotificationResult, tNullable } from "../../utils"; import { CaseArgs } from "../Cases/types"; export const ConfigSchema = t.type({ diff --git a/backend/src/plugins/Mutes/functions/renewTimeoutMute.ts b/backend/src/plugins/Mutes/functions/renewTimeoutMute.ts index 7ada6bba..57def080 100644 --- a/backend/src/plugins/Mutes/functions/renewTimeoutMute.ts +++ b/backend/src/plugins/Mutes/functions/renewTimeoutMute.ts @@ -1,8 +1,8 @@ import { PermissionFlagsBits } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { Mute } from "../../../data/entities/Mute"; import { MAX_TIMEOUT_DURATION } from "../../../data/Mutes"; +import { Mute } from "../../../data/entities/Mute"; import { DBDateFormat, resolveMember } from "../../../utils"; import { MutesPluginType } from "../types"; diff --git a/backend/src/plugins/Mutes/functions/unmuteUser.ts b/backend/src/plugins/Mutes/functions/unmuteUser.ts index 5fa6f90a..a810bd6a 100644 --- a/backend/src/plugins/Mutes/functions/unmuteUser.ts +++ b/backend/src/plugins/Mutes/functions/unmuteUser.ts @@ -2,9 +2,9 @@ import { Snowflake } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; import { CaseTypes } from "../../../data/CaseTypes"; -import { Mute } from "../../../data/entities/Mute"; import { AddMuteParams } from "../../../data/GuildMutes"; import { MuteTypes } from "../../../data/MuteTypes"; +import { Mute } from "../../../data/entities/Mute"; import { resolveMember, resolveUser } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CaseArgs } from "../../Cases/types"; diff --git a/backend/src/plugins/Mutes/types.ts b/backend/src/plugins/Mutes/types.ts index 53ba52c2..0c69c657 100644 --- a/backend/src/plugins/Mutes/types.ts +++ b/backend/src/plugins/Mutes/types.ts @@ -2,13 +2,13 @@ import { GuildMember } from "discord.js"; import { EventEmitter } from "events"; import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; -import { Case } from "../../data/entities/Case"; -import { Mute } from "../../data/entities/Mute"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildMutes } from "../../data/GuildMutes"; -import { tNullable, UserNotificationMethod, UserNotificationResult } from "../../utils"; +import { Case } from "../../data/entities/Case"; +import { Mute } from "../../data/entities/Mute"; +import { UserNotificationMethod, UserNotificationResult, tNullable } from "../../utils"; import { CaseArgs } from "../Cases/types"; export const ConfigSchema = t.type({ diff --git a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts index 9a9948c8..7b9273e3 100644 --- a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts +++ b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts @@ -1,8 +1,8 @@ import { PluginOptions } from "knub"; +import { Queue } from "../../Queue"; import { GuildNicknameHistory } from "../../data/GuildNicknameHistory"; import { UsernameHistory } from "../../data/UsernameHistory"; import { makeIoTsConfigParser } from "../../pluginUtils"; -import { Queue } from "../../Queue"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { NamesCmd } from "./commands/NamesCmd"; import { ConfigSchema, NameHistoryPluginType } from "./types"; diff --git a/backend/src/plugins/NameHistory/commands/NamesCmd.ts b/backend/src/plugins/NameHistory/commands/NamesCmd.ts index 81e896f5..e84699a9 100644 --- a/backend/src/plugins/NameHistory/commands/NamesCmd.ts +++ b/backend/src/plugins/NameHistory/commands/NamesCmd.ts @@ -1,9 +1,9 @@ import { Snowflake } from "discord.js"; import { createChunkedMessage, disableCodeBlocks } from "knub/helpers"; import { commandTypeHelpers as ct } from "../../../commandTypes"; -import { NICKNAME_RETENTION_PERIOD } from "../../../data/cleanup/nicknames"; import { MAX_NICKNAME_ENTRIES_PER_USER } from "../../../data/GuildNicknameHistory"; import { MAX_USERNAME_ENTRIES_PER_USER } from "../../../data/UsernameHistory"; +import { NICKNAME_RETENTION_PERIOD } from "../../../data/cleanup/nicknames"; import { sendErrorMessage } from "../../../pluginUtils"; import { DAYS } from "../../../utils"; import { nameHistoryCmd } from "../types"; diff --git a/backend/src/plugins/NameHistory/types.ts b/backend/src/plugins/NameHistory/types.ts index f2c81db1..e85f2f40 100644 --- a/backend/src/plugins/NameHistory/types.ts +++ b/backend/src/plugins/NameHistory/types.ts @@ -1,8 +1,8 @@ import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; +import { Queue } from "../../Queue"; import { GuildNicknameHistory } from "../../data/GuildNicknameHistory"; import { UsernameHistory } from "../../data/UsernameHistory"; -import { Queue } from "../../Queue"; export const ConfigSchema = t.type({ can_view: t.boolean, diff --git a/backend/src/plugins/PingableRoles/types.ts b/backend/src/plugins/PingableRoles/types.ts index 8c942459..272f7594 100644 --- a/backend/src/plugins/PingableRoles/types.ts +++ b/backend/src/plugins/PingableRoles/types.ts @@ -1,7 +1,7 @@ import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; -import { PingableRole } from "../../data/entities/PingableRole"; import { GuildPingableRoles } from "../../data/GuildPingableRoles"; +import { PingableRole } from "../../data/entities/PingableRole"; export const ConfigSchema = t.type({ can_manage: t.boolean, diff --git a/backend/src/plugins/Post/util/actualPostCmd.ts b/backend/src/plugins/Post/util/actualPostCmd.ts index dbd0e2b2..c73a672b 100644 --- a/backend/src/plugins/Post/util/actualPostCmd.ts +++ b/backend/src/plugins/Post/util/actualPostCmd.ts @@ -4,7 +4,7 @@ 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 { DBDateFormat, MINUTES, StrictMessageContent, errorMessage } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { PostPluginType } from "../types"; diff --git a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts index bb7c29dc..99d0a8d6 100644 --- a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts +++ b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts @@ -1,8 +1,8 @@ import { PluginOptions } from "knub"; +import { Queue } from "../../Queue"; import { GuildReactionRoles } from "../../data/GuildReactionRoles"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { makeIoTsConfigParser } from "../../pluginUtils"; -import { Queue } from "../../Queue"; import { LogsPlugin } from "../Logs/LogsPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { ClearReactionRolesCmd } from "./commands/ClearReactionRolesCmd"; diff --git a/backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts b/backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts index e724168a..fefc166e 100644 --- a/backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts +++ b/backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts @@ -3,7 +3,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canUseEmoji, isDiscordAPIError, isValidEmoji, noop, trimPluginDescription } from "../../../utils"; import { canReadChannel } from "../../../utils/canReadChannel"; -import { reactionRolesCmd, TReactionRolePair } from "../types"; +import { TReactionRolePair, reactionRolesCmd } from "../types"; import { applyReactionRoleReactionsToMessage } from "../util/applyReactionRoleReactionsToMessage"; const CLEAR_ROLES_EMOJI = "❌"; diff --git a/backend/src/plugins/ReactionRoles/types.ts b/backend/src/plugins/ReactionRoles/types.ts index 19ba38c6..6f65ad98 100644 --- a/backend/src/plugins/ReactionRoles/types.ts +++ b/backend/src/plugins/ReactionRoles/types.ts @@ -1,8 +1,8 @@ import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; +import { Queue } from "../../Queue"; import { GuildReactionRoles } from "../../data/GuildReactionRoles"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; -import { Queue } from "../../Queue"; import { tNullable } from "../../utils"; export const ConfigSchema = t.type({ diff --git a/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts b/backend/src/plugins/RoleButtons/functions/createButtonComponents.ts index fb287f39..e41d87bc 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 { buildCustomId } from "../../../utils/buildCustomId"; import { TRoleButtonsConfigItem } from "../types"; -import { convertButtonStyleStringToEnum } from "./convertButtonStyleStringToEnum.js"; import { TooManyComponentsError } from "./TooManyComponentsError"; +import { convertButtonStyleStringToEnum } from "./convertButtonStyleStringToEnum.js"; export function createButtonComponents(configItem: TRoleButtonsConfigItem): Array> { const rows: Array> = []; diff --git a/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts b/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts index 1621f215..f16cff92 100644 --- a/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts +++ b/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts @@ -5,7 +5,7 @@ import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { RoleAddCmd } from "./commands/RoleAddCmd"; import { RoleHelpCmd } from "./commands/RoleHelpCmd"; import { RoleRemoveCmd } from "./commands/RoleRemoveCmd"; -import { ConfigSchema, defaultSelfGrantableRoleEntry, SelfGrantableRolesPluginType } from "./types"; +import { ConfigSchema, SelfGrantableRolesPluginType, defaultSelfGrantableRoleEntry } from "./types"; const defaultOptions: PluginOptions = { config: { diff --git a/backend/src/plugins/Slowmode/types.ts b/backend/src/plugins/Slowmode/types.ts index 61b468b3..089a59ef 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, 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 27da9d72..ebfd653d 100644 --- a/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts +++ b/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts @@ -2,7 +2,7 @@ import { GuildTextBasedChannel, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; -import { isDiscordAPIError, UnknownUser, verboseChannelMention, verboseUserMention } from "../../../utils"; +import { UnknownUser, isDiscordAPIError, verboseChannelMention, verboseUserMention } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { SlowmodePluginType } from "../types"; diff --git a/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts b/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts index 57ee49eb..b2a46432 100644 --- a/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts +++ b/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts @@ -1,15 +1,15 @@ import { GuildTextBasedChannel, Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; +import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { CaseTypes } from "../../../data/CaseTypes"; -import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; import { logger } from "../../../logger"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { MuteResult } from "../../../plugins/Mutes/types"; -import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; -import { convertDelayStringToMS, DBDateFormat, noop, resolveMember, trimLines } from "../../../utils"; +import { DBDateFormat, convertDelayStringToMS, noop, resolveMember, trimLines } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { RecentActionType, SpamPluginType, TBaseSingleSpamConfig } from "../types"; import { addRecentAction } from "./addRecentAction"; diff --git a/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts b/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts index 7bda3cc6..3a339b5f 100644 --- a/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts +++ b/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts @@ -1,8 +1,8 @@ import { GuildPluginData } from "knub"; +import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { CaseTypes } from "../../../data/CaseTypes"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; -import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { convertDelayStringToMS, resolveMember } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { RecentActionType, SpamPluginType } from "../types"; diff --git a/backend/src/plugins/Starboard/StarboardPlugin.ts b/backend/src/plugins/Starboard/StarboardPlugin.ts index 1c72a0cc..f700e1a4 100644 --- a/backend/src/plugins/Starboard/StarboardPlugin.ts +++ b/backend/src/plugins/Starboard/StarboardPlugin.ts @@ -8,7 +8,7 @@ import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { MigratePinsCmd } from "./commands/MigratePinsCmd"; import { StarboardReactionAddEvt } from "./events/StarboardReactionAddEvt"; import { StarboardReactionRemoveAllEvt, StarboardReactionRemoveEvt } from "./events/StarboardReactionRemoveEvts"; -import { ConfigSchema, defaultStarboardOpts, StarboardPluginType } from "./types"; +import { ConfigSchema, StarboardPluginType, defaultStarboardOpts } from "./types"; import { onMessageDelete } from "./util/onMessageDelete"; const defaultOptions: PluginOptions = { diff --git a/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts b/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts index 84e338f4..5f028c0a 100644 --- a/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts +++ b/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts @@ -1,6 +1,6 @@ import { GuildChannel, Message } from "discord.js"; import path from "path"; -import { EmbedWith, EMPTY_CHAR } from "../../../utils"; +import { EMPTY_CHAR, EmbedWith } from "../../../utils"; const imageAttachmentExtensions = ["jpeg", "jpg", "png", "gif", "webp"]; const audioAttachmentExtensions = ["wav", "mp3", "m4a"]; diff --git a/backend/src/plugins/Tags/commands/TagCreateCmd.ts b/backend/src/plugins/Tags/commands/TagCreateCmd.ts index 0595e4bb..10c81e87 100644 --- a/backend/src/plugins/Tags/commands/TagCreateCmd.ts +++ b/backend/src/plugins/Tags/commands/TagCreateCmd.ts @@ -1,6 +1,6 @@ import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { parseTemplate, TemplateParseError } from "../../../templateFormatter"; +import { TemplateParseError, parseTemplate } from "../../../templateFormatter"; import { tagsCmd } from "../types"; export const TagCreateCmd = tagsCmd({ diff --git a/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts b/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts index 7c781289..b2d40a7a 100644 --- a/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts +++ b/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts @@ -2,7 +2,7 @@ import { GuildMember } from "discord.js"; import escapeStringRegexp from "escape-string-regexp"; import { ExtendedMatchParams, GuildPluginData } from "knub"; import { StrictMessageContent } from "../../../utils"; -import { TagsPluginType, TTagCategory } from "../types"; +import { TTagCategory, TagsPluginType } from "../types"; import { renderTagFromString } from "./renderTagFromString"; interface BaseResult { diff --git a/backend/src/plugins/Tags/util/renderTagBody.ts b/backend/src/plugins/Tags/util/renderTagBody.ts index a321360d..e75a12cf 100644 --- a/backend/src/plugins/Tags/util/renderTagBody.ts +++ b/backend/src/plugins/Tags/util/renderTagBody.ts @@ -1,7 +1,7 @@ import { ExtendedMatchParams, GuildPluginData } from "knub"; -import { renderTemplate, TemplateSafeValue, TemplateSafeValueContainer } from "../../../templateFormatter"; -import { renderRecursively, StrictMessageContent } from "../../../utils"; -import { TagsPluginType, TTag } from "../types"; +import { TemplateSafeValue, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; +import { StrictMessageContent, renderRecursively } from "../../../utils"; +import { TTag, TagsPluginType } from "../types"; import { findTagByName } from "./findTagByName"; const MAX_TAG_FN_CALLS = 25; diff --git a/backend/src/plugins/Tags/util/renderTagFromString.ts b/backend/src/plugins/Tags/util/renderTagFromString.ts index 84d1759f..55e699fa 100644 --- a/backend/src/plugins/Tags/util/renderTagFromString.ts +++ b/backend/src/plugins/Tags/util/renderTagFromString.ts @@ -5,7 +5,7 @@ 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 { TTag, TagsPluginType } from "../types"; import { renderTagBody } from "./renderTagBody"; export async function renderTagFromString( diff --git a/backend/src/plugins/UsernameSaver/UsernameSaverPlugin.ts b/backend/src/plugins/UsernameSaver/UsernameSaverPlugin.ts index a14ef791..3bdb310c 100644 --- a/backend/src/plugins/UsernameSaver/UsernameSaverPlugin.ts +++ b/backend/src/plugins/UsernameSaver/UsernameSaverPlugin.ts @@ -1,7 +1,7 @@ import * as t from "io-ts"; +import { Queue } from "../../Queue"; import { UsernameHistory } from "../../data/UsernameHistory"; import { makeIoTsConfigParser } from "../../pluginUtils"; -import { Queue } from "../../Queue"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { MessageCreateUpdateUsernameEvt, VoiceChannelJoinUpdateUsernameEvt } from "./events/UpdateUsernameEvts"; import { UsernameSaverPluginType } from "./types"; diff --git a/backend/src/plugins/UsernameSaver/types.ts b/backend/src/plugins/UsernameSaver/types.ts index 70fc3f12..d3c5518f 100644 --- a/backend/src/plugins/UsernameSaver/types.ts +++ b/backend/src/plugins/UsernameSaver/types.ts @@ -1,6 +1,6 @@ import { BasePluginType, guildPluginEventListener } from "knub"; -import { UsernameHistory } from "../../data/UsernameHistory"; import { Queue } from "../../Queue"; +import { UsernameHistory } from "../../data/UsernameHistory"; export interface UsernameSaverPluginType extends BasePluginType { state: { diff --git a/backend/src/plugins/Utility/UtilityPlugin.ts b/backend/src/plugins/Utility/UtilityPlugin.ts index 7f5b2d7e..68f6987a 100644 --- a/backend/src/plugins/Utility/UtilityPlugin.ts +++ b/backend/src/plugins/Utility/UtilityPlugin.ts @@ -15,7 +15,7 @@ import { AboutCmd } from "./commands/AboutCmd"; import { AvatarCmd } from "./commands/AvatarCmd"; import { BanSearchCmd } from "./commands/BanSearchCmd"; import { ChannelInfoCmd } from "./commands/ChannelInfoCmd"; -import { CleanArgs, cleanCmd, CleanCmd } from "./commands/CleanCmd"; +import { CleanArgs, CleanCmd, cleanCmd } from "./commands/CleanCmd"; import { ContextCmd } from "./commands/ContextCmd"; import { EmojiInfoCmd } from "./commands/EmojiInfoCmd"; import { HelpCmd } from "./commands/HelpCmd"; diff --git a/backend/src/plugins/Utility/commands/CleanCmd.ts b/backend/src/plugins/Utility/commands/CleanCmd.ts index 673d7e12..d42cb5ad 100644 --- a/backend/src/plugins/Utility/commands/CleanCmd.ts +++ b/backend/src/plugins/Utility/commands/CleanCmd.ts @@ -1,15 +1,15 @@ import { Message, Snowflake, TextChannel, User } from "discord.js"; 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 { commandTypeHelpers as ct } from "../../../commandTypes"; +import { LogType } from "../../../data/LogType"; +import { SavedMessage } from "../../../data/entities/SavedMessage"; +import { humanizeDurationShort } from "../../../humanizeDurationShort"; +import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; +import { ModActionsPlugin } from "../../../plugins/ModActions/ModActionsPlugin"; +import { DAYS, SECONDS, getInviteCodesInString, noop } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; -import { utilityCmd, UtilityPluginType } from "../types"; +import { UtilityPluginType, utilityCmd } from "../types"; const MAX_CLEAN_COUNT = 150; const MAX_CLEAN_TIME = 1 * DAYS; diff --git a/backend/src/plugins/Utility/functions/getChannelInfoEmbed.ts b/backend/src/plugins/Utility/functions/getChannelInfoEmbed.ts index d1c2dd0f..a1955ca2 100644 --- a/backend/src/plugins/Utility/functions/getChannelInfoEmbed.ts +++ b/backend/src/plugins/Utility/functions/getChannelInfoEmbed.ts @@ -2,7 +2,7 @@ import { APIEmbed, ChannelType, Snowflake, StageChannel, VoiceChannel } from "di import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { EmbedWith, formatNumber, MINUTES, preEmbedPadding, trimLines, verboseUserMention } from "../../../utils"; +import { EmbedWith, MINUTES, formatNumber, preEmbedPadding, trimLines, verboseUserMention } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { UtilityPluginType } from "../types"; diff --git a/backend/src/plugins/Utility/functions/getGuildPreview.ts b/backend/src/plugins/Utility/functions/getGuildPreview.ts index fc1d00db..6ead2537 100644 --- a/backend/src/plugins/Utility/functions/getGuildPreview.ts +++ b/backend/src/plugins/Utility/functions/getGuildPreview.ts @@ -1,5 +1,5 @@ import { Client, GuildPreview, Snowflake } from "discord.js"; -import { memoize, MINUTES } from "../../../utils"; +import { MINUTES, memoize } from "../../../utils"; /** * Memoized getGuildPreview diff --git a/backend/src/plugins/Utility/functions/getInviteInfoEmbed.ts b/backend/src/plugins/Utility/functions/getInviteInfoEmbed.ts index 1c8fb80c..b4748c96 100644 --- a/backend/src/plugins/Utility/functions/getInviteInfoEmbed.ts +++ b/backend/src/plugins/Utility/functions/getInviteInfoEmbed.ts @@ -3,8 +3,8 @@ import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; import { EmbedWith, - formatNumber, GroupDMInvite, + formatNumber, inviteHasCounts, isGroupDMInvite, isGuildInvite, diff --git a/backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts b/backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts index 2e97999c..49c3ea33 100644 --- a/backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts +++ b/backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts @@ -1,8 +1,8 @@ import { APIEmbed, MessageType, Snowflake, TextChannel } from "discord.js"; import humanizeDuration from "humanize-duration"; -import { getDefaultMessageCommandPrefix, GuildPluginData } from "knub"; +import { GuildPluginData, getDefaultMessageCommandPrefix } from "knub"; import moment from "moment-timezone"; -import { chunkMessageLines, EmbedWith, messageLink, preEmbedPadding, trimEmptyLines, trimLines } from "../../../utils"; +import { EmbedWith, chunkMessageLines, messageLink, preEmbedPadding, trimEmptyLines, trimLines } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { UtilityPluginType } from "../types"; diff --git a/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts b/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts index c6b7bbd3..f00f29f0 100644 --- a/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts +++ b/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts @@ -4,10 +4,10 @@ import { GuildPluginData } from "knub"; import moment from "moment-timezone"; import { EmbedWith, + MINUTES, formatNumber, inviteHasCounts, memoize, - MINUTES, preEmbedPadding, resolveInvite, resolveUser, diff --git a/backend/src/plugins/Utility/search.ts b/backend/src/plugins/Utility/search.ts index 4340ad23..f030704f 100644 --- a/backend/src/plugins/Utility/search.ts +++ b/backend/src/plugins/Utility/search.ts @@ -12,12 +12,12 @@ import { import escapeStringRegexp from "escape-string-regexp"; import { ArgsFromSignatureOrArray, GuildPluginData } from "knub"; import moment from "moment-timezone"; +import { RegExpRunner, allowTimeout } from "../../RegExpRunner"; import { getBaseUrl, sendErrorMessage } from "../../pluginUtils"; -import { allowTimeout, RegExpRunner } from "../../RegExpRunner"; import { MINUTES, multiSorter, sorter, trimLines } from "../../utils"; import { asyncFilter } from "../../utils/async"; import { hasDiscordPermissions } from "../../utils/hasDiscordPermissions"; -import { inputPatternToRegExp, InvalidRegexError } from "../../validatorUtils"; +import { InvalidRegexError, inputPatternToRegExp } from "../../validatorUtils"; import { banSearchSignature } from "./commands/BanSearchCmd"; import { searchCmdSignature } from "./commands/SearchCmd"; import { getUserInfoEmbed } from "./functions/getUserInfoEmbed"; diff --git a/backend/src/plugins/Utility/types.ts b/backend/src/plugins/Utility/types.ts index 134c0f48..aaac036a 100644 --- a/backend/src/plugins/Utility/types.ts +++ b/backend/src/plugins/Utility/types.ts @@ -1,11 +1,11 @@ import * as t from "io-ts"; import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub"; +import { RegExpRunner } from "../../RegExpRunner"; import { GuildArchives } from "../../data/GuildArchives"; import { GuildCases } from "../../data/GuildCases"; import { GuildLogs } from "../../data/GuildLogs"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { Supporters } from "../../data/Supporters"; -import { RegExpRunner } from "../../RegExpRunner"; export const ConfigSchema = t.type({ can_roles: t.boolean, diff --git a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts index fac26322..879b99cd 100644 --- a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts +++ b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts @@ -1,5 +1,5 @@ import { Snowflake, TextChannel } from "discord.js"; -import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter"; +import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; import { createChunkedMessage, verboseChannelMention, verboseUserMention } from "../../../utils"; import { sendDM } from "../../../utils/sendDM"; import { diff --git a/backend/src/utils/sendDM.ts b/backend/src/utils/sendDM.ts index 7cfc3f87..bfcfe97e 100644 --- a/backend/src/utils/sendDM.ts +++ b/backend/src/utils/sendDM.ts @@ -1,6 +1,6 @@ import { MessagePayload, User } from "discord.js"; import { logger } from "../logger"; -import { createChunkedMessage, HOURS, isDiscordAPIError } from "../utils"; +import { HOURS, createChunkedMessage, isDiscordAPIError } from "../utils"; import Timeout = NodeJS.Timeout; let dmsDisabled = false; diff --git a/backend/src/utils/templateSafeObjects.ts b/backend/src/utils/templateSafeObjects.ts index 55149850..f9d8f5a6 100644 --- a/backend/src/utils/templateSafeObjects.ts +++ b/backend/src/utils/templateSafeObjects.ts @@ -23,9 +23,9 @@ import { SavedMessage, } from "../data/entities/SavedMessage"; import { - ingestDataIntoTemplateSafeValueContainer, TemplateSafeValueContainer, TypedTemplateSafeValueContainer, + ingestDataIntoTemplateSafeValueContainer, } from "../templateFormatter"; type InputProps = Omit<