Merge branch 'master' into emoji-storage

commands/virtual_simulation/trainer.js

@@ -2,7 +2,8 @@ import {
     EmbedBuilder,
     SlashCommandBuilder,
     SlashCommandSubcommandBuilder,
-    SlashCommandBooleanOption
+    SlashCommandBooleanOption,
+    ApplicationIntegrationType
 } from "discord.js";
 import sendMessage from "../../util/sendMessage.js";
 import { getUser } from "../../database/dbServices/user.api.js";
@@ -13,13 +14,16 @@ export default async (interaction, ephemeral) => {
     let ephemeralArg = interaction.options.getBoolean("ephemeral");
     if (ephemeralArg !== null) ephemeral = ephemeralArg;
     let embed = new EmbedBuilder();
-    let avatar = null;
     let master = interaction.user;
     switch (interaction.options.getSubcommand()) {
         case "info":
             let user = await getUser(master.id);
-            let member = await interaction.guild.members.fetch(master.id);
-            if (member) avatar = member.displayAvatarURL(globalVars.displayAvatarSettings);
+            let avatar = master.displayAvatarURL(globalVars.displayAvatarSettings);
+            if (Object.keys(interaction.authorizingIntegrationOwners).includes(ApplicationIntegrationType.GuildInstall) && interaction.inGuild()) {
+                let member = await interaction.guild.members.fetch(master.id);
+                if (member) avatar = member.displayAvatarURL(globalVars.displayAvatarSettings);
+            };
+
             let trophy_level = 0;
             let trophies = await user.getShopTrophies();
             let trophy_string = '';

package.json

@@ -5,9 +5,9 @@
   "main": "forever.js",
   "type": "module",
   "dependencies": {
-    "@pkmn/data": "^0.9.12",
-    "@pkmn/dex": "^0.9.12",
-    "@pkmn/sim": "^0.9.12",
+    "@pkmn/data": "^0.9.13",
+    "@pkmn/dex": "^0.9.13",
+    "@pkmn/sim": "^0.9.13",
     "axios": "^1.7.7",
     "canvas": "^2.11.2",
     "cron": "^3.1.7",