- Introduce shared MessageFetcher singleton for rate-limited message fetching.

- Add message caching and fetching logic to `DeletedMessagesListener`.
- Replace inlined message formatting with reusable `formatMessageForPaste` function.
- Integrate `upload` service to generate paste URLs for deleted messages.
- Consolidate starboard and moderation message fetching to rely on `DeletedMessagesListener`.

Author: Pdzly

src/modules/moderation/deletedMessages.listener.ts

@@ -1,14 +1,11 @@
 import * as Sentry from "@sentry/bun";
-import type { Message, Snowflake } from "discord.js";
+import type { Collection, Message, Snowflake, TextBasedChannel } from "discord.js";
 import ExpiryMap from "expiry-map";
 import { config } from "../../Config.js";
 import { logger } from "../../logging.js";
+import { messageFetcher } from "../../util/ratelimiting.js";
 import type { EventListener } from "../module.js";
-import {
-	type CachedMessage,
-	logBulkDeletedMessages,
-	logDeletedMessage,
-} from "./logs.js";
+import { type CachedMessage, logBulkDeletedMessages, logDeletedMessage } from "./logs.js";
 
 // Configurable TTL - default 24 hours
 const CACHE_TTL_MS =
@@ -47,7 +44,55 @@ function cacheMessage(message: Message): void {
 	});
 }
 
