From 892841524c3ba3d3bce1a3266eb8493cc97cbe08 Mon Sep 17 00:00:00 2001
From: fzzinchemical <mathys162002@gmail.com>
Date: Sun, 13 Apr 2025 22:51:07 +0200
Subject: [PATCH] sharting my brains out on this one

---
 src/bot.ts                     | 66 ++++++++++++++++++++++++----------
 src/messages.ts                |  2 +-
 src/plugins/rule34/messages.ts |  1 +
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/bot.ts b/src/bot.ts
index 3652da7..df4bdb3 100755
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,37 +1,65 @@
-import { Bot, createBot, createDesiredPropertiesObject, Message } from "@discordeno";
+import {
+	Bot,
+	createBot,
+	createDesiredPropertiesObject,
+	Intents,
+	Message,
+	TransformersDesiredProperties,
+} from "@discordeno";
 import { messagehandler } from "./messages.ts";
 import { EnvConst, loadConfig } from "@root/core/configLoader.ts";
 
 const env: EnvConst = loadConfig();
 
 const desiredProperties = createDesiredPropertiesObject({
-  message: {
-    id: true,
-    author: true,
-  },
-  user: {
-    id: true,
-    toggles: true, // Toggles includes the "bot" flag
-    username: true,
-  },
-})
+	interaction: {
+		id: true,
+		type: true,
+		data: true,
+		token: true,
+		guildId: true,
+		member: true,
+	},
+	guild: {
+		id: true,
+		name: true,
+		roles: true,
+		ownerId: true,
+	},
+	role: {
+		id: true,
+		guildId: true,
+		permissions: true,
+	},
+	member: {
+		id: true,
+		roles: true,
+	},
+	channel: {
+		id: true,
+	},
+	user: {
+		id: true,
+		username: true,
+		discriminator: true,
+	},
+});
 
 interface BotDesiredProperties extends Required<typeof desiredProperties> {}
 
-const bot = createBot({
+const rawBot = createBot({
 	token: env.BOT_TOKEN,
-  desiredProperties: desiredProperties as BotDesiredProperties,
+  intents: Intents.Guilds,
+	desiredProperties: desiredProperties as TransformersDesiredProperties,
 	events: {
 		ready() {
 			console.log("Bot is ready!");
 		},
+		async messageCreate(message) {
+			await messagehandler(rawBot, message as Message)
+		}
 	},
 });
-
-bot.events.messageCreate = (message) => {
-	messagehandler(bot as Bot, message as Message);
-};
-
 // Setup desired properties
 
-await bot.start();
+await rawBot.start()
diff --git a/src/messages.ts b/src/messages.ts
index 1f57d49..e9fc7d6 100755
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -1,4 +1,4 @@
-import { Bot, Message } from "@discordeno";
+import { createBot, Bot, Message } from "@discordeno";
 import { yandereMessageHandler } from "@root/plugins/yandere/messages.ts";
 import { rule34MessageHandler } from "@root/plugins/rule34/messages.ts";
 
diff --git a/src/plugins/rule34/messages.ts b/src/plugins/rule34/messages.ts
index a35aaae..bd771e7 100644
--- a/src/plugins/rule34/messages.ts
+++ b/src/plugins/rule34/messages.ts
@@ -20,6 +20,7 @@ export async function rule34MessageHandler(bot: Bot, message: Message) {
 		}
 	} else if (command === "help") {
 		logMessage(message);
+		
 		bot.helpers.sendMessage(message.channelId, {
 			content: defaultString(help()),
 		});