Merge branch 'master' into pr/860

commands/api/dqm3.js

@@ -52,12 +52,13 @@ export default async (client, interaction, ephemeral) => {
                         };
                     };
                 };
-                dqm3Embed.setTitle(monsterTitle);
+                dqm3Embed
+                    .setTitle(monsterTitle)
+                    .addFields([
+                        { name: "Rank", value: monsterData.rank, inline: true },
+                        { name: "Family", value: familiesJSON[monsterData.family].name, inline: true }
+                    ]);
                 if (monsterData.description) dqm3Embed.setDescription(monsterData.description);
-                dqm3Embed.addFields([
-                    { name: "Rank", value: monsterData.rank, inline: true },
-                    { name: "Family", value: familiesJSON[monsterData.family].name, inline: true }
-                ]);
                 if (monsterData.talents) dqm3Embed.addFields([{ name: "Innate Talents:", value: innateTalentsString, inline: true }]);
                 if (monsterData.traits) dqm3Embed.addFields([{ name: "Traits: (Lvl)", value: monsterTraitsString, inline: true }]);
                 if (monsterData.growth) dqm3Embed.addFields([{ name: "Growth:", value: growthString, inline: false }]);
@@ -115,8 +116,10 @@ export default async (client, interaction, ephemeral) => {
                 dqm3Embed
                     .setTitle(skillData.name)
                     .setDescription(skillData.description)
-                    .addFields([{ name: "Type:", value: skillData.type, inline: true }])
-                    .addFields([{ name: "MP Cost:", value: mpCostString, inline: true }]);
+                    .addFields([
+                        { name: "Type:", value: skillData.type, inline: true },
+                        { name: "MP Cost:", value: mpCostString, inline: true }
+                    ]);
                 if (skillTalents.length > 0) dqm3Embed.addFields([{ name: "Talents:", value: skillTalents.join("\n"), inline: false }]);
                 break;
             case "trait":
@@ -205,10 +208,10 @@ export default async (client, interaction, ephemeral) => {
                     };
                     dqm3Embed
                         .setTitle("Synthesis")
-                        .setDescription(`${parent1Name} + ${parent2Name} = ${targetName}`);
+                        .setDescription(`${parent1Name} + ${parent2Name} = ${targetName}`)
+                        .setFooter({ text: "Note: Monsters can always synthesize into their own species." });
                     if (familySynthesisString.length > 0) dqm3Embed.addFields([{ name: "Family Synthesis:", value: `${familySynthesisString}\n${familySynthesisNote}`, inline: false }]);
                     if (uniqueSynthesisString.length > 0) dqm3Embed.addFields([{ name: "Unique Synthesis:", value: uniqueSynthesisString, inline: false }]);
-                    dqm3Embed.setFooter({ text: "Note: Monsters can always synthesize into their own species." });
                 } else {
                     return sendMessage({ client: client, interaction: interaction, content: `Coming soon.` });
                 };

commands/api/persona5.js

@@ -55,13 +55,13 @@ export default async (client, interaction, ephemeral) => {
                 p5Embed
                     .setTitle(`${personaInput} (${personaObject.arcana})`)
                     .setDescription(elementalMatchup)
+                    .setImage(personaImage)
                     .addFields([
                         { name: "Stats:", value: `Trait: ${personaObject.trait}\nLevel: ${personaObject.level}\n${personaStats}`, inline: true },
                         { name: "Skills:", value: personaSkills, inline: true },
                         { name: "Item:", value: personaItem, inline: false },
                         { name: "Item (Fusion Alarm):", value: personaItemAlarm, inline: false }
-                    ])
-                    .setImage(personaImage);
+                    ]);
                 break;
             case "skill":
                 let skillInput = interaction.options.getString("skill");
@@ -104,26 +104,26 @@ export default async (client, interaction, ephemeral) => {
         };
         return sendMessage({ client: client, interaction: interaction, embeds: p5Embed, ephemeral: ephemeral, components: buttonArray });
 
-        function getWeaknessString(string) {
-            string = string.replace("wk", "Weak").replace("rs", "Resist").replace("nu", "Null").replace("ab", "Absorb").replace("rp", "Repel").replace("-", "Neutral");
-            return string;
-        };
-        function getItemString(string) {
-            let itemObject = itemMapRoyal[string];
-            if (!itemObject) return "None";
-            if (itemObject.type && itemObject.description) {
-                string = `${string} (${itemObject.type}): ${itemObject.description}`;
-            } else if (itemObject.skillCard) {
-                string = `${string} (Skill Card)`;
-            };
-            return string;
-        };
-
     } catch (e) {
         logger(e, client, interaction);
     };
 };
 