+function cacheMessages(messages: Collection<string, Message>): number {
+  for (const message of messages.values()) {
+    cacheMessage(message);
+  }
+  return messages.size;
+}
+
+async function fetchAndCacheMessages(
+  channel: TextBasedChannel,
+  limit: number
+): Promise<number> {
+  let cached = 0;
+  let before: Snowflake | undefined;
+
+  while (cached < limit) {
+    const batch = await channel.messages.fetch({
+      limit: Math.min(100, limit - cached),
+      before
+    });
+    if (batch.size === 0) break;
+
+    cached += cacheMessages(batch);
+    before = batch.last()?.id;
+
+    if (batch.size < 100) break;
+  }
+
+  return cached;
+}
+
 export const DeletedMessagesListener: EventListener = {
+  async clientReady(client) {
+    const guild = await client.guilds.fetch(config.guildId);
+    const channels = await guild.channels.fetch();
+
+    for (const channel of channels.values()) {
+      if (!channel?.isTextBased() || isExcludedChannel(channel.id)) continue;
+
+      await messageFetcher.addToQueue(async () => {
+        try {
+          const cached = await fetchAndCacheMessages(channel, 200);
+          logger.info(`Cached ${cached} messages from #${channel.name}`);
+        } catch {
+          // Skip channels we can't read (permissions)
+        }
+      });
+    }
+  },
+
 	messageCreate(_, message) {
 		if (!message.inGuild()) return;
 		cacheMessage(message);

src/modules/moderation/logs.ts

@@ -8,8 +8,10 @@ import {
 } from "discord.js";
 import { config } from "../../Config.js";
 import { logger } from "../../logging.js";
+import { createStandardEmbed } from "../../util/embeds.js";
 import { prettyPrintDuration } from "../../util/timespan.js";
 import { actualMention, fakeMention } from "../../util/users.js";
+import { upload } from "../pastify/pastify.js";
 
 export interface CachedMessage {
 	id: Snowflake;
@@ -164,6 +166,21 @@ export async function logModerationAction(
 	});
 }
 
+function formatMessageForPaste(message: CachedMessage): string {
+	const timestamp = new Date(message.createdTimestamp).toISOString();
+	const attachments =
+		message.attachmentUrls.length > 0
+			? `\nAttachments:\n${message.attachmentUrls.map((url) => `  - ${url}`).join("\n")}`
+			: "";
+
+	return `Author: ${message.authorTag} (${message.authorId})
+Created: ${timestamp}
+Message ID: ${message.id}
+
+Content:
+${message.content || "[No text content]"}${attachments}`;
+}
+
 export async function logDeletedMessage(
 	client: Client,
 	message: CachedMessage,
@@ -174,33 +191,21 @@ export async function logDeletedMessage(
 		return;
 	}
 
-	const contentDisplay =
-		message.content.slice(0, 1024) || "*[No text content]*";
+	const pasteContent = formatMessageForPaste(message);
+	const pasteUrl = await upload({ content: pasteContent });
 
-	const embed = new EmbedBuilder()
+	const embed = createStandardEmbed(message.authorId)
 		.setTitle("Message Deleted")
 		.setColor("Grey")
 		.setDescription(
 			`**Author**: <@${message.authorId}> (${message.authorTag})\n` +
 				`**Channel**: <#${message.channelId}>\n` +
 				`**Created**: <t:${Math.round(message.createdTimestamp / 1000)}:R>\n\n` +
-				`**Content**:\n${contentDisplay}`,
+				`**Content**: [View on Paste](${pasteUrl})`,
 		)
 		.setFooter({ text: `Message ID: ${message.id}` })
 		.setTimestamp();
 
-	if (message.attachmentUrls.length > 0) {
-		const attachmentList =
-			message.attachmentUrls.slice(0, 5).join("\n") +
-			(message.attachmentUrls.length > 5
-				? `\n... and ${message.attachmentUrls.length - 5} more`
-				: "");
-		embed.addFields({
-			name: "Attachments",
-			value: attachmentList,
-		});
-	}
-
 	await modLogChannel.send({ embeds: [embed] });
 }
 
@@ -218,29 +223,23 @@ export async function logBulkDeletedMessages(
 	// Sort by timestamp
 	messages.sort((a, b) => a.createdTimestamp - b.createdTimestamp);
 
-	// Build a summary - truncate if too many
-	const maxDisplayed = 10;
-	const displayed = messages.slice(0, maxDisplayed);
-	const remaining = messages.length - maxDisplayed;
-
-	let messageList = displayed
-		.map(
-			(m) =>
-				`**${m.authorTag}** (<t:${Math.round(m.createdTimestamp / 1000)}:t>): ${m.content.slice(0, 100) || "*[No text]*"}`,
-		)
+	// Format all messages for paste
+	const pasteContent = messages
+		.map((m, i) => {
+			const separator = i > 0 ? "\n" + "─".repeat(50) + "\n\n" : "";
+			return separator + formatMessageForPaste(m);
+		})
 		.join("\n");
 
-	if (remaining > 0) {
-		messageList += `\n... and ${remaining} more messages`;
-	}
+	const pasteUrl = await upload({ content: pasteContent });
 
 	const embed = new EmbedBuilder()
 		.setTitle("Bulk Messages Deleted")
 		.setColor("DarkGrey")
 		.setDescription(
 			`**Channel**: <#${channelId}>\n` +
 				`**Count**: ${messages.length} messages\n\n` +
-				`**Messages**:\n${messageList.slice(0, 2000)}`,
+				`**Messages**: [View on Paste](${pasteUrl})`,
 		)
 		.setTimestamp();
 

src/modules/starboard/starboard.listener.ts

@@ -11,7 +11,6 @@ import { config } from "../../Config.js";
 import { logger } from "../../logging.js";
 import { StarboardMessage } from "../../store/models/StarboardMessage.js";
 import { getMember } from "../../util/member.js";
-import { MessageFetcher } from "../../util/ratelimiting.js";
 import type { EventListener } from "../module.js";
 import {
 	createStarboardMessage,
@@ -79,8 +78,6 @@ export const debounceStarboardReaction = (
 	}, DEBOUNCE_DELAY);
 };
 
-const messageFetcher = new MessageFetcher();
-
 const getStarsFromEmbed: (embed: Embed) => number = (embed) => {
 	const field = embed.fields.find((field) => field.name === "Details:");
 	if (!field) return 0;
@@ -98,34 +95,7 @@ const isChannelBlacklisted = (channel: Channel): boolean => {
 
 export const StarboardListener: EventListener = {
 	async clientReady(client) {
-		for (const guild of client.guilds.cache.values()) {
-			try {
-				const channels = await guild.channels.fetch();
-				for (const channel of channels.values()) {
-					if (
-						channel?.isTextBased() &&
-						channel.id !== config.starboard.channel &&
-						!isChannelBlacklisted(channel)
-					) {
-						// Add to rate-limited queue
-						await messageFetcher.addToQueue(async () => {
-							try {
-								await channel.messages.fetch({ limit: 100 }); // 100 is the maximum allowed by Discord API
-								logger.info(`Fetched recent messages from #%s`, channel.name);
-							} catch (error) {
-								logger.error(
-									`Error fetching messages from #%s`,
-									channel.name,
-									error,
-								);
-							}
-						});
-					}
-				}
-			} catch (error) {
-				logger.error(`Error processing guild %s:`, guild.name, error);
-			}
-		}
+		// Message fetching handled by DeletedMessagesListener - messages will be in Discord.js cache
 		let isRunningStarboardCheck = false;
 		schedule.scheduleJob(
 			{

src/util/ratelimiting.ts

@@ -32,3 +32,6 @@ export class MessageFetcher {
 		this.processing = false;
 	}
 }
+
+/** Shared singleton instance for rate-limited message fetching */
+export const messageFetcher = new MessageFetcher();