Update GeminiAssistance.ts

LucasB25 · Jun 13, 2024 · 914bff9 · 914bff9
1 parent 3147836
commit 914bff9
Showing 1 changed file with 56 additions and 84 deletions.
diff --git a/src/events/Ai/GeminiAssistance.ts b/src/events/Ai/GeminiAssistance.ts
@@ -1,5 +1,5 @@
 import { GoogleGenerativeAI, HarmBlockThreshold, HarmCategory } from '@google/generative-ai';
-import { ChannelType, type Message, TextChannel } from 'discord.js';
+import { ChannelType, type Message, TextChannel, ThreadAutoArchiveDuration } from 'discord.js';
 
 import { type Bot, Event } from '../../structures/index.js';
 
@@ -20,90 +20,62 @@ export default class MessageCreate extends Event {
     }
 
     public async run(message: Message): Promise<void> {
-        if (message.channel instanceof TextChannel) {
-            const botMentioned = message.mentions.has(this.client.user);
-
-            if (botMentioned && /[.!?]$/.test(message.content)) {
-                const cleanContent = removeBotMention(message.content, this.client.user.id);
-                const threadName = truncateText(cleanContent, 100);
-
-                const existingThread = message.guild?.channels.cache.find(
-                    (channel) => channel.name === threadName && channel.type === ChannelType.PublicThread,
-                );
-
-                if (existingThread) {
-                    message.reply(`The information you are looking for is in the existing thread: ${existingThread}`);
-                } else {
-                    try {
-                        const thread = await message.startThread({
-                            name: threadName,
-                            autoArchiveDuration: 60,
-                        });
-
-                        const genAI = new GoogleGenerativeAI(this.client.config.geminiKey);
-                        const model = genAI.getGenerativeModel({
-                            model: this.client.config.geminiModel,
-                            generationConfig: {
-                                maxOutputTokens: 1900,
-                                temperature: 0.9,
-                                topK: 1,
-                                topP: 1,
-                            },
-                            safety_settings: [
-                                {
-                                    category: HarmCategory.HARM_CATEGORY_HARASSMENT,
-                                    threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                                },
-                                {
-                                    category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
-                                    threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                                },
-                                {
-                                    category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
-                                    threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                                },
-                                {
-                                    category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
-                                    threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                                },
-                            ],
-                        } as any);
-
-                        thread.sendTyping();
-
-                        const chat = model.startChat({
-                            history: [
-                                {
-                                    role: 'user',
-                                    parts: [{ text: message.content }],
-                                },
-                            ],
-                        });
-
-                        const result = await chat.sendMessage(message.content);
-                        const response = result.response;
-
-                        let generatedText = response.text();
-
-                        while (generatedText.length > 0) {
-                            let lastIndex = generatedText.lastIndexOf(' ', 1900);
-
-                            if (lastIndex === -1 || lastIndex >= 1900) {
-                                if (lastIndex === -1) lastIndex = 1900;
-
-                                const substring = generatedText.substring(0, lastIndex);
-                                await thread.send(substring);
-                                generatedText = generatedText.substring(lastIndex).trim();
-                            } else {
-                                const substring = generatedText.substring(0, lastIndex + 1).trim();
-                                await thread.send(substring);
-                                generatedText = generatedText.substring(lastIndex + 1).trim();
-                            }
-                        }
-                    } catch (error) {
-                        throw new Error(`An error occurred while generating the response: ${error}`);
-                    }
+        if (!(message.channel instanceof TextChannel)) return;
+
+        const botMentioned = message.mentions.has(this.client.user);
+        if (!(botMentioned && /[.!?]$/.test(message.content))) return;
+
+        const cleanContent = removeBotMention(message.content, this.client.user.id);
+        const threadName = truncateText(cleanContent, 100);
+
+        const existingThread = message.guild?.channels.cache.find(
+            (channel) => channel.name === threadName && channel.type === ChannelType.PublicThread,
+        );
+
+        if (existingThread) {
+            await message.reply(`The information you are looking for is in the existing thread: ${existingThread}`);
+        } else {
+            try {
+                const thread = await message.startThread({
+                    name: threadName,
+                    autoArchiveDuration: ThreadAutoArchiveDuration.OneHour,
+                });
+
+                const genAI = new GoogleGenerativeAI(this.client.config.geminiKey);
+                const model = genAI.getGenerativeModel({
+                    model: this.client.config.geminiModel,
+                    generationConfig: {
+                        maxOutputTokens: 1900,
+                        temperature: 0.9,
+                        topK: 1,
+                        topP: 1,
+                    },
+                    safety_settings: [
+                        { category: HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE },
+                        { category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE },
+                        { category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE },
+                        { category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE },
+                    ],
+                } as any);
+
+                thread.sendTyping();
+
+                const chat = model.startChat({
+                    history: [{ role: 'user', parts: [{ text: message.content }] }],
+                });
+
+                let generatedText = (await chat.sendMessage(message.content)).response.text();
+
+                while (generatedText.length > 0) {
+                    let lastIndex = generatedText.lastIndexOf(' ', 1900);
+                    if (lastIndex === -1 || lastIndex >= 1900) lastIndex = 1900;
+
+                    const substring = generatedText.substring(0, lastIndex).trim();
+                    await thread.send(substring);
+                    generatedText = generatedText.substring(lastIndex).trim();
                 }
+            } catch (error) {
+                throw new Error(`An error occurred while generating or sending the response: ${error}`);
             }
         }
     }