From 78caaa152e6350dbe6e421634528d60df2a90321 Mon Sep 17 00:00:00 2001 From: Yande Date: Sat, 11 May 2024 21:51:59 -0400 Subject: [PATCH 1/5] Update messages.ts --- modules/logging/messages.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index a023c27c7..9287d4a3f 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -8,6 +8,8 @@ import { type MessageReaction, type PartialMessage, type Snowflake, + AuditLogEvent, + time, } from "discord.js"; import config from "../../common/config.js"; import { databaseThread } from "../../common/database.js"; @@ -32,16 +34,17 @@ export async function messageDelete(message: Message | PartialMessage): Promise< const content = !shush && messageToText(message, false); const { embeds, files } = shush ? { embeds: [], files: [] } : extractMessageExtremities(message); - + const auditLogs = await config.guild + .fetchAuditLogs({ limit: 1, type: AuditLogEvent.MessageDelete }) + .catch(() => void 0); await log( `${LoggingEmojis.MessageDelete} ${message.partial ? "Unknown message" : "Message"}${ message.author ? ` by ${message.author.toString()}` : "" - } in ${message.channel.toString()} (ID: ${message.id}) deleted`, + } in ${message.url} (Sent: ${time(Math.floor(message.createdTimestamp / 1000))}) deleted ${auditLogs ? `by ${auditLogs.entries.first()?.executor?.toString()}` : ""}`, LogSeverity.ContentEdit, { embeds, buttons: [ - { label: "Context", url: message.url }, ...(message.reference?.messageId ? [ { @@ -206,4 +209,4 @@ export async function messageUpdate( ); } } -} +} \ No newline at end of file From 9efb4ee1ef81a957229fb6b8966e9cdd7f8028d2 Mon Sep 17 00:00:00 2001 From: TheYande Date: Sun, 12 May 2024 01:52:29 +0000 Subject: [PATCH 2/5] Format --- modules/logging/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index 9287d4a3f..386a19a46 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -209,4 +209,4 @@ export async function messageUpdate( ); } } -} \ No newline at end of file +} From 858477aaceb4d7197252db035bb900862fd4d4ed Mon Sep 17 00:00:00 2001 From: Yande Date: Sat, 11 May 2024 21:58:11 -0400 Subject: [PATCH 3/5] lint shut up --- modules/logging/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index 9287d4a3f..c00567dbb 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -40,7 +40,7 @@ export async function messageDelete(message: Message | PartialMessage): Promise< await log( `${LoggingEmojis.MessageDelete} ${message.partial ? "Unknown message" : "Message"}${ message.author ? ` by ${message.author.toString()}` : "" - } in ${message.url} (Sent: ${time(Math.floor(message.createdTimestamp / 1000))}) deleted ${auditLogs ? `by ${auditLogs.entries.first()?.executor?.toString()}` : ""}`, + } in ${message.url} (Sent: ${time(Math.floor(message.createdTimestamp / 1000))}) deleted ${auditLogs?.entries.first()?.executor ? `by ${auditLogs.entries.first()?.executor?.toString()}` : ""}`, LogSeverity.ContentEdit, { embeds, From ee9deaa6f73d28afa6471a6a39e9854800e8a9c2 Mon Sep 17 00:00:00 2001 From: Yande Date: Sat, 11 May 2024 23:11:52 -0400 Subject: [PATCH 4/5] Update messages.ts --- modules/logging/messages.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index c07c2ad03..f462c544d 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -37,10 +37,11 @@ export async function messageDelete(message: Message | PartialMessage): Promise< const auditLogs = await config.guild .fetchAuditLogs({ limit: 1, type: AuditLogEvent.MessageDelete }) .catch(() => void 0); + const executor = auditLogs?.entries.first()?.executor await log( `${LoggingEmojis.MessageDelete} ${message.partial ? "Unknown message" : "Message"}${ message.author ? ` by ${message.author.toString()}` : "" - } in ${message.url} (Sent: ${time(Math.floor(message.createdTimestamp / 1000))}) deleted ${auditLogs?.entries.first()?.executor ? `by ${auditLogs.entries.first()?.executor?.toString()}` : ""}`, + } in ${message.url} (Sent: ${time(message.createdAt)}) deleted ${executor ? `by ${executor.toString()}` : ""}`, LogSeverity.ContentEdit, { embeds, From 691e7fbfe27ac8e813c4917005d0355360d0f553 Mon Sep 17 00:00:00 2001 From: TheYande Date: Sun, 12 May 2024 03:12:16 +0000 Subject: [PATCH 5/5] Format --- modules/logging/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index f462c544d..ebc14ee26 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -37,7 +37,7 @@ export async function messageDelete(message: Message | PartialMessage): Promise< const auditLogs = await config.guild .fetchAuditLogs({ limit: 1, type: AuditLogEvent.MessageDelete }) .catch(() => void 0); - const executor = auditLogs?.entries.first()?.executor + const executor = auditLogs?.entries.first()?.executor; await log( `${LoggingEmojis.MessageDelete} ${message.partial ? "Unknown message" : "Message"}${ message.author ? ` by ${message.author.toString()}` : ""