[ChatGPT] Adds error handling if attachment is not an image

src/commands/utilities/chatgpt.ts

@@ -10,6 +10,7 @@ import {
   getBooleanArg,
   getRateLimiterFromEnv,
   parseInput,
+  throwIfNotImageAttachment,
 } from 'src/discord-utils';
 import { ENV_LIMITER_SPLIT_REGEX } from 'src/constants';
 
@@ -124,6 +125,7 @@ const run: CommandOrModalRunMethod = async interaction => {
   const guildId = interaction.guildId || '';
 
   const queryImage = attachment?.url;
+  throwIfNotImageAttachment(attachment);
 
   const content = await getChatGptResponse({
     query,

src/discord-utils.ts

@@ -1,4 +1,5 @@
 import {
+  Attachment,
   Message,
   User,
   PermissionResolvable,
@@ -1187,3 +1188,9 @@ export function getRateLimiterFromEnv(userKey: string, guildKey: string): RateLi
     } : undefined,
   });
 }
+
+export function throwIfNotImageAttachment(attachment: Attachment | undefined | null): void {
+  if (attachment && !(attachment.contentType && /^image\//.test(attachment.contentType))) {
+    throw new Error('Attachment must be an image.');
+  }
+}

src/events/dms.ts

@@ -2,12 +2,14 @@ import type { Message } from 'discord.js';
 import type { EventTrigger } from 'src/types';
 
 import { getChatGptResponse } from 'src/commands/utilities/chatgpt';
-import { chunkReplies, getErrorMsg } from 'src/discord-utils';
+import { chunkReplies, getErrorMsg, throwIfNotImageAttachment } from 'src/discord-utils';
 
 const NewDmEvent: EventTrigger = ['messageCreate', async (message: Message): Promise<void> => {
   if (!message.inGuild() && !message.author.bot) {
     if (!message.content) return;
     try {
+      const attachment = message.attachments?.at(0);
+      throwIfNotImageAttachment(attachment);
       const response = await getChatGptResponse({
         query: message.content,
         queryImage: message.attachments?.at(0)?.url,