link replies and pins in modlog instead of including the link

Signed-off-by: RedGuy12 <paul@reid-family.org>
scratchaddons-community · Aug 7, 2023 · 8fdaebd · 8fdaebd
1 parent 60886ba
commit 8fdaebd
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 59 deletions.
diff --git a/modules/bot/edit.ts b/modules/bot/edit.ts
@@ -152,7 +152,7 @@ export async function submitEdit(interaction: ModalSubmitInteraction, id?: strin
 			}) edited by ${interaction.user.toString()}`,
 			"messages",
 			{
-				button: { label: "Message", url: edited.url },
+				buttons: [{ label: "Message", url: edited.url }],
 				files: shouldLog(edited.channel) ? files : [],
 			},
 		);

diff --git a/modules/bot/say.ts b/modules/bot/say.ts
@@ -175,7 +175,7 @@ export async function say(
 				message.id
 			})`,
 			"messages",
-			{ button: { label: "Message", url: message.url } },
+			{ buttons: [{ label: "Message", url: message.url }] },
 		);
 		await interaction.editReply(`${constants.emojis.statuses.yes} Message sent!`);
 	}

diff --git a/modules/logging/index.ts b/modules/logging/index.ts
@@ -142,12 +142,14 @@ const events: {
 						)}’s permissions changed${extraAuditLogsInfo(entry)}`,
 						"server",
 						{
-							button: {
-								label: "Permissions",
-								url:
-									"https://discordlookup.com/permissions-calculator/" +
-									change.new,
-							},
+							buttons: [
+								{
+									label: "Permissions",
+									url:
+										"https://discordlookup.com/permissions-calculator/" +
+										change.new,
+								},
+							],
 						},
 					);
 					break;

diff --git a/modules/logging/message.ts b/modules/logging/message.ts
@@ -26,7 +26,7 @@ export async function messageDelete(message: Message<boolean> | PartialMessage)
 		(config.channels.modlogs?.id === getBaseChannel(message.channel)?.id &&
 			databaseThread.id !== message.channel.id);
 
-	const content = !shush && (await messageToText(message));
+	const content = !shush && (messageToText(message, false));
 	const { embeds, files } = shush
 		? { embeds: [], files: [] }
 		: extractMessageExtremities(message);
@@ -38,7 +38,17 @@ export async function messageDelete(message: Message<boolean> | PartialMessage)
 		"messages",
 		{
 			embeds,
-			button: { label: "Context", url: message.url },
+			buttons: [
+				{ label: "Context", url: message.url },
+				...(message.reference
+					? [
+							{
+								label: "Referenced Message",
+								url: `https://discord.com/${message.reference.guildId}/${message.reference.channelId}/${message.reference.messageId}`,
+							},
+					  ]
+					: []),
+			],
 
 			files: content
 				? [{ content, extension: "md" }, ...files.map((file) => file.url)]
@@ -74,7 +84,7 @@ export async function messageDeleteBulk(
 		"messages",
 		{
 			files: [{ content: messagesInfo, extension: "md" }],
-			button: { label: "Context", url: messages.first()?.url ?? "" },
+			buttons: [{ label: "Context", url: messages.first()?.url ?? "" }],
 		},
 	);
 }
@@ -105,7 +115,7 @@ export async function messageReactionRemoveAll(
 				},
 			],
 
-			button: { label: "Context", url: message.url },
+			buttons: [{ label: "Context", url: message.url }],
 		},
 	);
 }
@@ -124,7 +134,7 @@ export async function messageUpdate(
 				newMessage.id
 			}) ${newMessage.flags.has("Crossposted") ? "" : "un"}published`,
 			"messages",
-			{ button: { label: "Message", url: newMessage.url } },
+			{ buttons: [{ label: "Message", url: newMessage.url }] },
 		);
 	}
 	if (oldMessage.flags.has("SuppressEmbeds") !== newMessage.flags.has("SuppressEmbeds")) {
@@ -135,7 +145,7 @@ export async function messageUpdate(
 				newMessage.id
 			})`,
 			"messages",
-			{ button: { label: "Message", url: newMessage.url }, embeds: oldMessage.embeds },
+			{ buttons: [{ label: "Message", url: newMessage.url }], embeds: oldMessage.embeds },
 		);
 	}
 
@@ -147,7 +157,7 @@ export async function messageUpdate(
 				newMessage.id
 			}) ${newMessage.pinned ? "" : "un"}pinned`,
 			"messages",
-			{ button: { label: "Message", url: newMessage.url } },
+			{ buttons: [{ label: "Message", url: newMessage.url }] },
 		);
 	}
 
@@ -185,7 +195,7 @@ export async function messageUpdate(
 					newMessage.id
 				}) edited`,
 				"messages",
-				{ button: { label: "Message", url: newMessage.url }, files },
+				{ buttons: [{ label: "Message", url: newMessage.url }], files },
 			);
 		}
 	}

