From 3b1d64061298b85dafc1027182cb576741f02b36 Mon Sep 17 00:00:00 2001
From: Baipyrus <simon.waltemathe@gmail.com>
Date: Mon, 29 Apr 2024 10:30:50 +0200
Subject: [PATCH] simpler/universal bot-user-id access

---
 events/messages/messageCreate.js  | 2 +-
 events/messages/reactionAdd.js    | 5 +----
 events/messages/reactionRemove.js | 5 +----
 shared.js                         | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/events/messages/messageCreate.js b/events/messages/messageCreate.js
index 4757212..490ca4b 100644
--- a/events/messages/messageCreate.js
+++ b/events/messages/messageCreate.js
@@ -6,7 +6,7 @@ export const name = Events.MessageCreate;
 /** @param {Message} message */
 export async function execute(message) {
 	// Ignore direct messages and own messages
-	if (!message.inGuild() || message.author.id === process.env.CLIENT) return;
+	if (!message.inGuild() || message.author.id === message.client.user.id) return;
 
 	// Split message content into words
 	const words = message.content
diff --git a/events/messages/reactionAdd.js b/events/messages/reactionAdd.js
index 973a7a7..45026b1 100644
--- a/events/messages/reactionAdd.js
+++ b/events/messages/reactionAdd.js
@@ -1,8 +1,5 @@
 import { Events, MessageReaction, User } from 'discord.js';
 import { Messages, RoleEmojiPairs } from '../../database.js';
-import { config } from 'dotenv';
-
-config();
 
 export const name = Events.MessageReactionAdd;
 /**
@@ -10,7 +7,7 @@ export const name = Events.MessageReactionAdd;
  * @param {User} user
  */
 export async function execute(reaction, user) {
-	if (user.id === process.env.CLIENT) return;
+	if (user.id === user.client.user.id) return;
 
 	// Get message
 	const msgID = reaction.message.id;
diff --git a/events/messages/reactionRemove.js b/events/messages/reactionRemove.js
index c9f69ed..1d5a02b 100644
--- a/events/messages/reactionRemove.js
+++ b/events/messages/reactionRemove.js
@@ -1,8 +1,5 @@
 import { Events, MessageReaction, User } from 'discord.js';
 import { Messages, RoleEmojiPairs } from '../../database.js';
-import { config } from 'dotenv';
-
-config();
 
 export const name = Events.MessageReactionRemove;
 /**
@@ -10,7 +7,7 @@ export const name = Events.MessageReactionRemove;
  * @param {User} user
  */
 export async function execute(reaction, user) {
-	if (user.id === process.env.CLIENT) return;
+	if (user.id === user.client.user.id) return;
 
 	// Get message
 	const msgID = reaction.message.id;
diff --git a/shared.js b/shared.js
index 92971c5..a6f574e 100644
--- a/shared.js
+++ b/shared.js
@@ -1,13 +1,10 @@
 import { ChatInputCommandInteraction, ContextMenuCommandInteraction, Role } from 'discord.js';
 import { Messages, RoleEmojiPairs, Guilds } from './database.js';
 import { readdir } from 'fs/promises';
-import { config } from 'dotenv';
 import { Op } from 'sequelize';
 import { join } from 'path';
 import Module from 'module';
 
-config();
-
 /**
  * Main logic of the different 'Self Roles remove' commands to remove the functionality from a `Message`.
  * @param {(ChatInputCommandInteraction|ContextMenuCommandInteraction)} interaction The interaction related to this command.
@@ -90,7 +87,7 @@ const saveMessageData = async (id, role, emoji) => {
  * @param {string} emoji Either a unicode emoji or a string representation in Discord custom emoji format.
  */
 const editMessage = async (message, role, emoji) => {
-	if (message.author.id !== process.env.CLIENT) return;
+	if (message.author.id !== message.client.user.id) return;
 
 	// Find out whether to pad message or already present
 	let padding = '\n';