+function getWeaknessString(string) {
+    string = string.replace("wk", "Weak").replace("rs", "Resist").replace("nu", "Null").replace("ab", "Absorb").replace("rp", "Repel").replace("-", "Neutral");
+    return string;
+};
+function getItemString(string) {
+    let itemObject = itemMapRoyal[string];
+    if (!itemObject) return "None";
+    if (itemObject.type && itemObject.description) {
+        string = `${string} (${itemObject.type}): ${itemObject.description}`;
+    } else if (itemObject.skillCard) {
+        string = `${string} (Skill Card)`;
+    };
+    return string;
+};
+
 export const config = {
     name: "persona5",
     description: "Shows Persona 5 data.",

commands/api/splatoon3.js

@@ -114,14 +114,14 @@ export default async (client, interaction, ephemeral) => {
                 splat3Embed
                     .setAuthor({ name: clothingAuthor, iconURL: brandImage })
                     .setThumbnail(abilityImage)
+                    .setImage(clothingImage)
+                    .setFooter({ text: `${versionString} | *Main abilities can differ because of SplatNet or Murch.` })
                     .addFields([
                         { name: abilityTitle, value: `${languageJSON["CommonMsg/Gear/GearPowerName"][clothingObject.Skill]}*`, inline: true },
                         { name: slotsTitle, value: (clothingObject.Rarity + 1).toString(), inline: true },
                         { name: brandTitle, value: languageJSON["CommonMsg/Gear/GearBrandName"][clothingObject.Brand], inline: true },
                         { name: "Obtain Method:", value: obtainMethod, inline: true }
-                    ])
-                    .setImage(clothingImage)
-                    .setFooter({ text: `${versionString} | *Main abilities can differ because of SplatNet or Murch.` });
+                    ]);
                 break;
             case "weapon":
                 inputID = interaction.options.getString("weapon");
@@ -156,14 +156,14 @@ export default async (client, interaction, ephemeral) => {
                 splat3Embed
                     .setAuthor({ name: weaponAuthor, iconURL: subImage })
                     .setThumbnail(specialImage)
+                    .setImage(weaponImage)
+                    .setFooter({ text: versionString })
                     .addFields([
                         { name: subTitle, value: languageJSON["CommonMsg/Weapon/WeaponName_Sub"][subID], inline: true },
                         { name: specialTitle, value: languageJSON["CommonMsg/Weapon/WeaponName_Special"][specialID], inline: true },
                         { name: shopTitle, value: weaponUnlockString, inline: true },
                         { name: infoTitle, value: weaponStats, inline: false }
-                    ])
-                    .setImage(weaponImage)
-                    .setFooter({ text: versionString });
+                    ]);
                 break;
             case "subweapon":
                 inputID = interaction.options.getString("subweapon");
