Merge branch 'master' into feat/extended-image-download-opts

docs/api-reference/createtranscript.md

@@ -90,3 +90,11 @@ Defined in [discord.js](https://discord.js.org/#/docs/discord.js/main/typedef/Gu
 ### `options: CreateTranscriptOptions`
 
 The same options as [generatefrommessages.md](generatefrommessages.md 'mention') but adds the `limit` option which lets you limit set the number of messages to fetch.
+
+### `options.limit: number`
+
+The number of messages to fetch.
+
+### `options.filter: (message: Message<boolean>) => boolean`
+
+A function that will be called for each message to determine if it should be included in the transcript. If false, the message will not be included.

src/generator/renderers/reply.tsx

@@ -27,7 +27,7 @@ export default async function MessageReply({ message, context }: { message: Mess
       roleColor={referencedMessage.member?.displayHexColor ?? undefined}
       bot={!isCrosspost && referencedMessage.author.bot}
       verified={referencedMessage.author.flags?.has(UserFlags.VerifiedBot)}
-      op={message.channel.isThread() && referencedMessage.author.id === message.channel.ownerId}
+      op={message?.channel?.isThread?.() && referencedMessage.author.id === message?.channel?.ownerId}
       server={isCrosspost ?? undefined}
       command={isCommand}
     >

src/index.ts

@@ -111,7 +111,7 @@ export async function createTranscript<T extends ExportReturnType = ExportReturn
   // fetch messages
   let allMessages: Message[] = [];
   let lastMessageId: string | undefined;
-  const { limit } = options;
+  const { limit, filter } = options;
   const resolvedLimit = typeof limit === 'undefined' || limit === -1 ? Infinity : limit;
 
   // until there are no more messages, keep fetching
@@ -123,9 +123,11 @@ export async function createTranscript<T extends ExportReturnType = ExportReturn
 
     // fetch messages
     const messages = await channel.messages.fetch(fetchLimitOptions);
+    const filteredMessages = typeof filter === 'function' ? messages.filter(filter) : messages;
 
     // add the messages to the array
-    allMessages.push(...messages.values());
+    allMessages.push(...filteredMessages.values());
+    // Get the last key of 'messages', not 'filteredMessages' because you will be refetching the same messages
     lastMessageId = messages.lastKey();
 
     // if there are no more messages, break

src/types.ts

@@ -1,4 +1,4 @@
-import type { AttachmentBuilder } from 'discord.js';
+import type { AttachmentBuilder, Message } from 'discord.js';
 import type { RenderMessageContext } from './generator';
 
 export type AttachmentTypes = 'audio' | 'video' | 'image' | 'file';
@@ -72,5 +72,11 @@ export type CreateTranscriptOptions<T extends ExportReturnType> = Partial<
      * The max amount of messages to fetch. Use `-1` to recursively fetch.
      */
     limit: number;
+
+    /**
+     * Filter messages of the channel
+     * @default (() => true)
+     */
+    filter: (message: Message<boolean>) => boolean;
   }
 >;

tests/generate.ts

@@ -4,8 +4,10 @@ import { TranscriptImageDownloader, createTranscript } from '../src';
 import { config } from 'dotenv';
 config();
 
+const { GuildMessages, Guilds, MessageContent } = discord.GatewayIntentBits;
+
 const client = new discord.Client({
-  intents: [discord.IntentsBitField.Flags.GuildMessages, discord.IntentsBitField.Flags.Guilds],
+  intents: [GuildMessages, Guilds, MessageContent],
 });
 
 client.on('ready', async () => {
@@ -18,15 +20,11 @@ client.on('ready', async () => {
   }
 
   console.time('transcript');
+
   const attachment = await createTranscript(channel, {
-    // saveImages: true,
-    callbacks: {
-      resolveImageSrc: new TranscriptImageDownloader()
-        .withMaxSize(5120) // 5MB in KB
-        .withCompression(40, true) // 40% quality, convert to webp
-        .build(),
-    },
+    // options go here
   });
+
   console.timeEnd('transcript');
 
   await channel.send({