diff --git a/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts b/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts index cb7eb288..605a4e98 100644 --- a/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts +++ b/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts @@ -9,7 +9,7 @@ import { findRecentSpam } from "./findRecentSpam"; import { getMatchingMessageRecentActions } from "./getMatchingMessageRecentActions"; import { getMessageSpamIdentifier } from "./getSpamIdentifier"; -interface TMessageSpamMatchResultType { +export interface TMessageSpamMatchResultType { archiveId: string; } diff --git a/backend/src/plugins/Logs/LogsPlugin.ts b/backend/src/plugins/Logs/LogsPlugin.ts index 62a6de4d..3bb102d7 100644 --- a/backend/src/plugins/Logs/LogsPlugin.ts +++ b/backend/src/plugins/Logs/LogsPlugin.ts @@ -118,10 +118,7 @@ function getCasesPlugin(): Promise { const defaultOptions: PluginOptions = { config: { channels: {}, - format: { - timestamp: FORMAT_NO_TIMESTAMP, - ...DefaultLogMessages, - }, + format: DefaultLogMessages, ping_user: true, allow_user_mentions: false, timestamp_format: "[]", diff --git a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts index 2a2fd69c..bd9921c0 100644 --- a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts +++ b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogAutomodActionData { +export interface LogAutomodActionData { rule: string; user?: User | null; users: User[]; diff --git a/backend/src/plugins/Logs/logFunctions/logBotAlert.ts b/backend/src/plugins/Logs/logFunctions/logBotAlert.ts index 1438b249..372a7489 100644 --- a/backend/src/plugins/Logs/logFunctions/logBotAlert.ts +++ b/backend/src/plugins/Logs/logFunctions/logBotAlert.ts @@ -4,7 +4,7 @@ import { createTypedTemplateSafeValueContainer } from "../../../templateFormatte import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogBotAlertData { +export interface LogBotAlertData { body: string; } diff --git a/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts b/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts index d2fe96b9..dd144a72 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseCreate.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogCaseCreateData { +export interface LogCaseCreateData { mod: User; userId: string; caseNum: number; diff --git a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts index 8c701cc5..30034833 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseDelete.ts @@ -7,7 +7,7 @@ import { caseToTemplateSafeCase, memberToTemplateSafeMember } from "../../../uti import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogCaseDeleteData { +export interface LogCaseDeleteData { mod: GuildMember; case: Case; } diff --git a/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts b/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts index 4c8b8fd6..c6499aac 100644 --- a/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logCaseUpdate.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogCaseUpdateData { +export interface LogCaseUpdateData { mod: User; caseNumber: number; caseType: string; diff --git a/backend/src/plugins/Logs/logFunctions/logCensor.ts b/backend/src/plugins/Logs/logFunctions/logCensor.ts index c1853baf..e911a61e 100644 --- a/backend/src/plugins/Logs/logFunctions/logCensor.ts +++ b/backend/src/plugins/Logs/logFunctions/logCensor.ts @@ -14,7 +14,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogCensorData { +export interface LogCensorData { user: User | UnknownUser; channel: GuildTextBasedChannel; reason: string; diff --git a/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts b/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts index be8adf8c..04ab025e 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelCreate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogChannelCreateData { +export interface LogChannelCreateData { channel: GuildBasedChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts b/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts index 6078f311..1db174e2 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelDelete.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogChannelDeleteData { +export interface LogChannelDeleteData { channel: GuildBasedChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts b/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts index 2963520a..b05f26bb 100644 --- a/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logChannelUpdate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogChannelUpdateData { +export interface LogChannelUpdateData { oldChannel: GuildBasedChannel; newChannel: GuildBasedChannel; differenceString: string; diff --git a/backend/src/plugins/Logs/logFunctions/logClean.ts b/backend/src/plugins/Logs/logFunctions/logClean.ts index 2a156868..7e43f854 100644 --- a/backend/src/plugins/Logs/logFunctions/logClean.ts +++ b/backend/src/plugins/Logs/logFunctions/logClean.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../u import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogCleanData { +export interface LogCleanData { mod: User; channel: GuildTextBasedChannel; count: number; diff --git a/backend/src/plugins/Logs/logFunctions/logDmFailed.ts b/backend/src/plugins/Logs/logFunctions/logDmFailed.ts index 4b540624..d88ad515 100644 --- a/backend/src/plugins/Logs/logFunctions/logDmFailed.ts +++ b/backend/src/plugins/Logs/logFunctions/logDmFailed.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogDmFailedData { +export interface LogDmFailedData { source: string; user: User | UnknownUser; } diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts b/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts index 11c6c0d9..843232a0 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiCreate.ts @@ -6,7 +6,7 @@ import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogEmojiCreateData { +export interface LogEmojiCreateData { emoji: Emoji; } diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts b/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts index 4ef31c4e..6c08f2ee 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiDelete.ts @@ -6,7 +6,7 @@ import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogEmojiDeleteData { +export interface LogEmojiDeleteData { emoji: Emoji; } diff --git a/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts b/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts index 3d455530..3d307eae 100644 --- a/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logEmojiUpdate.ts @@ -6,7 +6,7 @@ import { emojiToTemplateSafeEmoji } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogEmojiUpdateData { +export interface LogEmojiUpdateData { oldEmoji: Emoji; newEmoji: Emoji; differenceString: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMassBan.ts b/backend/src/plugins/Logs/logFunctions/logMassBan.ts index 6f2695cc..ab19de5f 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassBan.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMassBanData { +export interface LogMassBanData { mod: User; count: number; reason: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMassMute.ts b/backend/src/plugins/Logs/logFunctions/logMassMute.ts index 74c8694b..06ca3ad8 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassMute.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMassMuteData { +export interface LogMassMuteData { mod: User; count: number; } diff --git a/backend/src/plugins/Logs/logFunctions/logMassUnban.ts b/backend/src/plugins/Logs/logFunctions/logMassUnban.ts index 59709bef..5bfdc0a3 100644 --- a/backend/src/plugins/Logs/logFunctions/logMassUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMassUnban.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMassUnbanData { +export interface LogMassUnbanData { mod: User; count: number; reason: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberBan.ts b/backend/src/plugins/Logs/logFunctions/logMemberBan.ts index cdeaec62..e4e2f5c8 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberBan.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberBanData { +export interface LogMemberBanData { mod: User | UnknownUser | null; user: User | UnknownUser; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts b/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts index dc47736c..f60c2b7b 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberForceban.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberForcebanData { +export interface LogMemberForcebanData { mod: GuildMember; userId: Snowflake; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts b/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts index 81771fbd..535721fb 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberJoin.ts @@ -8,7 +8,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberJoinData { +export interface LogMemberJoinData { member: GuildMember; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts b/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts index 01cbd81f..8a4eaf64 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberJoinWithPriorRecords.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberJoinWithPriorRecordsData { +export interface LogMemberJoinWithPriorRecordsData { member: GuildMember; recentCaseSummary: string; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberKick.ts b/backend/src/plugins/Logs/logFunctions/logMemberKick.ts index e60f1124..8f080cf8 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberKick.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberKick.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberKickData { +export interface LogMemberKickData { mod: User | UnknownUser | null; user: User; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts b/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts index 8753b68b..334360b4 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberLeave.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberLeaveData { +export interface LogMemberLeaveData { member: GuildMember | PartialGuildMember; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMute.ts b/backend/src/plugins/Logs/logFunctions/logMemberMute.ts index 76e7f352..202b3cdb 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMute.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberMuteData { +export interface LogMemberMuteData { mod: User | UnknownUser; user: User | UnknownUser; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts b/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts index 24e52aba..3f3da5c6 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMuteExpired.ts @@ -11,7 +11,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberMuteExpiredData { +export interface LogMemberMuteExpiredData { member: GuildMember | UnknownUser; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts b/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts index 455a13d8..dfa26e24 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberMuteRejoin.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberMuteRejoinData { +export interface LogMemberMuteRejoinData { member: GuildMember; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts b/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts index 437dfa02..df42a503 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberNickChange.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberNickChangeData { +export interface LogMemberNickChangeData { member: GuildMember; oldNick: string; newNick: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberNote.ts b/backend/src/plugins/Logs/logFunctions/logMemberNote.ts index c81ccb7a..28c35816 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberNote.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberNote.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberNoteData { +export interface LogMemberNoteData { mod: User; user: User | UnknownUser; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts b/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts index b93b5558..28d83d88 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRestore.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberRestoreData { +export interface LogMemberRestoreData { member: GuildMember; restoredData: string; } diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts index bb6255df..6c3fcd90 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleAdd.ts @@ -7,7 +7,7 @@ import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../uti import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberRoleAddData { +export interface LogMemberRoleAddData { mod: User | null; member: GuildMember; roles: Array; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts index f548fe2d..98c783c0 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleChanges.ts @@ -7,7 +7,7 @@ import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../uti import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberRoleChangesData { +export interface LogMemberRoleChangesData { mod: User | UnknownUser | null; member: GuildMember; addedRoles: Role[]; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts b/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts index 4e620eec..431b1cd5 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberRoleRemove.ts @@ -7,7 +7,7 @@ import { memberToTemplateSafeMember, userToTemplateSafeUser } from "../../../uti import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberRoleRemoveData { +export interface LogMemberRoleRemoveData { mod: User | null; member: GuildMember; roles: Array; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts index ecc1d2a2..cf697a58 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberTimedBanData { +export interface LogMemberTimedBanData { mod: User | UnknownUser; user: User | UnknownUser; banTime: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts index 4ef04bed..66a71d79 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberTimedMuteData { +export interface LogMemberTimedMuteData { mod: User | UnknownUser; user: User | UnknownUser; time: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts index ada44504..c56632b4 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnban.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberTimedUnbanData { +export interface LogMemberTimedUnbanData { mod: User | UnknownUser; userId: string; banTime: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts index ce036761..3020fd69 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberTimedUnmute.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberTimedUnmuteData { +export interface LogMemberTimedUnmuteData { mod: User; user: User | UnknownUser; time: string; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts b/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts index 305bbada..e8438649 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberUnban.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberUnbanData { +export interface LogMemberUnbanData { mod: User | UnknownUser | null; userId: Snowflake; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts b/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts index 5afbf075..b444373c 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberUnmute.ts @@ -7,7 +7,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberUnmuteData { +export interface LogMemberUnmuteData { mod: User; user: User | UnknownUser; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts index 8cdc533b..e7ba09da 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMemberWarnData { +export interface LogMemberWarnData { mod: GuildMember; member: GuildMember; caseNumber: number; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts index b56f7410..b1e6f58b 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDelete.ts @@ -15,7 +15,7 @@ import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageDeleteData { +export interface LogMessageDeleteData { user: User | UnknownUser; channel: GuildTextBasedChannel; message: SavedMessage; @@ -31,10 +31,7 @@ export function logMessageDelete(pluginData: GuildPluginData, da // See comment on FORMAT_NO_TIMESTAMP in types.ts const config = pluginData.config.get(); - const timestampFormat = - (config.format.timestamp !== FORMAT_NO_TIMESTAMP ? config.format.timestamp : null) ?? - config.timestamp_format ?? - undefined; + const timestampFormat = config.timestamp_format ?? undefined; return log( pluginData, diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts index 1b2b1fe3..b84a1f55 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteAuto.ts @@ -13,7 +13,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageDeleteAutoData { +export interface LogMessageDeleteAutoData { message: SavedMessage; user: User | UnknownUser; channel: GuildBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts index 8e1787ab..a0d9143e 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBare.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageDeleteBareData { +export interface LogMessageDeleteBareData { messageId: string; channel: GuildTextBasedChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts index 46ca1648..35456c2f 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageDeleteBulk.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageDeleteBulkData { +export interface LogMessageDeleteBulkData { count: number; authorIds: string[]; channel: GuildTextBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts index 6e31605d..8bef8f55 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageEdit.ts @@ -13,7 +13,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageEditData { +export interface LogMessageEditData { user: User | UnknownUser; channel: GuildTextBasedChannel; before: SavedMessage; diff --git a/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts b/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts index 5a79e5ab..0fa55ff5 100644 --- a/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts +++ b/backend/src/plugins/Logs/logFunctions/logMessageSpamDetected.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../ import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogMessageSpamDetectedData { +export interface LogMessageSpamDetectedData { member: GuildMember; channel: GuildTextBasedChannel; description: string; diff --git a/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts b/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts index 9cbd8b25..67171cee 100644 --- a/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts +++ b/backend/src/plugins/Logs/logFunctions/logOtherSpamDetected.ts @@ -6,7 +6,7 @@ import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogOtherSpamDetectedData { +export interface LogOtherSpamDetectedData { member: GuildMember; description: string; limit: number; diff --git a/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts b/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts index e92d0292..dca4c8bf 100644 --- a/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logPostedScheduledMessage.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../u import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogPostedScheduledMessageData { +export interface LogPostedScheduledMessageData { author: User; channel: GuildTextBasedChannel; messageId: string; diff --git a/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts b/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts index 227ca7f7..c20227a6 100644 --- a/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../u import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogRepeatedMessageData { +export interface LogRepeatedMessageData { author: User; channel: GuildTextBasedChannel; datetime: string; diff --git a/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts b/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts index 9bb177d6..7ceb4be7 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleCreate.ts @@ -6,7 +6,7 @@ import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogRoleCreateData { +export interface LogRoleCreateData { role: Role; } diff --git a/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts b/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts index 0ec6e87a..a4e6e448 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleDelete.ts @@ -6,7 +6,7 @@ import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogRoleDeleteData { +export interface LogRoleDeleteData { role: Role; } diff --git a/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts b/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts index caf8b0c5..7fe118b5 100644 --- a/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logRoleUpdate.ts @@ -6,7 +6,7 @@ import { roleToTemplateSafeRole } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogRoleUpdateData { +export interface LogRoleUpdateData { oldRole: Role; newRole: Role; differenceString: string; diff --git a/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts b/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts index 098b7918..4499ccb6 100644 --- a/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../u import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogScheduledMessageData { +export interface LogScheduledMessageData { author: User; channel: GuildTextBasedChannel; datetime: string; diff --git a/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts b/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts index dc4c4200..d94be7b9 100644 --- a/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts +++ b/backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../u import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogScheduledRepeatedMessageData { +export interface LogScheduledRepeatedMessageData { author: User; channel: GuildTextBasedChannel; datetime: string; diff --git a/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts b/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts index 6c841eeb..1175d23c 100644 --- a/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts +++ b/backend/src/plugins/Logs/logFunctions/logSetAntiraidAuto.ts @@ -4,7 +4,7 @@ import { createTypedTemplateSafeValueContainer } from "../../../templateFormatte import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogSetAntiraidAutoData { +export interface LogSetAntiraidAutoData { level: string; } diff --git a/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts b/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts index 7d43423b..cc42d701 100644 --- a/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts +++ b/backend/src/plugins/Logs/logFunctions/logSetAntiraidUser.ts @@ -6,7 +6,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogSetAntiraidUserData { +export interface LogSetAntiraidUserData { level: string; user: User; } diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts index 31d900c4..162d24b6 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceCreate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../.. import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStageInstanceCreateData { +export interface LogStageInstanceCreateData { stageInstance: StageInstance; stageChannel: StageChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts index ff69b13f..b87de4cd 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceDelete.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../.. import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStageInstanceDeleteData { +export interface LogStageInstanceDeleteData { stageInstance: StageInstance; stageChannel: StageChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts b/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts index be53b598..6013311f 100644 --- a/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStageInstanceUpdate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, stageToTemplateSafeStage } from "../../.. import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStageInstanceUpdateData { +export interface LogStageInstanceUpdateData { oldStageInstance: StageInstance | null; newStageInstance: StageInstance; stageChannel: StageChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts b/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts index 6c715235..2ec980b5 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerCreate.ts @@ -6,7 +6,7 @@ import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStickerCreateData { +export interface LogStickerCreateData { sticker: Sticker; } diff --git a/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts b/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts index 99c4532f..630ab54d 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerDelete.ts @@ -6,7 +6,7 @@ import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStickerDeleteData { +export interface LogStickerDeleteData { sticker: Sticker; } diff --git a/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts b/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts index e1e2e727..421f0d37 100644 --- a/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logStickerUpdate.ts @@ -6,7 +6,7 @@ import { stickerToTemplateSafeSticker } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogStickerUpdateData { +export interface LogStickerUpdateData { oldSticker: Sticker; newSticker: Sticker; differenceString: string; diff --git a/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts b/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts index 62f9a47c..4b061dfe 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadCreate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogThreadCreateData { +export interface LogThreadCreateData { thread: AnyThreadChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts b/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts index 52dd4908..faf23dec 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadDelete.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogThreadDeleteData { +export interface LogThreadDeleteData { thread: AnyThreadChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts b/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts index f73bab5d..2c759177 100644 --- a/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts +++ b/backend/src/plugins/Logs/logFunctions/logThreadUpdate.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel } from "../../../utils/templateSafeObjects import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogThreadUpdateData { +export interface LogThreadUpdateData { oldThread: AnyThreadChannel; newThread: AnyThreadChannel; differenceString: string; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts index 79efc844..075e4ac2 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceDisconnect.ts @@ -11,7 +11,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogVoiceChannelForceDisconnectData { +export interface LogVoiceChannelForceDisconnectData { mod: User; member: GuildMember; oldChannel: VoiceBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts index 70978304..13ef2adb 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelForceMove.ts @@ -11,7 +11,7 @@ import { import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogVoiceChannelForceMoveData { +export interface LogVoiceChannelForceMoveData { mod: User; member: GuildMember; oldChannel: VoiceBasedChannel; diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts index f91cf4a2..a78a2f75 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelJoin.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../ import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogVoiceChannelJoinData { +export interface LogVoiceChannelJoinData { member: GuildMember; channel: VoiceBasedChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts index 99b35155..059962e9 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelLeave.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../ import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogVoiceChannelLeaveData { +export interface LogVoiceChannelLeaveData { member: GuildMember; channel: VoiceBasedChannel; } diff --git a/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts b/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts index 679c66d3..54026cfe 100644 --- a/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts +++ b/backend/src/plugins/Logs/logFunctions/logVoiceChannelMove.ts @@ -7,7 +7,7 @@ import { channelToTemplateSafeChannel, memberToTemplateSafeMember } from "../../ import { LogsPluginType } from "../types"; import { log } from "../util/log"; -interface LogVoiceChannelMoveData { +export interface LogVoiceChannelMoveData { member: GuildMember; oldChannel: VoiceBasedChannel; newChannel: VoiceBasedChannel; diff --git a/backend/src/plugins/Logs/types.ts b/backend/src/plugins/Logs/types.ts index 47557514..8f49afc2 100644 --- a/backend/src/plugins/Logs/types.ts +++ b/backend/src/plugins/Logs/types.ts @@ -26,16 +26,9 @@ const DEFAULT_BATCH_TIME = 1000; const MIN_BATCH_TIME = 250; const MAX_BATCH_TIME = 5000; -type ZLogFormatsHelper = { - -readonly [K in keyof typeof LogType]: typeof zMessageContent; -}; -export const zLogFormats = z.strictObject( - keys(LogType).reduce((map, logType) => { - map[logType] = zMessageContent; - return map; - }, {} as ZLogFormatsHelper), -); -export type TLogFormats = z.infer; +// A bit of a workaround so we can pass LogType keys to z.enum() +const logTypes = Object.keys(LogType) as [keyof typeof LogType, ...Array]; +const zLogFormats = z.record(z.enum(logTypes), zMessageContent); const zLogChannel = z.strictObject({ include: z.array(zBoundedCharacters(1, 255)).default([]), @@ -49,7 +42,7 @@ const zLogChannel = z.strictObject({ excluded_threads: z.array(zSnowflake).nullable().default(null), exclude_bots: z.boolean().default(false), excluded_roles: z.array(zSnowflake).nullable().default(null), - format: zLogFormats.partial().default({}), + format: zLogFormats.default({}), timestamp_format: z.string().nullable().default(null), include_embed_timestamp: z.boolean().nullable().default(null), }); @@ -60,12 +53,7 @@ export type TLogChannelMap = z.infer; export const zLogsConfig = z.strictObject({ channels: zLogChannelMap, - format: zLogFormats.merge( - z.strictObject({ - // Legacy/deprecated, use timestamp_format below instead - timestamp: zBoundedCharacters(0, 64).nullable(), - }), - ), + format: zLogFormats, // Legacy/deprecated, if below is false mentions wont actually ping. In case you really want the old behavior, set below to true ping_user: z.boolean(), allow_user_mentions: z.boolean(), diff --git a/backend/src/plugins/Logs/util/getLogMessage.ts b/backend/src/plugins/Logs/util/getLogMessage.ts index 4887cb82..2109f215 100644 --- a/backend/src/plugins/Logs/util/getLogMessage.ts +++ b/backend/src/plugins/Logs/util/getLogMessage.ts @@ -38,10 +38,7 @@ export async function getLogMessage( if (format === "" || format == null) return null; // See comment on FORMAT_NO_TIMESTAMP in types.ts - const timestampFormat = - opts?.timestamp_format ?? - (config.format.timestamp !== FORMAT_NO_TIMESTAMP ? config.format.timestamp : null) ?? - config.timestamp_format; + const timestampFormat = opts?.timestamp_format ?? config.timestamp_format; const includeEmbedTimestamp = opts?.include_embed_timestamp ?? config.include_embed_timestamp; diff --git a/backend/src/plugins/Spam/types.ts b/backend/src/plugins/Spam/types.ts index f71e4180..7017b113 100644 --- a/backend/src/plugins/Spam/types.ts +++ b/backend/src/plugins/Spam/types.ts @@ -42,7 +42,7 @@ export enum RecentActionType { VoiceChannelMove, } -interface IRecentAction { +export interface IRecentAction { type: RecentActionType; userId: string; actionGroupId: string; diff --git a/backend/src/utils.ts b/backend/src/utils.ts index 174a720f..ca0503e4 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -285,9 +285,9 @@ export type StrictMessageContent = { embeds?: APIEmbed[]; }; -export const zMessageContent = z.union([zBoundedCharacters(0, 4000), zStrictMessageContent]); - export type MessageContent = string | StrictMessageContent; +export const zMessageContent = z.union([zBoundedCharacters(0, 4000), zStrictMessageContent]) as z.ZodType; + export function validateAndParseMessageContent(input: unknown): StrictMessageContent { if (input == null) {