diff --git a/modules/logging/misc.ts b/modules/logging/misc.ts
@@ -37,7 +37,7 @@ export default async function log(
 	extra: {
 		embeds?: (Embed | APIEmbed)[];
 		files?: (string | { extension?: string; content: string })[];
-		button?: { label: string; url: string };
+		buttons?: { label: string; url: string }[];
 	} = {},
 ) {
 	const thread = await getLoggingThread(group);
@@ -68,16 +68,13 @@ export default async function log(
 				: ""),
 		allowedMentions: { users: [] },
 		embeds: extra.embeds,
-		components: extra.button && [
+		components: extra.buttons && [
 			{
-				components: [
-					{
-						label: extra.button.label,
-						style: ButtonStyle.Link,
-						type: ComponentType.Button,
-						url: extra.button.url,
-					},
-				],
+				components: extra.buttons.map((button) => ({
+					...button,
+					style: ButtonStyle.Link,
+					type: ComponentType.Button,
+				})),
 				type: ComponentType.ActionRow,
 			},
 		],

diff --git a/util/discord.ts b/util/discord.ts
@@ -199,7 +199,9 @@ export async function getAllMessages(channel: TextBasedChannel): Promise<Message
  *
  * @returns Text representation of the message.
  */
-export async function messageToText(message: Message, replies = true): Promise<string> {
+export function messageToText(message: Message, replies: false): string;
+export async function messageToText(message: Message, replies?: true): Promise<string>;
+export function messageToText(message: Message, replies = true): Awaitable<string> {
 	const actualContent = message.flags.has("Loading")
 		? (Date.now() - Number(message.createdAt)) / 1000 / 60 > 15
 			? `${constants.emojis.discord.error} The application did not respond`
@@ -241,13 +243,17 @@ export async function messageToText(message: Message, replies = true): Promise<s
 		}
 
 		case MessageType.ChannelPinnedMessage: {
-			const pinned = await message.fetchReference().catch(() => message);
+			if (!replies)
+				return `${
+					constants.emojis.discord.pin
+				} ${message.author.toString()} pinned **a message** to this channel. See all **pinned messages**.`;
 
 			return `${
 				constants.emojis.discord.pin
-			} ${message.author.toString()} pinned [a message](${
-				pinned.url
-			}) to this channel. See all [pinned messages](${pinned.channel.url}).`;
+			} ${message.author.toString()} pinned [a message](${message.url.replace(
+				message.id,
+				message.reference?.messageId || "",
+			)}) to this channel. See all [pinned messages](${message.channel.url}).`;
 		}
 
 		case MessageType.UserJoin: {
@@ -344,25 +350,33 @@ export async function messageToText(message: Message, replies = true): Promise<s
 
 		case MessageType.Reply: {
 			if (!replies) return message.content;
-			const repliedMessage = await message.fetchReference().catch(() => {});
-
-			if (!repliedMessage)
-				return `*${constants.emojis.discord.reply} Original message was deleted*\n\n${message.content}`;
-
-			const cleanContent = await messageToText(repliedMessage, false);
-
-			return `*[Replying to](${repliedMessage.url}) ${repliedMessage.author.toString()}${
-				cleanContent ? `:*\n> ${truncateText(stripMarkdown(cleanContent), 300)}` : "*"
-			}\n\n${message.content}`;
+			return message
+				.fetchReference()
+				.catch(() => {})
+				.then(async (reply) => {
+					if (!reply)
+						return `*${constants.emojis.discord.reply} Original message was deleted*\n\n${message.content}`;
+
+					const cleanContent = messageToText(reply, false);
+					return `*[Replying to](${reply.url}) ${reply.author.toString()}${
+						cleanContent
+							? `:*\n> ${truncateText(stripMarkdown(cleanContent), 300)}`
+							: "*"
+					}\n\n${message.content}`;
+				});
 		}
 
 		case MessageType.ThreadStarterMessage: {
-			const reference = await message.fetchReference().catch(() => {});
-
-			// The resolved message for the reference will be a Message
-			return reference
-				? (await messageToText(reference, replies)) || actualContent
-				: `${constants.emojis.discord.thread} Sorry, we couldn't load the first message in this thread`;
+			if (!replies) return actualContent;
+			return message
+				.fetchReference()
+				.catch(() => {})
+				.then((reference) =>
+					// The resolved message for the reference will be a Message
+					reference
+						? messageToText(reference, replies) || actualContent
+						: `${constants.emojis.discord.thread} Sorry, we couldn't load the first message in this thread`,
+				);
 		}
 
 		case MessageType.GuildInviteReminder: {
@@ -421,18 +435,20 @@ export async function messageToText(message: Message, replies = true): Promise<s
 			if (!replies) return actualContent;
 
 			const commandName = message.interaction?.commandName.split(" ")[0];
-			const command = (await config.guild.commands.fetch()).find(
-				({ name }) => name === commandName,
-			);
-
-			return `*${message.interaction?.user.toString() ?? ""} used ${
-				command
-					? chatInputApplicationCommandMention(
-							message.interaction?.commandName ?? "",
-							command.id ?? "",
-					  )
-					: bold(`/${message.interaction?.commandName ?? ""}`)
-			}:*\n${actualContent}`;
+			return config.guild.commands
+				.fetch()
+				.then((commands) => commands.find(({ name }) => name === commandName))
+				.then(
+					(command) =>
+						`*${message.interaction?.user.toString() ?? ""} used ${
+							command
+								? chatInputApplicationCommandMention(
+										message.interaction?.commandName ?? "",
+										command.id ?? "",
+								  )
+								: bold(`/${message.interaction?.commandName ?? ""}`)
+						}:*\n${actualContent}`,
+				);
 		}
 
 		case MessageType.Call: {