Convert DiscordEmbeds

alexemanuelol · Jul 29, 2024 · 017cecc · 017cecc
1 parent b8dcef4
commit 017cecc
Show file tree

Hide file tree

Showing 29 changed files with 1,770 additions and 1,662 deletions.
diff --git a/src/commands/alarm.js b/src/commands/alarm.js
@@ -21,7 +21,7 @@
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
+import * as discordEmbeds from '../discordTools/discord-embeds';
 const DiscordMessages = require('../discordTools/discordMessages.js');
 
 module.exports = {
@@ -79,7 +79,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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -97,7 +97,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 client.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
@@ -21,8 +21,8 @@
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-const Constants = require('../util/constants.ts');
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
+import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as constants from '../util/constants';
 
 module.exports = {
 	name: 'alias',
@@ -96,7 +96,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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -112,7 +112,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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
 	log.info(str);
 	return;
 }
@@ -125,7 +125,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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 		log.warn(str);
 		return;
 	}
@@ -134,7 +134,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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
 	log.info(str);
 	return;
 }
@@ -158,13 +158,13 @@ async function showAlias(client, interaction) {
 		const valueString = `${alias.value}\n`;
 
 		if (totalCharacters + (indexString.length + aliasString.length + valueString.length) >=
-			Constants.EMBED_MAX_TOTAL_CHARACTERS) {
+			constants.EMBED_MAX_TOTAL_CHARACTERS) {
 			break;
 		}
 
-		if ((indexStringsCharacters + indexString.length) > Constants.EMBED_MAX_FIELD_VALUE_CHARACTERS ||
-			(aliasStringsCharacters + aliasString.length) > Constants.EMBED_MAX_FIELD_VALUE_CHARACTERS ||
-			(valueStringsCharacters + valueString.length) > Constants.EMBED_MAX_FIELD_VALUE_CHARACTERS) {
+		if ((indexStringsCharacters + indexString.length) > constants.EMBED_MAX_FIELD_VALUE_CHARACTERS ||
+			(aliasStringsCharacters + aliasString.length) > constants.EMBED_MAX_FIELD_VALUE_CHARACTERS ||
+			(valueStringsCharacters + valueString.length) > constants.EMBED_MAX_FIELD_VALUE_CHARACTERS) {
 			fieldIndex += 1;
 
 			indexStrings.push('');
@@ -206,11 +206,11 @@ async function showAlias(client, interaction) {
 		});
 	}
 
-	const embed = DiscordEmbeds.getEmbed({
+	const embed = discordEmbeds.getEmbed({
 		title: title,
-		color: Constants.COLOR_DEFAULT,
+		color: discordEmbeds.colorHexToNumber(constants.COLOR_DEFAULT),
 		fields: fields,
-		timestamp: true
+		timestamp: new Date()
 	});
 
 	await client.interactionEditReply(interaction, { embeds: [embed] });

diff --git a/src/commands/blacklist.js b/src/commands/blacklist.js
@@ -22,8 +22,8 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import { getGuild, getMember } from '../discordTools/discord-tools';
-const Constants = require('../util/constants.ts');
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
+import * as discordEmbeds from '../discordTools/discord-embeds';
+import * as constants from '../util/constants';
 const PermissionHandler = require('../handlers/permissionHandler.js');
 const Request = require('../util/request.ts');
 
@@ -72,7 +72,7 @@ module.exports = {
 
 		if (!client.isAdministrator(interaction)) {
 			const str = client.intlGet(guildId, 'missingPermission');
-			await client.interactionReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+			await client.interactionReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -88,7 +88,7 @@ module.exports = {
 
 				if (discordUser === null && steamid === null) {
 					const str = client.intlGet(guildId, 'missingArguments');
-					await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+					await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -141,7 +141,7 @@ module.exports = {
 					value: `add, ${discordUser}, ${steamid}`
 				}));
 
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(successful, str));
+				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
 				log.info(str);
 				return;
 			} break;
@@ -152,7 +152,7 @@ module.exports = {
 
 				if (discordUser === null && steamid === null) {
 					const str = client.intlGet(guildId, 'missingArguments');
-					await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+					await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 					log.warn(str);
 					return;
 				}
@@ -207,7 +207,7 @@ module.exports = {
 					value: `remove, ${discordUser}, ${steamid}`
 				}));
 
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(successful, str));
+				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(successful, str));
 				log.info(str);
 				return;
 			} break;
@@ -235,8 +235,8 @@ module.exports = {
 				}
 
 				await client.interactionEditReply(interaction, {
-					embeds: [DiscordEmbeds.getEmbed({
-						color: Constants.COLOR_DEFAULT,
+					embeds: [discordEmbeds.getEmbed({
+						color: discordEmbeds.colorHexToNumber(constants.COLOR_DEFAULT),
 						title: client.intlGet(guildId, 'blacklist'),
 						fields: [
 							{

diff --git a/src/commands/craft.js b/src/commands/craft.js
@@ -21,7 +21,7 @@
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
+import * as discordEmbeds from '../discordTools/discord-embeds';
 const DiscordMessages = require('../discordTools/discordMessages.js');
 
 module.exports = {
@@ -65,7 +65,7 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithNameFound', {
 					name: craftItemName
 				});
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
@@ -81,14 +81,14 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithIdFound', {
 					id: craftItemId
 				});
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+				await client.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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -99,7 +99,7 @@ module.exports = {
 			const str = client.intlGet(guildId, 'couldNotFindCraftDetails', {
 				name: itemName
 			});
-			await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}

diff --git a/src/commands/credentials.js b/src/commands/credentials.js
@@ -23,9 +23,9 @@ const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
 import { getGuild } from '../discordTools/discord-tools';
+import * as discordEmbeds from '../discordTools/discord-embeds';
 const Config = require('../../config');
 const Credentials = require('../util/credentials.ts');
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
 const DiscordMessages = require('../discordTools/discordMessages.js');
 
 module.exports = {
@@ -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));
+            client.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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -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 client.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));
+            client.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 client.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 client.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));
+        client.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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
         log.warn(str);
         return;
     }
@@ -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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, str));
     log.info(str);
 }
diff --git a/src/commands/decay.js b/src/commands/decay.js
@@ -21,7 +21,7 @@
 const Builder = require('@discordjs/builders');
 
 import { log } from '../../index';
-const DiscordEmbeds = require('../discordTools/discordEmbeds.js');
+import * as discordEmbeds from '../discordTools/discord-embeds';
 const Timer = require('../util/timer.ts');
 
 module.exports = {
@@ -100,7 +100,7 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithNameFound', {
 					name: decayItemName
 				});
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+				await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 				log.warn(str);
 				return;
 			}
@@ -114,14 +114,14 @@ module.exports = {
 				const str = client.intlGet(guildId, 'noItemWithIdFound', {
 					id: decayItemId
 				});
-				await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+				await client.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 client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -141,7 +141,7 @@ module.exports = {
 			const str = client.intlGet(guildId, 'couldNotFindDecayDetails', {
 				name: itemName
 			});
-			await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -154,7 +154,7 @@ module.exports = {
 				hp: hp,
 				max: details.hp
 			});
-			await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(1, str));
+			await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(1, str));
 			log.warn(str);
 			return;
 		}
@@ -213,7 +213,7 @@ module.exports = {
 			value: `${decayItemName} ${decayItemId} ${decayItemHp}`
 		}));
 
-		await client.interactionEditReply(interaction, DiscordEmbeds.getActionInfoEmbed(0, decayString));
+		await client.interactionEditReply(interaction, discordEmbeds.getActionInfoEmbed(0, decayString));
 		log.info(decayString);
 	},
 };