diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ec24d2c..ad535f14 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -14,7 +14,7 @@ "cors": "^2.8.5", "cross-env": "^5.2.0", "deep-diff": "^1.0.2", - "discord.js": "^13.0.0-dev.07017a9.1626869177", + "discord.js": "^13.0.0-dev.4886ae2.1627214570", "dotenv": "^4.0.0", "emoji-regex": "^8.0.0", "erlpack": "github:discord/erlpack", @@ -81,8 +81,8 @@ "version": "30.0.0-beta.38", "license": "MIT", "dependencies": { - "discord-api-types": "^0.19.0-next.836e8fb.1625574825", - "discord.js": "^13.0.0-dev.07017a9.1626869177", + "discord-api-types": "^0.21.0-next.ab1951b.1626870574", + "discord.js": "^13.0.0-dev.4886ae2.1627214570", "knub-command-manager": "^9.1.0", "ts-essentials": "^6.0.7" }, @@ -2159,9 +2159,9 @@ } }, "node_modules/discord.js": { - "version": "13.0.0-dev.07017a9.1626869177", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.07017a9.1626869177.tgz", - "integrity": "sha512-awnE/59Sy6tnoAZUP7/f8tudcDT68WXxK0pgZZpA7WTGfyR5+IokWsFmkbS49dDll7OZQbi+L8iRt8ahYo3PGQ==", + "version": "13.0.0-dev.4886ae2.1627214570", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.4886ae2.1627214570.tgz", + "integrity": "sha512-9eqVCQyqqSHJcR1nki9NlaTD7FjvfkjJt8zcmF5wcCs/7P9v27UrPYg9yxvghswDvDhz9ojotYGGcpK7tSypmA==", "dependencies": { "@discordjs/builders": "^0.2.0", "@discordjs/collection": "^0.1.6", @@ -8034,9 +8034,9 @@ "integrity": "sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg==" }, "discord.js": { - "version": "13.0.0-dev.07017a9.1626869177", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.07017a9.1626869177.tgz", - "integrity": "sha512-awnE/59Sy6tnoAZUP7/f8tudcDT68WXxK0pgZZpA7WTGfyR5+IokWsFmkbS49dDll7OZQbi+L8iRt8ahYo3PGQ==", + "version": "13.0.0-dev.4886ae2.1627214570", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.4886ae2.1627214570.tgz", + "integrity": "sha512-9eqVCQyqqSHJcR1nki9NlaTD7FjvfkjJt8zcmF5wcCs/7P9v27UrPYg9yxvghswDvDhz9ojotYGGcpK7tSypmA==", "requires": { "@discordjs/builders": "^0.2.0", "@discordjs/collection": "^0.1.6", @@ -8877,8 +8877,8 @@ "@typescript-eslint/eslint-plugin": "^4.23.0", "@typescript-eslint/parser": "^4.23.0", "chai": "^4.3.4", - "discord-api-types": "^0.19.0-next.836e8fb.1625574825", - "discord.js": "^13.0.0-dev.07017a9.1626869177", + "discord-api-types": "^0.21.0-next.ab1951b.1626870574", + "discord.js": "^13.0.0-dev.4886ae2.1627214570", "eslint": "^7.2.0", "husky": "^4.3.8", "knub-command-manager": "^9.1.0", diff --git a/backend/package.json b/backend/package.json index 7751262b..65ca54f0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -29,7 +29,7 @@ "cors": "^2.8.5", "cross-env": "^5.2.0", "deep-diff": "^1.0.2", - "discord.js": "^13.0.0-dev.07017a9.1626869177", + "discord.js": "^13.0.0-dev.4886ae2.1627214570", "dotenv": "^4.0.0", "emoji-regex": "^8.0.0", "erlpack": "github:discord/erlpack", diff --git a/backend/src/data/entities/ButtonRole.ts b/backend/src/data/entities/ButtonRole.ts index affcce07..3c3f695d 100644 --- a/backend/src/data/entities/ButtonRole.ts +++ b/backend/src/data/entities/ButtonRole.ts @@ -1,4 +1,4 @@ -import { Column, Entity, PrimaryColumn, Unique } from "typeorm"; +import { Column, Entity, PrimaryColumn } from "typeorm"; @Entity("button_roles") export class ButtonRole { diff --git a/backend/src/index.ts b/backend/src/index.ts index 52d555b3..163ba459 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,4 +1,4 @@ -import { Client, Collection, Intents, Options, TextChannel } from "discord.js"; +import { Client, Intents, TextChannel } from "discord.js"; import fs from "fs"; import yaml from "js-yaml"; import { Knub, PluginError } from "knub"; @@ -19,7 +19,7 @@ import { RecoverablePluginError } from "./RecoverablePluginError"; import { SimpleError } from "./SimpleError"; import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types"; import { startUptimeCounter } from "./uptime"; -import { errorMessage, isDiscordHTTPError, isDiscordAPIError, successMessage } from "./utils"; +import { errorMessage, isDiscordAPIError, isDiscordHTTPError, successMessage } from "./utils"; const fsp = fs.promises; diff --git a/backend/src/plugins/AutoDelete/util/deleteNextItem.ts b/backend/src/plugins/AutoDelete/util/deleteNextItem.ts index 0016a793..332994cf 100644 --- a/backend/src/plugins/AutoDelete/util/deleteNextItem.ts +++ b/backend/src/plugins/AutoDelete/util/deleteNextItem.ts @@ -1,7 +1,7 @@ -import { Permissions, Snowflake, TextChannel, User } from "discord.js"; +import { Permissions, Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { resolveUser, verboseChannelMention } from "../../../utils"; diff --git a/backend/src/plugins/Automod/actions/reply.ts b/backend/src/plugins/Automod/actions/reply.ts index 1f58f18f..ad682ee9 100644 --- a/backend/src/plugins/Automod/actions/reply.ts +++ b/backend/src/plugins/Automod/actions/reply.ts @@ -1,6 +1,6 @@ import { MessageOptions, Permissions, Snowflake, TextChannel, User } from "discord.js"; import * as t from "io-ts"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { renderTemplate } from "../../../templateFormatter"; import { diff --git a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts index a9f086be..c4da61cd 100644 --- a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts +++ b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts @@ -1,6 +1,6 @@ import { User } from "discord.js"; import { GuildPluginData } from "knub"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { runAutomodOnAntiraidLevel } from "../events/runAutomodOnAntiraidLevel"; diff --git a/backend/src/plugins/Censor/util/censorMessage.ts b/backend/src/plugins/Censor/util/censorMessage.ts index bec20326..509680e2 100644 --- a/backend/src/plugins/Censor/util/censorMessage.ts +++ b/backend/src/plugins/Censor/util/censorMessage.ts @@ -1,7 +1,7 @@ -import { Snowflake, TextChannel, User } from "discord.js"; +import { Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import { deactivateMentions, disableCodeBlocks } from "knub/dist/helpers"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { resolveUser } from "../../../utils"; diff --git a/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts b/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts index 3d920981..a6aa8c64 100644 --- a/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsChannelModifyEvts.ts @@ -1,6 +1,6 @@ -import { channelToConfigAccessibleChannel } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { differenceToString, getScalarDifference } from "../../../utils"; +import { channelToConfigAccessibleChannel } from "../../../utils/configAccessibleObjects"; import { logsEvt } from "../types"; export const LogsChannelCreateEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts b/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts index bdf2cb48..7e8d8eb9 100644 --- a/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts +++ b/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts @@ -1,6 +1,6 @@ import { GuildAuditLogs } from "discord.js"; -import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"; import { logsEvt } from "../types"; diff --git a/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts b/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts index 801229fd..099c3cb3 100644 --- a/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts +++ b/backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts @@ -1,7 +1,7 @@ import humanizeDuration from "humanize-duration"; import moment from "moment-timezone"; -import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { logsEvt } from "../types"; diff --git a/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts b/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts index ddae5383..8b18516d 100644 --- a/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts +++ b/backend/src/plugins/Logs/events/LogsGuildMemberRemoveEvt.ts @@ -1,5 +1,5 @@ -import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { logsEvt } from "../types"; export const LogsGuildMemberRemoveEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts b/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts index 01d344bb..e9ad1b07 100644 --- a/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts @@ -1,6 +1,6 @@ -import { roleToConfigAccessibleRole } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { differenceToString, getScalarDifference } from "../../../utils"; +import { roleToConfigAccessibleRole } from "../../../utils/configAccessibleObjects"; import { logsEvt } from "../types"; export const LogsRoleCreateEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts b/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts index 207f09fe..b2cb0989 100644 --- a/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsStageInstanceModifyEvts.ts @@ -1,6 +1,6 @@ -import { channelToConfigAccessibleChannel, stageToConfigAccessibleStage } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { differenceToString, getScalarDifference, stripObjectToScalars } from "../../../utils"; +import { differenceToString, getScalarDifference } from "../../../utils"; +import { channelToConfigAccessibleChannel, stageToConfigAccessibleStage } from "../../../utils/configAccessibleObjects"; import { logsEvt } from "../types"; export const LogsStageInstanceCreateEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts b/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts index d6a5312a..f20c15e4 100644 --- a/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts +++ b/backend/src/plugins/Logs/events/LogsThreadModifyEvts.ts @@ -1,6 +1,6 @@ -import { channelToConfigAccessibleChannel } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { stripObjectToScalars, getScalarDifference, differenceToString } from "../../../utils"; +import { differenceToString, getScalarDifference } from "../../../utils"; +import { channelToConfigAccessibleChannel } from "../../../utils/configAccessibleObjects"; import { logsEvt } from "../types"; export const LogsThreadCreateEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts b/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts index aa997913..5b29e3f0 100644 --- a/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts +++ b/backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts @@ -1,7 +1,7 @@ import { GuildAuditLogs } from "discord.js"; import diff from "lodash.difference"; import isEqual from "lodash.isequal"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"; import { logsEvt } from "../types"; diff --git a/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts b/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts index ae19eb53..727fa160 100644 --- a/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts +++ b/backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts @@ -1,6 +1,8 @@ -import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { + channelToConfigAccessibleChannel, + memberToConfigAccessibleMember, +} from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { stripObjectToScalars } from "../../../utils"; import { logsEvt } from "../types"; export const LogsVoiceStateUpdateEvt = logsEvt({ diff --git a/backend/src/plugins/Logs/util/onMessageDelete.ts b/backend/src/plugins/Logs/util/onMessageDelete.ts index bcb10d14..f1f64893 100644 --- a/backend/src/plugins/Logs/util/onMessageDelete.ts +++ b/backend/src/plugins/Logs/util/onMessageDelete.ts @@ -1,7 +1,7 @@ -import { MessageAttachment, Snowflake, User } from "discord.js"; +import { MessageAttachment, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { resolveUser, useMediaUrls } from "../../../utils"; diff --git a/backend/src/plugins/Logs/util/onMessageUpdate.ts b/backend/src/plugins/Logs/util/onMessageUpdate.ts index 6867fe62..1d0efd1a 100644 --- a/backend/src/plugins/Logs/util/onMessageUpdate.ts +++ b/backend/src/plugins/Logs/util/onMessageUpdate.ts @@ -1,10 +1,10 @@ -import { MessageEmbed, Snowflake, User } from "discord.js"; +import { MessageEmbed, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import cloneDeep from "lodash.clonedeep"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; -import { resolveUser, stripObjectToScalars } from "../../../utils"; +import { resolveUser } from "../../../utils"; import { LogsPluginType } from "../types"; export async function onMessageUpdate( diff --git a/backend/src/plugins/ModActions/commands/AddCaseCmd.ts b/backend/src/plugins/ModActions/commands/AddCaseCmd.ts index 794e96ed..c72922d4 100644 --- a/backend/src/plugins/ModActions/commands/AddCaseCmd.ts +++ b/backend/src/plugins/ModActions/commands/AddCaseCmd.ts @@ -1,4 +1,4 @@ -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; diff --git a/backend/src/plugins/ModActions/commands/BanCmd.ts b/backend/src/plugins/ModActions/commands/BanCmd.ts index 34a18e36..110364b1 100644 --- a/backend/src/plugins/ModActions/commands/BanCmd.ts +++ b/backend/src/plugins/ModActions/commands/BanCmd.ts @@ -1,7 +1,6 @@ -import { User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { getMemberLevel } from "knub/dist/helpers"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts b/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts index 0550942f..09fbb8d0 100644 --- a/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts +++ b/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts @@ -1,6 +1,6 @@ import { TextChannel } from "discord.js"; import { helpers } from "knub"; -import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts index d14b15a4..b7ff84da 100644 --- a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts +++ b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts @@ -1,5 +1,5 @@ import { Snowflake } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/commands/MassBanCmd.ts b/backend/src/plugins/ModActions/commands/MassBanCmd.ts index bc737349..899d8ca3 100644 --- a/backend/src/plugins/ModActions/commands/MassBanCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassBanCmd.ts @@ -1,14 +1,14 @@ import { Snowflake, TextChannel } from "discord.js"; import { waitForReply } from "knub/dist/helpers"; import { performance } from "perf_hooks"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; 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 { MINUTES, noop, stripObjectToScalars } from "../../../utils"; +import { MINUTES, noop } from "../../../utils"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { ignoreEvent } from "../functions/ignoreEvent"; import { IgnoredEventType, modActionsCmd } from "../types"; diff --git a/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts b/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts index 9913ceac..059f85a7 100644 --- a/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassUnbanCmd.ts @@ -1,11 +1,10 @@ import { Snowflake, TextChannel } from "discord.js"; import { waitForReply } from "knub/dist/helpers"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { stripObjectToScalars } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; 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 bd26f471..9f87ed81 100644 --- a/backend/src/plugins/ModActions/commands/MassmuteCmd.ts +++ b/backend/src/plugins/ModActions/commands/MassmuteCmd.ts @@ -1,12 +1,11 @@ import { Snowflake, TextChannel } from "discord.js"; import { waitForReply } from "knub/dist/helpers"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; 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 { stripObjectToScalars } from "../../../utils"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { modActionsCmd } from "../types"; diff --git a/backend/src/plugins/ModActions/commands/NoteCmd.ts b/backend/src/plugins/ModActions/commands/NoteCmd.ts index 195f10ae..efdb5adc 100644 --- a/backend/src/plugins/ModActions/commands/NoteCmd.ts +++ b/backend/src/plugins/ModActions/commands/NoteCmd.ts @@ -1,5 +1,4 @@ -import { User } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts index 5b4407f1..e425ddee 100644 --- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts @@ -1,5 +1,5 @@ import { Snowflake } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts index 0638dcf9..57790912 100644 --- a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts @@ -1,9 +1,9 @@ import { GuildAuditLogs, User } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; -import { resolveUser, stripObjectToScalars, UnknownUser } from "../../../utils"; +import { resolveUser, UnknownUser } from "../../../utils"; import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts index 24c89e8d..d69ede2a 100644 --- a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts @@ -1,5 +1,5 @@ import { GuildAuditLogs, User } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts index 5e788df5..83143606 100644 --- a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts @@ -1,5 +1,5 @@ import { GuildAuditLogs, User } from "discord.js"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index f9b37678..25613f7d 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -1,7 +1,7 @@ import { DiscordAPIError, Snowflake, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; diff --git a/backend/src/plugins/ModActions/functions/isBanned.ts b/backend/src/plugins/ModActions/functions/isBanned.ts index dc476e63..09ec1e2e 100644 --- a/backend/src/plugins/ModActions/functions/isBanned.ts +++ b/backend/src/plugins/ModActions/functions/isBanned.ts @@ -1,7 +1,7 @@ import { Permissions, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; -import { isDiscordHTTPError, isDiscordAPIError, SECONDS, sleep } from "../../../utils"; +import { isDiscordAPIError, isDiscordHTTPError, SECONDS, 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/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts index 8c7d1563..5aa3d853 100644 --- a/backend/src/plugins/ModActions/functions/kickMember.ts +++ b/backend/src/plugins/ModActions/functions/kickMember.ts @@ -1,17 +1,10 @@ import { GuildMember } from "discord.js"; import { GuildPluginData } from "knub"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { renderTemplate } from "../../../templateFormatter"; -import { - createUserNotificationError, - notifyUser, - resolveUser, - stripObjectToScalars, - ucfirst, - UserNotificationResult, -} from "../../../utils"; +import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { IgnoredEventType, KickOptions, KickResult, ModActionsPluginType } from "../types"; import { getDefaultContactMethods } from "./getDefaultContactMethods"; diff --git a/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts b/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts index bf6f0ab4..fdf957ea 100644 --- a/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts +++ b/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts @@ -4,9 +4,9 @@ import { GuildPluginData } from "knub"; import moment from "moment-timezone"; import { LogType } from "src/data/LogType"; import { logger } from "src/logger"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; -import { resolveUser, SECONDS, stripObjectToScalars } from "../../../utils"; +import { resolveUser, SECONDS } from "../../../utils"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { IgnoredEventType, ModActionsPluginType } from "../types"; import { formatReasonWithAttachments } from "./formatReasonWithAttachments"; diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index 500ea390..2f2acea1 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -1,17 +1,10 @@ import { GuildMember, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { renderTemplate } from "../../../templateFormatter"; -import { - createUserNotificationError, - notifyUser, - resolveUser, - stripObjectToScalars, - ucfirst, - UserNotificationResult, -} from "../../../utils"; +import { createUserNotificationError, notifyUser, resolveUser, ucfirst, UserNotificationResult } from "../../../utils"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { ModActionsPluginType, WarnOptions, WarnResult } from "../types"; diff --git a/backend/src/plugins/Mutes/commands/MutesCmd.ts b/backend/src/plugins/Mutes/commands/MutesCmd.ts index fdc89c8b..74e2dc84 100644 --- a/backend/src/plugins/Mutes/commands/MutesCmd.ts +++ b/backend/src/plugins/Mutes/commands/MutesCmd.ts @@ -3,7 +3,7 @@ import moment from "moment-timezone"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { humanizeDurationShort } from "../../../humanizeDurationShort"; import { getBaseUrl } from "../../../pluginUtils"; -import { DBDateFormat, isFullMessage, MINUTES, noop, resolveMember } from "../../../utils"; +import { DBDateFormat, MINUTES, resolveMember } from "../../../utils"; import { IMuteWithDetails, mutesCmd } from "../types"; export const MutesCmd = mutesCmd({ diff --git a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts index 134aea79..7d4ece2d 100644 --- a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts +++ b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts @@ -1,7 +1,6 @@ import { Snowflake } from "discord.js"; -import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { stripObjectToScalars } from "../../../utils"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { mutesEvt } from "../types"; diff --git a/backend/src/plugins/Mutes/functions/clearExpiredMutes.ts b/backend/src/plugins/Mutes/functions/clearExpiredMutes.ts index 410409f8..7ad36e65 100644 --- a/backend/src/plugins/Mutes/functions/clearExpiredMutes.ts +++ b/backend/src/plugins/Mutes/functions/clearExpiredMutes.ts @@ -1,8 +1,8 @@ import { Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; -import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { resolveMember, stripObjectToScalars, UnknownUser } from "../../../utils"; +import { resolveMember, UnknownUser } from "../../../utils"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { MutesPluginType } from "../types"; diff --git a/backend/src/plugins/Mutes/functions/muteUser.ts b/backend/src/plugins/Mutes/functions/muteUser.ts index 3da34794..78d0e4bd 100644 --- a/backend/src/plugins/Mutes/functions/muteUser.ts +++ b/backend/src/plugins/Mutes/functions/muteUser.ts @@ -1,7 +1,7 @@ import { Snowflake, TextChannel, User } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { Case } from "../../../data/entities/Case"; import { LogType } from "../../../data/LogType"; @@ -12,7 +12,6 @@ import { notifyUser, resolveMember, resolveUser, - stripObjectToScalars, ucfirst, UserNotificationMethod, UserNotificationResult, diff --git a/backend/src/plugins/Mutes/functions/unmuteUser.ts b/backend/src/plugins/Mutes/functions/unmuteUser.ts index 83436188..3011efeb 100644 --- a/backend/src/plugins/Mutes/functions/unmuteUser.ts +++ b/backend/src/plugins/Mutes/functions/unmuteUser.ts @@ -1,10 +1,10 @@ import { Snowflake } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; -import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; -import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; +import { resolveMember, resolveUser } from "../../../utils"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CaseArgs } from "../../Cases/types"; diff --git a/backend/src/plugins/Persist/events/LoadDataEvt.ts b/backend/src/plugins/Persist/events/LoadDataEvt.ts index 6948eaa1..75c3871d 100644 --- a/backend/src/plugins/Persist/events/LoadDataEvt.ts +++ b/backend/src/plugins/Persist/events/LoadDataEvt.ts @@ -1,8 +1,7 @@ import { GuildMemberEditData, Permissions } from "discord.js"; import intersection from "lodash.intersection"; -import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; -import { stripObjectToScalars } from "../../../utils"; import { canAssignRole } from "../../../utils/canAssignRole"; import { getMissingPermissions } from "../../../utils/getMissingPermissions"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; diff --git a/backend/src/plugins/Post/util/actualPostCmd.ts b/backend/src/plugins/Post/util/actualPostCmd.ts index 1f9ca18b..88135f38 100644 --- a/backend/src/plugins/Post/util/actualPostCmd.ts +++ b/backend/src/plugins/Post/util/actualPostCmd.ts @@ -2,10 +2,10 @@ import { Channel, Message, TextChannel } from "discord.js"; import humanizeDuration from "humanize-duration"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { DBDateFormat, errorMessage, MINUTES, StrictMessageContent, stripObjectToScalars } from "../../../utils"; +import { DBDateFormat, errorMessage, MINUTES, StrictMessageContent } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { PostPluginType } from "../types"; import { parseScheduleTime } from "./parseScheduleTime"; diff --git a/backend/src/plugins/Post/util/scheduledPostLoop.ts b/backend/src/plugins/Post/util/scheduledPostLoop.ts index 544a57c0..766daed6 100644 --- a/backend/src/plugins/Post/util/scheduledPostLoop.ts +++ b/backend/src/plugins/Post/util/scheduledPostLoop.ts @@ -1,10 +1,10 @@ import { Snowflake, TextChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; -import { DBDateFormat, SECONDS, stripObjectToScalars } from "../../../utils"; +import { DBDateFormat, SECONDS } from "../../../utils"; import { PostPluginType } from "../types"; import { postMessage } from "./postMessage"; diff --git a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts index 1c841457..d289f6db 100644 --- a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts +++ b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts @@ -1,11 +1,11 @@ import { PluginOptions } from "knub"; import { ConfigPreprocessorFn } from "knub/dist/config/configTypes"; import { GuildButtonRoles } from "../../data/GuildButtonRoles"; -import { isValidSnowflake } from "../../utils"; -import { StrictValidationError } from "../../validatorUtils"; import { GuildReactionRoles } from "../../data/GuildReactionRoles"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { Queue } from "../../Queue"; +import { isValidSnowflake } from "../../utils"; +import { StrictValidationError } from "../../validatorUtils"; import { LogsPlugin } from "../Logs/LogsPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { ClearReactionRolesCmd } from "./commands/ClearReactionRolesCmd"; diff --git a/backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts b/backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts index f54ef9ad..040acf1b 100644 --- a/backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts +++ b/backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts @@ -1,9 +1,9 @@ -import { MessageActionRow, MessageButton, Snowflake, TextChannel } from "discord.js"; +import { createHash } from "crypto"; +import { MessageButton, Snowflake } from "discord.js"; +import moment from "moment"; import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { reactionRolesCmd } from "../types"; -import { createHash } from "crypto"; -import moment from "moment"; import { splitButtonsIntoRows } from "../util/splitButtonsIntoRows"; export const PostButtonRolesCmd = reactionRolesCmd({ diff --git a/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts b/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts index 2881b27d..704b0b6a 100644 --- a/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts +++ b/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts @@ -1,4 +1,5 @@ import { MessageComponentInteraction } from "discord.js"; +import humanizeDuration from "humanize-duration"; import moment from "moment"; import { LogType } from "src/data/LogType"; import { logger } from "src/logger"; @@ -6,10 +7,9 @@ import { LogsPlugin } from "src/plugins/Logs/LogsPlugin"; import { MINUTES } from "src/utils"; import { idToTimestamp } from "src/utils/idToTimestamp"; import { reactionRolesEvt } from "../types"; -import { resolveStatefulCustomId, BUTTON_CONTEXT_SEPARATOR } from "../util/buttonCustomIdFunctions"; -import { ButtonMenuActions } from "../util/buttonMenuActions"; -import humanizeDuration from "humanize-duration"; import { handleModifyRole, handleOpenMenu } from "../util/buttonActionHandlers"; +import { BUTTON_CONTEXT_SEPARATOR, resolveStatefulCustomId } from "../util/buttonCustomIdFunctions"; +import { ButtonMenuActions } from "../util/buttonMenuActions"; const BUTTON_INVALIDATION_TIME = 15 * MINUTES; diff --git a/backend/src/plugins/ReactionRoles/types.ts b/backend/src/plugins/ReactionRoles/types.ts index 203a4327..27dc5d17 100644 --- a/backend/src/plugins/ReactionRoles/types.ts +++ b/backend/src/plugins/ReactionRoles/types.ts @@ -1,10 +1,10 @@ import * as t from "io-ts"; import { BasePluginType, typedGuildCommand, typedGuildEventListener } from "knub"; import { GuildButtonRoles } from "src/data/GuildButtonRoles"; -import { tNullable } from "../../utils"; import { GuildReactionRoles } from "../../data/GuildReactionRoles"; import { GuildSavedMessages } from "../../data/GuildSavedMessages"; import { Queue } from "../../Queue"; +import { tNullable } from "../../utils"; // These need to be updated every time discord adds/removes a style, // but i cant figure out how to import MessageButtonStyles at runtime diff --git a/backend/src/plugins/ReactionRoles/util/buttonActionHandlers.ts b/backend/src/plugins/ReactionRoles/util/buttonActionHandlers.ts index 10f4e631..314516b6 100644 --- a/backend/src/plugins/ReactionRoles/util/buttonActionHandlers.ts +++ b/backend/src/plugins/ReactionRoles/util/buttonActionHandlers.ts @@ -1,4 +1,4 @@ -import { MessageButton, MessageActionRow, MessageComponentInteraction, Snowflake } from "discord.js"; +import { MessageButton, MessageComponentInteraction, Snowflake } from "discord.js"; import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin"; diff --git a/backend/src/plugins/Roles/commands/AddRoleCmd.ts b/backend/src/plugins/Roles/commands/AddRoleCmd.ts index b45fe262..66dc2096 100644 --- a/backend/src/plugins/Roles/commands/AddRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/AddRoleCmd.ts @@ -1,9 +1,9 @@ import { GuildChannel } from "discord.js"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { resolveRoleId, stripObjectToScalars, verboseUserMention } from "../../../utils"; +import { resolveRoleId, verboseUserMention } from "../../../utils"; import { rolesCmd } from "../types"; export const AddRoleCmd = rolesCmd({ diff --git a/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts b/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts index 1ac58128..5f15a3f0 100644 --- a/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/MassAddRoleCmd.ts @@ -1,10 +1,10 @@ import { GuildMember } from "discord.js"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { canActOn, sendErrorMessage } from "../../../pluginUtils"; -import { resolveMember, resolveRoleId, stripObjectToScalars, successMessage } from "../../../utils"; +import { resolveMember, resolveRoleId, successMessage } from "../../../utils"; import { rolesCmd } from "../types"; export const MassAddRoleCmd = rolesCmd({ diff --git a/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts b/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts index f10fa555..357f8049 100644 --- a/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/MassRemoveRoleCmd.ts @@ -1,10 +1,10 @@ import { GuildMember } from "discord.js"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; import { canActOn, sendErrorMessage } from "../../../pluginUtils"; -import { resolveMember, resolveRoleId, stripObjectToScalars, successMessage } from "../../../utils"; +import { resolveMember, resolveRoleId, successMessage } from "../../../utils"; import { rolesCmd } from "../types"; export const MassRemoveRoleCmd = rolesCmd({ diff --git a/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts b/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts index 75d6f9c6..fdab1e23 100644 --- a/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts +++ b/backend/src/plugins/Roles/commands/RemoveRoleCmd.ts @@ -1,9 +1,9 @@ import { GuildChannel } from "discord.js"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { resolveRoleId, stripObjectToScalars, verboseUserMention } from "../../../utils"; +import { resolveRoleId, verboseUserMention } from "../../../utils"; import { rolesCmd } from "../types"; export const RemoveRoleCmd = rolesCmd({ diff --git a/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts b/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts index 6e180a36..208f628a 100644 --- a/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts +++ b/backend/src/plugins/Slowmode/util/applyBotSlowmodeToUserId.ts @@ -1,9 +1,9 @@ -import { GuildChannel, Permissions, Snowflake, TextChannel } from "discord.js"; +import { GuildChannel, Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; -import { isDiscordAPIError, stripObjectToScalars, UnknownUser } from "../../../utils"; +import { isDiscordAPIError, UnknownUser } from "../../../utils"; import { SlowmodePluginType } from "../types"; export async function applyBotSlowmodeToUserId( diff --git a/backend/src/plugins/Slowmode/util/clearBotSlowmodeFromUserId.ts b/backend/src/plugins/Slowmode/util/clearBotSlowmodeFromUserId.ts index 5c59aaf3..b86862ae 100644 --- a/backend/src/plugins/Slowmode/util/clearBotSlowmodeFromUserId.ts +++ b/backend/src/plugins/Slowmode/util/clearBotSlowmodeFromUserId.ts @@ -1,4 +1,4 @@ -import { GuildChannel, Snowflake, TextChannel, ThreadChannel } from "discord.js"; +import { Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import { LogType } from "../../../data/LogType"; import { SlowmodePluginType } from "../types"; diff --git a/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts b/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts index 6c5fe46d..0d22bca8 100644 --- a/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts +++ b/backend/src/plugins/Slowmode/util/clearExpiredSlowmodes.ts @@ -1,9 +1,9 @@ import { GuildChannel, Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { logger } from "../../../logger"; -import { stripObjectToScalars, UnknownUser } from "../../../utils"; +import { UnknownUser } from "../../../utils"; import { SlowmodePluginType } from "../types"; import { clearBotSlowmodeFromUserId } from "./clearBotSlowmodeFromUserId"; diff --git a/backend/src/plugins/Slowmode/util/disableBotSlowmodeForChannel.ts b/backend/src/plugins/Slowmode/util/disableBotSlowmodeForChannel.ts index a6b06364..43d6cb55 100644 --- a/backend/src/plugins/Slowmode/util/disableBotSlowmodeForChannel.ts +++ b/backend/src/plugins/Slowmode/util/disableBotSlowmodeForChannel.ts @@ -1,4 +1,4 @@ -import { GuildChannel, TextChannel, ThreadChannel } from "discord.js"; +import { TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import { SlowmodePluginType } from "../types"; import { clearBotSlowmodeFromUserId } from "./clearBotSlowmodeFromUserId"; diff --git a/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts b/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts index e3b67ed1..b5f9bbba 100644 --- a/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts +++ b/backend/src/plugins/Spam/util/logAndDetectMessageSpam.ts @@ -1,7 +1,10 @@ import { Snowflake, TextChannel } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { + channelToConfigAccessibleChannel, + memberToConfigAccessibleMember, +} from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; @@ -10,14 +13,7 @@ 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, - stripObjectToScalars, - trimLines, -} from "../../../utils"; +import { convertDelayStringToMS, DBDateFormat, 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 107cb45e..b9d5fd6d 100644 --- a/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts +++ b/backend/src/plugins/Spam/util/logAndDetectOtherSpam.ts @@ -1,11 +1,11 @@ import { GuildPluginData } from "knub"; -import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; -import { convertDelayStringToMS, resolveMember, stripObjectToScalars } from "../../../utils"; +import { convertDelayStringToMS, resolveMember } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { RecentActionType, SpamPluginType } from "../types"; import { addRecentAction } from "./addRecentAction"; diff --git a/backend/src/plugins/Tags/commands/TagEvalCmd.ts b/backend/src/plugins/Tags/commands/TagEvalCmd.ts index abf4a86c..9ce1bf00 100644 --- a/backend/src/plugins/Tags/commands/TagEvalCmd.ts +++ b/backend/src/plugins/Tags/commands/TagEvalCmd.ts @@ -1,8 +1,7 @@ -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage } from "../../../pluginUtils"; import { TemplateParseError } from "../../../templateFormatter"; -import { stripObjectToScalars } from "../../../utils"; import { tagsCmd } from "../types"; import { renderTagBody } from "../util/renderTagBody"; diff --git a/backend/src/plugins/Tags/util/renderTagFromString.ts b/backend/src/plugins/Tags/util/renderTagFromString.ts index 4461f4a4..d54d836e 100644 --- a/backend/src/plugins/Tags/util/renderTagFromString.ts +++ b/backend/src/plugins/Tags/util/renderTagFromString.ts @@ -2,10 +2,10 @@ import { GuildMember } from "discord.js"; import * as t from "io-ts"; import { GuildPluginData } from "knub"; import { parseArguments } from "knub-command-manager"; -import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { TemplateParseError } from "../../../templateFormatter"; -import { StrictMessageContent, stripObjectToScalars } from "../../../utils"; +import { StrictMessageContent } from "../../../utils"; import { LogsPlugin } from "../../Logs/LogsPlugin"; import { Tag, TagsPluginType } from "../types"; import { renderTagBody } from "./renderTagBody"; diff --git a/backend/src/plugins/Utility/commands/AboutCmd.ts b/backend/src/plugins/Utility/commands/AboutCmd.ts index dd788816..8c7d4db5 100644 --- a/backend/src/plugins/Utility/commands/AboutCmd.ts +++ b/backend/src/plugins/Utility/commands/AboutCmd.ts @@ -4,7 +4,7 @@ import LCL from "last-commit-log"; import moment from "moment-timezone"; import { rootDir } from "../../../paths"; import { getCurrentUptime } from "../../../uptime"; -import { EmbedWith, multiSorter, resolveMember, sorter } from "../../../utils"; +import { multiSorter, resolveMember, sorter } from "../../../utils"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { utilityCmd } from "../types"; diff --git a/backend/src/plugins/Utility/commands/CleanCmd.ts b/backend/src/plugins/Utility/commands/CleanCmd.ts index cfdaec88..e7778215 100644 --- a/backend/src/plugins/Utility/commands/CleanCmd.ts +++ b/backend/src/plugins/Utility/commands/CleanCmd.ts @@ -1,14 +1,14 @@ import { Message, Snowflake, TextChannel, User } from "discord.js"; import { GuildPluginData } from "knub"; import moment from "moment-timezone"; -import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects"; +import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { SavedMessage } from "../../../data/entities/SavedMessage"; import { LogType } from "../../../data/LogType"; import { ModActionsPlugin } from "../../../plugins/ModActions/ModActionsPlugin"; import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { allowTimeout } from "../../../RegExpRunner"; -import { DAYS, getInviteCodesInString, noop, SECONDS, stripObjectToScalars } from "../../../utils"; +import { DAYS, getInviteCodesInString, noop, SECONDS } from "../../../utils"; import { utilityCmd, UtilityPluginType } from "../types"; const MAX_CLEAN_COUNT = 150; diff --git a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts index 169da88e..8c20adc4 100644 --- a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts +++ b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts @@ -3,11 +3,10 @@ import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember, userToConfigAccessibleUser, -} from "src/utils/configAccessibleObjects"; +} from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { stripObjectToScalars } from "../../../utils"; import { utilityCmd } from "../types"; export const VcdisconnectCmd = utilityCmd({ diff --git a/backend/src/plugins/Utility/commands/VcmoveCmd.ts b/backend/src/plugins/Utility/commands/VcmoveCmd.ts index 76eb2161..adb56d96 100644 --- a/backend/src/plugins/Utility/commands/VcmoveCmd.ts +++ b/backend/src/plugins/Utility/commands/VcmoveCmd.ts @@ -3,11 +3,11 @@ import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember, userToConfigAccessibleUser, -} from "src/utils/configAccessibleObjects"; +} from "../../../utils/configAccessibleObjects"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { LogType } from "../../../data/LogType"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { channelMentionRegex, isSnowflake, simpleClosestStringMatch, stripObjectToScalars } from "../../../utils"; +import { channelMentionRegex, isSnowflake, simpleClosestStringMatch } from "../../../utils"; import { utilityCmd } from "../types"; export const VcmoveCmd = utilityCmd({ diff --git a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts index ce1bf066..852c3650 100644 --- a/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts +++ b/backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts @@ -3,7 +3,7 @@ import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember, userToConfigAccessibleUser, -} from "src/utils/configAccessibleObjects"; +} from "../../../utils/configAccessibleObjects"; import { LogType } from "../../../data/LogType"; import { renderTemplate, TemplateParseError } from "../../../templateFormatter"; import { createChunkedMessage, stripObjectToScalars } from "../../../utils"; diff --git a/backend/src/utils.ts b/backend/src/utils.ts index 5a22c12d..c4464f97 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -28,19 +28,19 @@ import { either } from "fp-ts/lib/Either"; import { unsafeCoerce } from "fp-ts/lib/function"; import fs from "fs"; import https from "https"; +import humanizeDuration from "humanize-duration"; import * as t from "io-ts"; +import { isEqual } from "lodash"; import moment from "moment-timezone"; import tlds from "tlds"; import tmp from "tmp"; import { URL } from "url"; import { SavedMessage } from "./data/entities/SavedMessage"; import { SimpleCache } from "./SimpleCache"; +import { ChannelTypeStrings } from "./types"; import { sendDM } from "./utils/sendDM"; import { waitForButtonConfirm } from "./utils/waitForInteraction"; import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils"; -import { isEqual } from "lodash"; -import humanizeDuration from "humanize-duration"; -import { ChannelTypeStrings } from "./types"; const fsp = fs.promises;