From 914efb6fccab8d73b7a05fddb9c552afaea1d6c8 Mon Sep 17 00:00:00 2001 From: rubyowo Date: Sun, 2 Jun 2024 15:21:27 +0000 Subject: [PATCH] chore: format repo (#482) Begone formatting errors --- backend/src/index.ts | 10 ++++- .../1573248462469-MoveStarboardsToConfig.ts | 39 ++++++++++++------- .../1596994103885-AddCaseNotesForeignKey.ts | 3 +- .../1597015567215-AddLogMessageIdToCases.ts | 3 +- ...597109357201-CreateMemberTimezonesTable.ts | 3 +- .../1617363975046-UpdateCounterTriggers.ts | 3 +- .../plugins/Censor/util/applyFiltersToMsg.ts | 10 ++++- .../src/plugins/GuildConfigReloader/types.ts | 2 +- backend/src/plugins/GuildMemberCache/types.ts | 2 +- backend/src/plugins/InternalPoster/types.ts | 2 +- backend/src/plugins/Logs/LogsPlugin.ts | 2 +- .../Logs/logFunctions/logMessageDelete.ts | 2 +- backend/src/plugins/Logs/types.ts | 2 +- .../src/plugins/Logs/util/getLogMessage.ts | 2 +- .../MessageSaver/MessageSaverPlugin.ts | 7 +++- .../ModActions/commands/CasesUserCmd.ts | 9 ++++- .../ModActions/functions/kickMember.ts | 8 +++- .../ModActions/functions/warnMember.ts | 8 +++- .../Phisherman/functions/getDomainInfo.ts | 6 ++- backend/src/templateFormatter.test.ts | 7 +++- backend/src/utils.ts | 6 ++- 21 files changed, 95 insertions(+), 41 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index 10c196128..e74f7629a 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -44,7 +44,15 @@ import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availab import { setProfiler } from "./profiler.js"; import { logRateLimit } from "./rateLimitStats.js"; import { startUptimeCounter } from "./uptime.js"; -import { MINUTES, SECONDS, errorMessage, isDiscordAPIError, isDiscordHTTPError, sleep, successMessage } from "./utils.js"; +import { + MINUTES, + SECONDS, + errorMessage, + isDiscordAPIError, + isDiscordHTTPError, + sleep, + successMessage, +} from "./utils.js"; import { DecayingCounter } from "./utils/DecayingCounter.js"; import { enableProfiling } from "./utils/easyProfiler.js"; import { loadYamlSafely } from "./utils/loadYamlSafely.js"; diff --git a/backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts b/backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts index e1f967b1f..881fc3e73 100644 --- a/backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts +++ b/backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts @@ -3,18 +3,24 @@ import { MigrationInterface, QueryRunner, Table, TableColumn } from "typeorm"; export class MoveStarboardsToConfig1573248462469 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { // Create a new column for the channel's id - await queryRunner.addColumn("starboard_messages", new TableColumn({ - name: "starboard_channel_id", - type: "bigint", - unsigned: true, - })); + await queryRunner.addColumn( + "starboard_messages", + new TableColumn({ + name: "starboard_channel_id", + type: "bigint", + unsigned: true, + }), + ); // Since we are removing the guild_id with the starboards table, we might want it here - await queryRunner.addColumn("starboard_messages", new TableColumn({ - name: "guild_id", - type: "bigint", - unsigned: true, - })); + await queryRunner.addColumn( + "starboard_messages", + new TableColumn({ + name: "guild_id", + type: "bigint", + unsigned: true, + }), + ); // Migrate the old starboard_id to the new starboard_channel_id await queryRunner.query(` @@ -43,11 +49,14 @@ export class MoveStarboardsToConfig1573248462469 implements MigrationInterface { await queryRunner.dropColumn("starboard_messages", "starboard_channel_id"); await queryRunner.dropColumn("starboard_messages", "guild_id"); - await queryRunner.addColumn("starboard_messages", new TableColumn({ - name: "starboard_id", - type: "int", - unsigned: true, - })); + await queryRunner.addColumn( + "starboard_messages", + new TableColumn({ + name: "starboard_id", + type: "int", + unsigned: true, + }), + ); await queryRunner.query(` ALTER TABLE starboard_messages diff --git a/backend/src/migrations/1596994103885-AddCaseNotesForeignKey.ts b/backend/src/migrations/1596994103885-AddCaseNotesForeignKey.ts index b9813a938..93d2dd5ca 100644 --- a/backend/src/migrations/1596994103885-AddCaseNotesForeignKey.ts +++ b/backend/src/migrations/1596994103885-AddCaseNotesForeignKey.ts @@ -1,5 +1,4 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { TableForeignKey } from "typeorm"; +import { MigrationInterface, QueryRunner, TableForeignKey } from "typeorm"; export class AddCaseNotesForeignKey1596994103885 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { diff --git a/backend/src/migrations/1597015567215-AddLogMessageIdToCases.ts b/backend/src/migrations/1597015567215-AddLogMessageIdToCases.ts index cdb0bb973..2ffae66dd 100644 --- a/backend/src/migrations/1597015567215-AddLogMessageIdToCases.ts +++ b/backend/src/migrations/1597015567215-AddLogMessageIdToCases.ts @@ -1,5 +1,4 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { TableColumn } from "typeorm"; +import { MigrationInterface, QueryRunner, TableColumn } from "typeorm"; export class AddLogMessageIdToCases1597015567215 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { diff --git a/backend/src/migrations/1597109357201-CreateMemberTimezonesTable.ts b/backend/src/migrations/1597109357201-CreateMemberTimezonesTable.ts index a826fc603..972ec533b 100644 --- a/backend/src/migrations/1597109357201-CreateMemberTimezonesTable.ts +++ b/backend/src/migrations/1597109357201-CreateMemberTimezonesTable.ts @@ -1,5 +1,4 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { Table } from "typeorm"; +import { MigrationInterface, QueryRunner, Table } from "typeorm"; export class CreateMemberTimezonesTable1597109357201 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { diff --git a/backend/src/migrations/1617363975046-UpdateCounterTriggers.ts b/backend/src/migrations/1617363975046-UpdateCounterTriggers.ts index 2eae7cfe7..359973458 100644 --- a/backend/src/migrations/1617363975046-UpdateCounterTriggers.ts +++ b/backend/src/migrations/1617363975046-UpdateCounterTriggers.ts @@ -1,5 +1,4 @@ -import { MigrationInterface, QueryRunner, TableColumn, TableIndex } from "typeorm"; -import { TableForeignKey } from "typeorm"; +import { MigrationInterface, QueryRunner, TableColumn, TableForeignKey, TableIndex } from "typeorm"; export class UpdateCounterTriggers1617363975046 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { diff --git a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts index fc363f185..e1cf25a0c 100644 --- a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts +++ b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts @@ -1,11 +1,17 @@ -import { Embed, Invite } from "discord.js"; +import { Invite } from "discord.js"; import escapeStringRegexp from "escape-string-regexp"; import { GuildPluginData } from "knub"; import cloneDeep from "lodash/cloneDeep.js"; import { allowTimeout } from "../../../RegExpRunner.js"; import { ZalgoRegex } from "../../../data/Zalgo.js"; import { ISavedMessageEmbedData, SavedMessage } from "../../../data/entities/SavedMessage.js"; -import { getInviteCodesInString, getUrlsInString, isGuildInvite, resolveInvite, resolveMember } from "../../../utils.js"; +import { + getInviteCodesInString, + getUrlsInString, + isGuildInvite, + resolveInvite, + resolveMember, +} from "../../../utils.js"; import { CensorPluginType } from "../types.js"; import { censorMessage } from "./censorMessage.js"; diff --git a/backend/src/plugins/GuildConfigReloader/types.ts b/backend/src/plugins/GuildConfigReloader/types.ts index 15222e7dd..f9c0ad79e 100644 --- a/backend/src/plugins/GuildConfigReloader/types.ts +++ b/backend/src/plugins/GuildConfigReloader/types.ts @@ -1,7 +1,7 @@ import { BasePluginType } from "knub"; +import { z } from "zod"; import { Configs } from "../../data/Configs.js"; import Timeout = NodeJS.Timeout; -import { z } from "zod"; export const zGuildConfigReloaderPlugin = z.strictObject({}); diff --git a/backend/src/plugins/GuildMemberCache/types.ts b/backend/src/plugins/GuildMemberCache/types.ts index 3e7a7654e..3ad89f53b 100644 --- a/backend/src/plugins/GuildMemberCache/types.ts +++ b/backend/src/plugins/GuildMemberCache/types.ts @@ -1,6 +1,6 @@ import { BasePluginType } from "knub"; -import { GuildMemberCache } from "../../data/GuildMemberCache.js"; import { z } from "zod"; +import { GuildMemberCache } from "../../data/GuildMemberCache.js"; export const zGuildMemberCacheConfig = z.strictObject({}); diff --git a/backend/src/plugins/InternalPoster/types.ts b/backend/src/plugins/InternalPoster/types.ts index baf20d3db..c0c99c55d 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 { BasePluginType } from "knub"; +import { z } from "zod"; import { Queue } from "../../Queue.js"; import { Webhooks } from "../../data/Webhooks.js"; -import { z } from "zod"; export const zInternalPosterConfig = z.strictObject({}); diff --git a/backend/src/plugins/Logs/LogsPlugin.ts b/backend/src/plugins/Logs/LogsPlugin.ts index 9fc3e1420..d45b86dc4 100644 --- a/backend/src/plugins/Logs/LogsPlugin.ts +++ b/backend/src/plugins/Logs/LogsPlugin.ts @@ -30,7 +30,7 @@ import { import { LogsThreadCreateEvt, LogsThreadDeleteEvt, LogsThreadUpdateEvt } from "./events/LogsThreadModifyEvts.js"; import { LogsGuildMemberUpdateEvt } from "./events/LogsUserUpdateEvts.js"; import { LogsVoiceStateUpdateEvt } from "./events/LogsVoiceChannelEvts.js"; -import { FORMAT_NO_TIMESTAMP, LogsPluginType, zLogsConfig } from "./types.js"; +import { LogsPluginType, zLogsConfig } from "./types.js"; import { getLogMessage } from "./util/getLogMessage.js"; import { log } from "./util/log.js"; import { onMessageDelete } from "./util/onMessageDelete.js"; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts index a712c60ef..1952d0213 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts @@ -12,7 +12,7 @@ import { userToTemplateSafeUser, } from "../../../utils/templateSafeObjects.js"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin.js"; -import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types.js"; +import { LogsPluginType } from "../types.js"; import { log } from "../util/log.js"; export interface LogMessageDeleteData { diff --git a/backend/src/plugins/Logs/types.ts b/backend/src/plugins/Logs/types.ts index 95754015a..11eadbd1c 100644 --- a/backend/src/plugins/Logs/types.ts +++ b/backend/src/plugins/Logs/types.ts @@ -6,7 +6,7 @@ import { GuildCases } from "../../data/GuildCases.js"; import { GuildLogs } from "../../data/GuildLogs.js"; import { GuildSavedMessages } from "../../data/GuildSavedMessages.js"; import { LogType } from "../../data/LogType.js"; -import { keys, zBoundedCharacters, zMessageContent, zRegex, zSnowflake } from "../../utils.js"; +import { zBoundedCharacters, zMessageContent, zRegex, zSnowflake } from "../../utils.js"; import { MessageBuffer } from "../../utils/MessageBuffer.js"; import { TemplateSafeCase, diff --git a/backend/src/plugins/Logs/util/getLogMessage.ts b/backend/src/plugins/Logs/util/getLogMessage.ts index 65d5a06cd..30c92087b 100644 --- a/backend/src/plugins/Logs/util/getLogMessage.ts +++ b/backend/src/plugins/Logs/util/getLogMessage.ts @@ -25,7 +25,7 @@ import { TemplateSafeUser, } from "../../../utils/templateSafeObjects.js"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin.js"; -import { FORMAT_NO_TIMESTAMP, ILogTypeData, LogsPluginType, TLogChannel } from "../types.js"; +import { ILogTypeData, LogsPluginType, TLogChannel } from "../types.js"; export async function getLogMessage( pluginData: GuildPluginData, diff --git a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts index 895c9ab19..ead63597b 100644 --- a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts +++ b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts @@ -2,7 +2,12 @@ import { PluginOptions, guildPlugin } from "knub"; import { GuildSavedMessages } from "../../data/GuildSavedMessages.js"; import { SaveMessagesToDBCmd } from "./commands/SaveMessagesToDB.js"; import { SavePinsToDBCmd } from "./commands/SavePinsToDB.js"; -import { MessageCreateEvt, MessageDeleteBulkEvt, MessageDeleteEvt, MessageUpdateEvt } from "./events/SaveMessagesEvts.js"; +import { + MessageCreateEvt, + MessageDeleteBulkEvt, + MessageDeleteEvt, + MessageUpdateEvt, +} from "./events/SaveMessagesEvts.js"; import { MessageSaverPluginType, zMessageSaverConfig } from "./types.js"; const defaultOptions: PluginOptions = { diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts index d45ffb633..7380443d2 100644 --- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts +++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts @@ -3,7 +3,14 @@ import { commandTypeHelpers as ct } from "../../../commandTypes.js"; import { CaseTypes } from "../../../data/CaseTypes.js"; import { sendErrorMessage } from "../../../pluginUtils.js"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin.js"; -import { UnknownUser, chunkArray, emptyEmbedValue, renderUsername, resolveMember, resolveUser } from "../../../utils.js"; +import { + UnknownUser, + chunkArray, + emptyEmbedValue, + renderUsername, + resolveMember, + resolveUser, +} from "../../../utils.js"; import { asyncMap } from "../../../utils/async.js"; import { createPaginatedMessage } from "../../../utils/createPaginatedMessage.js"; import { getGuildPrefix } from "../../../utils/getGuildPrefix.js"; diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts index eddf802e8..527f6163c 100644 --- a/backend/src/plugins/ModActions/functions/kickMember.ts +++ b/backend/src/plugins/ModActions/functions/kickMember.ts @@ -3,7 +3,13 @@ import { GuildPluginData } from "knub"; import { CaseTypes } from "../../../data/CaseTypes.js"; import { LogType } from "../../../data/LogType.js"; import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter.js"; -import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils.js"; +import { + createUserNotificationError, + notifyUser, + resolveUser, + ucfirst, + UserNotificationResult, +} from "../../../utils.js"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects.js"; import { CasesPlugin } from "../../Cases/CasesPlugin.js"; import { LogsPlugin } from "../../Logs/LogsPlugin.js"; diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index 056e26db0..a7a8f5318 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -2,7 +2,13 @@ import { GuildMember, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { CaseTypes } from "../../../data/CaseTypes.js"; import { TemplateParseError, TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter.js"; -import { UserNotificationResult, createUserNotificationError, notifyUser, resolveUser, ucfirst } from "../../../utils.js"; +import { + UserNotificationResult, + createUserNotificationError, + notifyUser, + resolveUser, + ucfirst, +} from "../../../utils.js"; import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects.js"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction.js"; import { CasesPlugin } from "../../Cases/CasesPlugin.js"; diff --git a/backend/src/plugins/Phisherman/functions/getDomainInfo.ts b/backend/src/plugins/Phisherman/functions/getDomainInfo.ts index f29131947..b8fabcb85 100644 --- a/backend/src/plugins/Phisherman/functions/getDomainInfo.ts +++ b/backend/src/plugins/Phisherman/functions/getDomainInfo.ts @@ -1,5 +1,9 @@ import { GuildPluginData } from "knub"; -import { getPhishermanDomainInfo, phishermanDomainIsSafe, trackPhishermanCaughtDomain } from "../../../data/Phisherman.js"; +import { + getPhishermanDomainInfo, + phishermanDomainIsSafe, + trackPhishermanCaughtDomain, +} from "../../../data/Phisherman.js"; import { PhishermanDomainInfo } from "../../../data/types/phisherman.js"; import { PhishermanPluginType } from "../types.js"; diff --git a/backend/src/templateFormatter.test.ts b/backend/src/templateFormatter.test.ts index f906e054c..0d7bd9934 100644 --- a/backend/src/templateFormatter.test.ts +++ b/backend/src/templateFormatter.test.ts @@ -1,5 +1,10 @@ import test from "ava"; -import { parseTemplate, renderParsedTemplate, renderTemplate, TemplateSafeValueContainer } from "./templateFormatter.js"; +import { + parseTemplate, + renderParsedTemplate, + renderTemplate, + TemplateSafeValueContainer, +} from "./templateFormatter.js"; test("Parses plain string templates correctly", (t) => { const result = parseTemplate("foo bar baz"); diff --git a/backend/src/utils.ts b/backend/src/utils.ts index b898fbe4e..214d3f20b 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -286,8 +286,10 @@ export type StrictMessageContent = { }; export type MessageContent = string | StrictMessageContent; -export const zMessageContent = z.union([zBoundedCharacters(0, 4000), zStrictMessageContent]) as z.ZodType; - +export const zMessageContent = z.union([ + zBoundedCharacters(0, 4000), + zStrictMessageContent, +]) as z.ZodType; export function validateAndParseMessageContent(input: unknown): StrictMessageContent { if (input == null) {