@@ -189,8 +189,8 @@ export default async (client, interaction, ephemeral) => {
                     .setTitle(subName)
                     .setThumbnail(subThumbnail)
                     .setDescription(subDescription)
-                    .addFields([{ name: weaponListTitle, value: allSubweaponMatchesNames, inline: false }])
-                    .setFooter({ text: versionString });
+                    .setFooter({ text: versionString })
+                    .addFields([{ name: weaponListTitle, value: allSubweaponMatchesNames, inline: false }]);
                 break;
             case "special":
                 inputID = interaction.options.getString("special");
@@ -215,8 +215,8 @@ export default async (client, interaction, ephemeral) => {
                     .setTitle(specialName)
                     .setThumbnail(specialThumbnail)
                     .setDescription(specialDescription)
+                    .setFooter({ text: versionString })
                     .addFields([{ name: weaponListTitle, value: allSpecialWeaponMatchesNames, inline: false }])
-                    .setFooter({ text: versionString });
                 break;
             case "schedule":
                 let inputData = interaction.options.getString("mode");
@@ -329,8 +329,8 @@ export default async (client, interaction, ephemeral) => {
                     tricolorSchedule += `\n${currentFest.tricolorStage.name}`;
                     splat3Embed
                         .setDescription(splatfestScheduleDescription)
-                        .addFields([{ name: "Tricolor Battle:", value: tricolorSchedule, inline: false }])
-                        .setImage(splatfestData.image.url);
+                        .setImage(splatfestData.image.url)
+                        .addFields([{ name: "Tricolor Battle:", value: tricolorSchedule, inline: false }]);
                 };
                 if ([turfWarID, anarchyID, splatfestBattleID, xBattleID].includes(inputMode)) {
                     // Turf War, Anarchy, xBattle and SplatfestTW
@@ -371,7 +371,11 @@ export default async (client, interaction, ephemeral) => {
                 if (responseSplatnet.status != 200) return sendMessage({ client: client, interaction: interaction, content: `Error occurred getting SplatNet3 data. Please try again later.` });
                 let splatnetData = responseSplatnet.data.data.gesotown;
                 // Limited time brand
-                splat3Embed.addFields([{ name: `Daily Drop (${splatnetData.pickupBrand.brand.name})`, value: `${splatnetData.pickupBrand.brand.name} Common Ability: ${splatnetData.pickupBrand.brand.usualGearPower.name}\nDaily Drop (${splatnetData.pickupBrand.nextBrand.name}) starts <t:${Date.parse(splatnetData.pickupBrand.saleEndTime) / 1000}:R>.`, inline: false }]);
+                splat3Embed
+                    .setTitle("SplatNet3 Shop")
+                    .setImage(splatnetData.pickupBrand.image.url)
+                    .setFooter({ text: `${splatnetData.pickupBrand.brand.name} promotional image.` })
+                    .addFields([{ name: `Daily Drop (${splatnetData.pickupBrand.brand.name})`, value: `${splatnetData.pickupBrand.brand.name} Common Ability: ${splatnetData.pickupBrand.brand.usualGearPower.name}\nDaily Drop (${splatnetData.pickupBrand.nextBrand.name}) starts <t:${Date.parse(splatnetData.pickupBrand.saleEndTime) / 1000}:R>.`, inline: false }]);
                 await splatnetData.pickupBrand.brandGears.forEach(brandGear => {
                     let brandGearString = getGearString(brandGear, "brand");
                     splat3Embed.addFields([{ name: brandGear.gear.name, value: brandGearString, inline: true }]);
@@ -382,11 +386,6 @@ export default async (client, interaction, ephemeral) => {
                     let limitedGearString = getGearString(limitedGear, "limited");
                     splat3Embed.addFields([{ name: limitedGear.gear.name, value: limitedGearString, inline: true }]);
                 });
-
-                splat3Embed
-                    .setTitle("SplatNet3 Shop")
-                    .setImage(splatnetData.pickupBrand.image.url)
-                    .setFooter({ text: `${splatnetData.pickupBrand.brand.name} promotional image.` });
                 break;
             case "splatfests":
                 await interaction.deferReply({ ephemeral: ephemeral });
@@ -435,14 +434,14 @@ export default async (client, interaction, ephemeral) => {
                     .setTitle(replayMode)
                     .setThumbnail(replayData.player.weapon.image.url)
                     .setDescription(matchData)
+                    .setFooter({ text: `Replay ID: ${replayResponse.data.replay.replayCode}` })
                     .addFields([
                         { name: "Player Data:", value: playerData.join("\n"), inline: false },
                         { name: `${replayData.player.headGear.name} Skills:`, value: headSkills.join("\n"), inline: true },
                         { name: `${replayData.player.clothingGear.name} Skills:`, value: clothingSkills.join("\n"), inline: true },
                         { name: `${replayData.player.shoesGear.name} Skills:`, value: shoesSkills.join("\n"), inline: true }
                     ]);
                 if (replayAwards.length > 0) splat3Embed.addFields([{ name: "Awards:", value: replayAwards.join("\n"), inline: false }]);
-                splat3Embed.setFooter({ text: `Replay ID: ${replayResponse.data.replay.replayCode}` });
                 break;
             case "splashtag-random":
                 let userTitle = interaction.member.nickname;
@@ -474,24 +473,24 @@ export default async (client, interaction, ephemeral) => {
         };
         return sendMessage({ client: client, interaction: interaction, embeds: splat3Embed, ephemeral: ephemeral });
 
-        function getGearString(gear, type) {
-            let limitedGearString = "";
-            if (type == "limited") limitedGearString += `Sale ends <t:${Date.parse(gear.saleEndTime) / 1000}:R>.\n`;
-            limitedGearString += `Ability: ${gear.gear.primaryGearPower.name}\n`;
-            let limitedGearStars = star.repeat(gear.gear.additionalGearPowers.length - 1);
-            let limitedGearStarString = `Slots: ${gear.gear.additionalGearPowers.length}`;
-            if (gear.gear.additionalGearPowers.length > 1) limitedGearStarString += ` (${limitedGearStars})`;
-            limitedGearString += `${limitedGearStarString}\n`;
-            limitedGearString += `Brand: ${gear.gear.brand.name}\n`;
-            limitedGearString += `Price: ${gear.price}\n`;
-            return limitedGearString;
-        };
-
     } catch (e) {
         logger(e, client, interaction);
     };
 };
 
+function getGearString(gear, type) {
+    let limitedGearString = "";
+    if (type == "limited") limitedGearString += `Sale ends <t:${Date.parse(gear.saleEndTime) / 1000}:R>.\n`;
+    limitedGearString += `Ability: ${gear.gear.primaryGearPower.name}\n`;
+    let limitedGearStars = star.repeat(gear.gear.additionalGearPowers.length - 1);
+    let limitedGearStarString = `Slots: ${gear.gear.additionalGearPowers.length}`;
+    if (gear.gear.additionalGearPowers.length > 1) limitedGearStarString += ` (${limitedGearStars})`;
+    limitedGearString += `${limitedGearStarString}\n`;
+    limitedGearString += `Brand: ${gear.gear.brand.name}\n`;
+    limitedGearString += `Price: ${gear.price}\n`;
+    return limitedGearString;
+};
+
 export const config = {
     name: "splatoon3",
     description: `Shows Splatoon 3 data.`,

commands/info/botinfo.js

@@ -17,7 +17,7 @@ export default async (client, interaction, ephemeral) => {
 
         await client.guilds.fetch();
         let totalGuilds = client.guilds.cache.size;
-        let totalMembers = await getUsers();
+        let totalMembers = await getUsers(client);
         // Get latest commit
         let githubURLVars = "Glazelf/NinigiBot";
         let githubRepoResponse = null;
@@ -71,20 +71,20 @@ export default async (client, interaction, ephemeral) => {
             .addComponents(new Discord.ButtonBuilder({ label: 'Support Server', style: Discord.ButtonStyle.Link, url: `https://discord.gg/${globalVars.ShinxServerInvite}` }))
         return sendMessage({ client: client, interaction: interaction, embeds: botEmbed, components: botButtons, ephemeral: ephemeral });
 
-        async function getUsers() {
-            // Fast but inaccurate method
-            let userCount = 0;
-            await client.guilds.cache.forEach(guild => {
-                if (guild.memberCount) userCount += guild.memberCount;
-            });
-            return userCount;
-        };
-
     } catch (e) {
         logger(e, client, interaction);
     };
 };
 
+async function getUsers(client) {
+    // Fast but inaccurate method
+    let userCount = 0;
+    await client.guilds.cache.forEach(guild => {
+        if (guild.memberCount) userCount += guild.memberCount;
+    });
+    return userCount;
+};
+
 export const config = {
     name: "botinfo",
     description: `Displays info about this bot.`,

commands/info/roleinfo.js

@@ -31,6 +31,7 @@ export default async (client, interaction, ephemeral) => {
             .setColor(embedColor)
             .setTitle(role.name)
             .setThumbnail(icon)
+            .setFooter({ text: role.id })
             .addFields([{ name: "Role:", value: role.toString(), inline: true }]);
         if (role.hexColor !== defaultColor) roleEmbed.addFields([{ name: "Color:", value: role.hexColor, inline: true }]);
         roleEmbed
@@ -39,8 +40,7 @@ export default async (client, interaction, ephemeral) => {
                 { name: "Position:", value: role.rawPosition.toString(), inline: true },
                 { name: "Properties:", value: roleProperties, inline: false },
                 { name: "Permissions:", value: permissionString, inline: false }
-            ])
-            .setFooter({ text: role.id });
+            ]);
         return sendMessage({ client: client, interaction: interaction, embeds: roleEmbed, ephemeral: ephemeral });
 
     } catch (e) {

commands/owner/send.js

@@ -19,7 +19,7 @@ export default async (client, interaction, ephemeral) => {
         let attachment = null;
         if (attachmentArg) attachment = attachmentArg.url;
         let target;
-        let textMessageBlock = Discord.codeBlock(textMessage);
+        let textMessageBlock = Discord.codeBlock("fix", textMessage);
         if (userIDArg || channelIDArg) {
             try {
                 if (channelIDArg) target = await client.channels.fetch(channelIDArg);
@@ -32,8 +32,8 @@ export default async (client, interaction, ephemeral) => {
         };
         if (!target) return sendMessage({ client: client, interaction: interaction, content: `I could not find a user or channel with that ID.` });
         let targetFormat = null;
-        if (channelIDArg) targetFormat = `${target.name} (${target.id}) in **${target.guild.name}** (${target.guild.id})`;
-        if (userIDArg) targetFormat = `${target.username} (${target.id})`;
+        if (channelIDArg) targetFormat = `**${target.name}** (${target.id}) in **${target.guild.name}** (${target.guild.id})`;
+        if (userIDArg) targetFormat = `**${target.username}** (${target.id})`;
         try {
             let messageObject = { content: textMessage };
             if (attachment) messageObject["files"] = [attachment];
@@ -75,4 +75,4 @@ export const config = {
         type: Discord.ApplicationCommandOptionType.Boolean,
         description: "Whether the reply will be private."
     }]
-};
+};