Skip to content

Commit

Permalink
chore: format repo (#482)
Browse files Browse the repository at this point in the history
Begone formatting errors
  • Loading branch information
rubyowo authored Jun 2, 2024
1 parent 8a4f7fe commit 914efb6
Show file tree
Hide file tree
Showing 21 changed files with 95 additions and 41 deletions.
10 changes: 9 additions & 1 deletion backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
39 changes: 24 additions & 15 deletions backend/src/migrations/1573248462469-MoveStarboardsToConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ import { MigrationInterface, QueryRunner, Table, TableColumn } from "typeorm";
export class MoveStarboardsToConfig1573248462469 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<any> {
// Create a new column for the channel's id
await queryRunner.addColumn("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(`
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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<any> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<any> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<any> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<void> {
Expand Down
10 changes: 8 additions & 2 deletions backend/src/plugins/Censor/util/applyFiltersToMsg.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/GuildConfigReloader/types.ts
Original file line number Diff line number Diff line change
@@ -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({});

Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/GuildMemberCache/types.ts
Original file line number Diff line number Diff line change
@@ -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({});

Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/InternalPoster/types.ts
Original file line number Diff line number Diff line change
@@ -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({});

Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/Logs/LogsPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/Logs/logFunctions/logMessageDelete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/Logs/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion backend/src/plugins/Logs/util/getLogMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<TLogType extends keyof ILogTypeData>(
pluginData: GuildPluginData<LogsPluginType>,
Expand Down
7 changes: 6 additions & 1 deletion backend/src/plugins/MessageSaver/MessageSaverPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<MessageSaverPluginType> = {
Expand Down
9 changes: 8 additions & 1 deletion backend/src/plugins/ModActions/commands/CasesUserCmd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 7 additions & 1 deletion backend/src/plugins/ModActions/functions/kickMember.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 7 additions & 1 deletion backend/src/plugins/ModActions/functions/warnMember.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 5 additions & 1 deletion backend/src/plugins/Phisherman/functions/getDomainInfo.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
7 changes: 6 additions & 1 deletion backend/src/templateFormatter.test.ts
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 4 additions & 2 deletions backend/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,10 @@ export type StrictMessageContent = {
};

export type MessageContent = string | StrictMessageContent;
export const zMessageContent = z.union([zBoundedCharacters(0, 4000), zStrictMessageContent]) as z.ZodType<MessageContent>;

export const zMessageContent = z.union([
zBoundedCharacters(0, 4000),
zStrictMessageContent,
]) as z.ZodType<MessageContent>;

export function validateAndParseMessageContent(input: unknown): StrictMessageContent {
if (input == null) {
Expand Down

0 comments on commit 914efb6

Please sign in to comment.