Move interaction and message handling to discord-tools

alexemanuelol · Jul 30, 2024 · d762f4b · d762f4b
1 parent c1f9d91
commit d762f4b
Show file tree

Hide file tree

Showing 30 changed files with 217 additions and 266 deletions.
diff --git a/src/commands/alarm.js b/src/commands/alarm.js
@@ -22,6 +22,7 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 const DiscordMessages = require('../discordTools/discordMessages.js');
 
 module.exports = {
@@ -79,7 +80,7 @@ module.exports = {
 				const device = client.getSmartDevice(guildId, entityId);
 				if (device === null) {
 					const str = client.intlGet(guildId, 'invalidId', { id: entityId });
-					await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+					await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -97,7 +98,7 @@ module.exports = {
 				await DiscordMessages.sendSmartAlarmMessage(guildId, device.serverId, entityId);
 
 				const str = client.intlGet(guildId, 'smartAlarmEditSuccess', { name: entity.name });
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str,
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str,
 					instance.serverList[device.serverId].title));
 				log.info(str);
 			} break;

diff --git a/src/commands/alias.js b/src/commands/alias.js
@@ -22,6 +22,7 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 import * as constants from '../util/constants';
 
 module.exports = {
@@ -96,7 +97,7 @@ async function addAlias(client, interaction) {
 	for (const alias of instance.commandAliases) {
 		if (alias.alias === aliasParameter) {
 			const str = client.intlGet(guildId, 'aliasAlreadyExist');
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -112,7 +113,7 @@ async function addAlias(client, interaction) {
 	client.setInstance(guildId, instance);
 
 	const str = client.intlGet(guildId, 'aliasWasAdded');
-	await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
+	await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
 	log.info(str);
 	return;
 }
@@ -125,7 +126,7 @@ async function removeAlias(client, interaction) {
 
 	if (!instance.commandAliases.some(e => e.index === indexParameter)) {
 		const str = client.intlGet(guildId, 'aliasIndexCouldNotBeFound');
-		await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+		await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 		log.warn(str);
 		return;
 	}
@@ -134,7 +135,7 @@ async function removeAlias(client, interaction) {
 	client.setInstance(guildId, instance);
 
 	const str = client.intlGet(guildId, 'aliasWasRemoved');
-	await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
+	await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
 	log.info(str);
 	return;
 }
@@ -213,6 +214,6 @@ async function showAlias(client, interaction) {
 		timestamp: new Date()
 	});
 
-	await client.interactionEditReply(interaction, { embeds: [embed] });
+	await discordTools.interactionEditReply(interaction, { embeds: [embed] });
 	log.info(client.intlGet(guildId, 'commandsAliasShowDesc'));
 }
diff --git a/src/commands/blacklist.js b/src/commands/blacklist.js
@@ -21,8 +21,8 @@
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-import { getGuild, getMember } from '../discordTools/discord-tools';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 import * as constants from '../util/constants';
 const PermissionHandler = require('../handlers/permissionHandler.js');
 const Request = require('../util/request.ts');
@@ -73,12 +73,12 @@ module.exports = {
 
 		if (!client.isAdministrator(interaction)) {
 			const str = client.intlGet(guildId, 'missingPermission');
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
 
-		const guild = await getGuild(client, guildId);
+		const guild = await discordToolsgetGuild(client, guildId);
 
 		switch (interaction.options.getSubcommand()) {
 			case 'add': {
@@ -87,7 +87,7 @@ module.exports = {
 
 				if (discordUser === null && steamid === null) {
 					const str = client.intlGet(guildId, 'missingArguments');
-					await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+					await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -140,7 +140,7 @@ module.exports = {
 					value: `add, ${discordUser}, ${steamid}`
 				}));
 
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
 				log.info(str);
 				return;
 			} break;
@@ -151,7 +151,7 @@ module.exports = {
 
 				if (discordUser === null && steamid === null) {
 					const str = client.intlGet(guildId, 'missingArguments');
-					await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+					await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -206,7 +206,7 @@ module.exports = {
 					value: `remove, ${discordUser}, ${steamid}`
 				}));
 
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
 				log.info(str);
 				return;
 			} break;
@@ -216,7 +216,7 @@ module.exports = {
 				let steamIds = '';
 
 				for (const discordId of instance.blacklist['discordIds']) {
-					const user = await getMember(client, guildId, discordId)
+					const user = await discordToolsgetMember(client, guildId, discordId)
 					let name = '';
 					if (user) name = `${user.user.username} (${user.id})`;
 					else name = `${discordId}`;
@@ -233,7 +233,7 @@ module.exports = {
 					steamIds += `${name}\n`;
 				}
 
-				await client.interactionEditReply(interaction, {
+				await discordTools.interactionEditReply(interaction, {
 					embeds: [discordEmbeds.getEmbed({
 						color: discordEmbeds.colorHexToNumber(constants.COLOR_DEFAULT),
 						title: client.intlGet(guildId, 'blacklist'),

diff --git a/src/commands/craft.js b/src/commands/craft.js
@@ -22,6 +22,7 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 const DiscordMessages = require('../discordTools/discordMessages.js');
 
 module.exports = {
@@ -65,7 +66,7 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithNameFound', {
 					name: craftItemName
 				});
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
@@ -81,14 +82,14 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithIdFound', {
 					id: craftItemId
 				});
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
 		}
 		else if (craftItemName === null && craftItemId === null) {
 			const str = client.intlGet(guildId, 'noNameIdGiven');
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -99,7 +100,7 @@ module.exports = {
 			const str = client.intlGet(guildId, 'couldNotFindCraftDetails', {
 				name: itemName
 			});
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}

diff --git a/src/commands/credentials.js b/src/commands/credentials.js
@@ -22,8 +22,8 @@ const _ = require('lodash');
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-import { getGuild } from '../discordTools/discord-tools';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 const Config = require('../../config');
 const Credentials = require('../util/credentials.ts');
 const DiscordMessages = require('../discordTools/discordMessages.js');
@@ -141,15 +141,15 @@ async function addCredentials(client, interaction, verifyId) {
     if (Object.keys(credentials) !== 0 && isHoster) {
         if (Config.discord.needAdminPrivileges && !client.isAdministrator(interaction)) {
             const str = client.intlGet(interaction.guildId, 'missingPermission');
-            client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+            await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
             log.warn(str);
             return;
         }
     }
 
     if (steamId in credentials) {
         const str = client.intlGet(guildId, 'credentialsAlreadyRegistered', { steamId: steamId });
-        await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+        await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -182,13 +182,13 @@ async function addCredentials(client, interaction, verifyId) {
 
     /* Start Fcm Listener */
     if (isHoster) {
-        require('../util/FcmListener')(client, await getGuild(client, interaction.guildId));
+        require('../util/FcmListener')(client, await discordTools.getGuild(client, interaction.guildId));
         if (prevHoster !== null) {
-            require('../util/FcmListenerLite')(client, await getGuild(client, interaction.guildId), prevHoster);
+            require('../util/FcmListenerLite')(client, await discordTools.getGuild(client, interaction.guildId), prevHoster);
         }
     }
     else {
-        require('../util/FcmListenerLite')(client, await getGuild(client, interaction.guildId), steamId);
+        require('../util/FcmListenerLite')(client, await discordTools.getGuild(client, interaction.guildId), steamId);
 
         const rustplus = client.rustplusInstances[guildId];
         if (rustplus && rustplus.team.leaderSteamId === steamId) {
@@ -213,7 +213,7 @@ async function addCredentials(client, interaction, verifyId) {
     }));
 
     const str = client.intlGet(interaction.guildId, 'credentialsAddedSuccessfully', { steamId: steamId });
-    await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
+    await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
     log.info(str);
 }
 
@@ -226,7 +226,7 @@ async function removeCredentials(client, interaction, verifyId) {
     if (steamId && (steamId in credentials) && credentials[steamId].discordUserId !== interaction.member.user.id) {
         if (Config.discord.needAdminPrivileges && !client.isAdministrator(interaction)) {
             const str = client.intlGet(interaction.guildId, 'missingPermission');
-            client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+            await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
             log.warn(str);
             return;
         }
@@ -245,7 +245,7 @@ async function removeCredentials(client, interaction, verifyId) {
         const str = client.intlGet(guildId, 'credentialsDoNotExist', {
             steamId: steamId ? steamId : client.intlGet(guildId, 'unknown')
         });
-        await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+        await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -274,7 +274,7 @@ async function removeCredentials(client, interaction, verifyId) {
     }));
 
     const str = client.intlGet(guildId, 'credentialsRemovedSuccessfully', { steamId: steamId });
-    await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
+    await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
     log.info(str);
 }
 
@@ -295,7 +295,7 @@ async function setHosterCredentials(client, interaction, verifyId) {
 
     if (Config.discord.needAdminPrivileges && !client.isAdministrator(interaction)) {
         const str = client.intlGet(interaction.guildId, 'missingPermission');
-        client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+        await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -309,7 +309,7 @@ async function setHosterCredentials(client, interaction, verifyId) {
         const str = client.intlGet(guildId, 'credentialsDoNotExist', {
             steamId: steamId ? steamId : client.intlGet(guildId, 'unknown')
         });
-        await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+        await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -329,9 +329,9 @@ async function setHosterCredentials(client, interaction, verifyId) {
         await DiscordMessages.sendServerMessage(guildId, rustplus.serverId);
     }
 
-    require('../util/FcmListener')(client, await getGuild(client, interaction.guildId));
+    require('../util/FcmListener')(client, await discordTools.getGuild(client, interaction.guildId));
     if (prevHoster !== null) {
-        require('../util/FcmListenerLite')(client, await getGuild(client, interaction.guildId), prevHoster);
+        require('../util/FcmListenerLite')(client, await discordTools.getGuild(client, interaction.guildId), prevHoster);
     }
 
     log.info(client.intlGet(null, 'slashCommandValueChange', {
@@ -340,6 +340,6 @@ async function setHosterCredentials(client, interaction, verifyId) {
     }));
 
     const str = client.intlGet(guildId, 'credentialsSetHosterSuccessfully', { steamId: steamId });
-    await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
+    await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
     log.info(str);
 }
diff --git a/src/commands/decay.js b/src/commands/decay.js
@@ -22,6 +22,7 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as discordTools from '../discordTools/discord-tools';
 const Timer = require('../util/timer.ts');
 
 module.exports = {
@@ -100,7 +101,7 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithNameFound', {
 					name: decayItemName
 				});
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
@@ -114,14 +115,14 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithIdFound', {
 					id: decayItemId
 				});
-				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+				await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
 		}
 		else if (decayItemName === null && decayItemId === null) {
 			const str = client.intlGet(guildId, 'noNameIdGiven');
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -141,7 +142,7 @@ module.exports = {
 			const str = client.intlGet(guildId, 'couldNotFindDecayDetails', {
 				name: itemName
 			});
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -154,7 +155,7 @@ module.exports = {
 				hp: hp,
 				max: details.hp
 			});
-			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
+			await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -213,7 +214,7 @@ module.exports = {
 			value: `${decayItemName} ${decayItemId} ${decayItemHp}`
 		}));
 
-		await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, decayString));
+		await discordTools.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, decayString));
 		log.info(decayString);
 	},
 };