From c921e5cf8862def58029bd1801074c51113f86ae Mon Sep 17 00:00:00 2001
From: Andrew Lee <andrew@alee14.me>
Date: Fri, 7 Mar 2025 17:22:21 -0500
Subject: More settings; Better error message; Database

---
 bot/src/events/MessageCreate.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'bot/src/events/MessageCreate.js')

diff --git a/bot/src/events/MessageCreate.js b/bot/src/events/MessageCreate.js
index 90b517d..e7af3a8 100644
--- a/bot/src/events/MessageCreate.js
+++ b/bot/src/events/MessageCreate.js
@@ -1,6 +1,7 @@
 import { Events } from 'discord.js';
 import { ollama } from '../utils/ollama.js';
-import { ollamaEnabled, ollamaModel } from '../storage/consts.js';
+import { ollamaGlobal, ollamaModel } from '../storage/consts.js';
+import { guildSettings } from '../models/guild-settings.js';
 
 export default {
     name: Events.MessageCreate,
@@ -9,10 +10,13 @@ export default {
         if (msg.author.bot) return;
         if (!msg.guild) return;
 
+        const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } });
+
         const args = msg.content.slice(`<@${msg.client.user.id}>`.length).trim();
 
         if (msg.mentions.has(msg.client.user)) {
-            if (!ollamaEnabled) return msg.reply('Sorry, this feature has been turned off.');
+            if (!guildSetting.ollamaEnabled) return;
+            if (!ollamaGlobal) return msg.reply('Sorry, this feature has been turned off.');
             if (!args) return msg.reply('Sorry? What was that?');
 
             try {
@@ -35,7 +39,7 @@ export default {
 
             } catch (err) {
                 console.error(err);
-                await msg.reply('Something went wrong.');
+                await msg.reply(`Something went wrong. [Submit an issue at the AleeBot repository.](<https://github.com/Alee14/AleeBot/issues>)\nMessage:\n\`\`\`${err.stack}\`\`\``);
             }
         }
     }
-- 
cgit v1.2.3