Allow most commands in DMs

commands/auto/personalrole.js

@@ -1,11 +1,13 @@
 import Discord from "discord.js";
 import logger from "../../util/logger.js";
 import sendMessage from "../../util/sendMessage.js";
+import globalVars from "../../objects/globalVars.json" with { type: "json" };
 import isAdmin from "../../util/isAdmin.js";
 import colorHexes from "../../objects/colorHexes.json" with { type: "json" };
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let serverApi = await import("../../database/dbServices/server.api.js");
         serverApi = await serverApi.default();
         let adminBool = isAdmin(client, interaction.member);

commands/auto/role.js

@@ -6,6 +6,7 @@ import isAdmin from "../../util/isAdmin.js";
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let serverApi = await import("../../database/dbServices/server.api.js");
         serverApi = await serverApi.default();
         let ephemeralArg = interaction.options.getBoolean("ephemeral");

commands/info/roleinfo.js

@@ -5,6 +5,7 @@ import globalVars from "../../objects/globalVars.json" with { type: "json" };
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let ephemeralArg = interaction.options.getBoolean("ephemeral");
         if (ephemeralArg !== null) ephemeral = ephemeralArg;
         let role = interaction.options.getRole("role");

commands/info/serverinfo.js

@@ -5,11 +5,13 @@ import globalVars from "../../objects/globalVars.json" with { type: "json" };
 import isAdmin from "../../util/isAdmin.js";
 import languages from "../../objects/discord/languages.json" with { type: "json" };
 import verifLevels from "../../objects/discord/verificationLevels.json" with { type: "json" };
+import areEmotesAllowed from "../../util/areEmotesAllowed.js";
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
-        let adminBot = isAdmin(client, interaction.guild.members.me);
+        const emotesAllowed = areEmotesAllowed(client, interaction, ephemeral);
 
         let ephemeralArg = interaction.options.getBoolean("ephemeral");
         if (ephemeralArg !== null) ephemeral = ephemeralArg;
@@ -74,7 +76,7 @@ export default async (client, interaction, ephemeral) => {
                     boosterString = `${guild.premiumSubscriptionCount}/${boosterRequirementTier1}`;
             };
         };
-        if (guild.members.me.permissions.has(Discord.PermissionFlagsBits.UseExternalEmojis) || adminBot) boosterString = boosterString + nitroEmote;
+        if (emotesAllowed) boosterString = boosterString + nitroEmote;
         // Icon and banner
         let icon = guild.iconURL(globalVars.displayAvatarSettings);
         let banner = null;

commands/mod/ban.js

@@ -9,6 +9,7 @@ const requiredPermission = Discord.PermissionFlagsBits.BanMembers;
 
 export default async (client, interaction) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         if (!interaction.member.permissions.has(requiredPermission) && !adminBool) return sendMessage({ client: client, interaction: interaction, content: globalVars.lackPermsString });
 

commands/mod/kick.js

@@ -9,6 +9,7 @@ const requiredPermission = Discord.PermissionFlagsBits.KickMembers;
 
 export default async (client, interaction) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         if (!interaction.member.permissions.has(requiredPermission) && !adminBool) return sendMessage({ client: client, interaction: interaction, content: globalVars.lackPermsString });
 

commands/mod/modmail.js

@@ -28,6 +28,7 @@ modal.addComponents(actionRow1, actionRow2);
 
 export default async (client, interaction) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         if (!interaction.guild.features.includes("COMMUNITY") || !interaction.guild.publicUpdatesChannel) return sendMessage({ client: client, interaction: interaction, content: "This server has Community features disabled.\nThese are required for this command to work properly.\nMod mail will be sent to the same channel as community updates." });
 
         return interaction.showModal(modal);

commands/mod/mute.js

@@ -9,6 +9,7 @@ const requiredPermission = Discord.PermissionFlagsBits.ModerateMembers;
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         if (!interaction.member.permissions.has(requiredPermission) && !adminBool) return sendMessage({ client: client, interaction: interaction, content: globalVars.lackPermsString });
 

commands/mod/purge.js

@@ -8,7 +8,7 @@ const requiredPermission = Discord.PermissionFlagsBits.ManageMessages;
 
 export default async (client, interaction, ephemeral) => {
     try {
-
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         if (!interaction.member.permissions.has(requiredPermission) && !adminBool) return sendMessage({ client: client, interaction: interaction, content: globalVars.lackPermsString });
 

commands/mod/roleadd.js

@@ -8,6 +8,7 @@ const requiredPermission = Discord.PermissionFlagsBits.ManageRoles;
 
 export default async (client, interaction) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let serverApi = await import("../../database/dbServices/server.api.js");
         serverApi = await serverApi.default();
         let adminBoolBot = isAdmin(client, interaction.guild.members.me);

commands/mod/serversettings.js

@@ -9,6 +9,7 @@ const requiredPermission = Discord.PermissionFlagsBits.ManageGuild;
 
 export default async (client, interaction) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         if (!interaction.member.permissions.has(requiredPermission) && !adminBool) return sendMessage({ client: client, interaction: interaction, content: globalVars.lackPermsString });
         let ephemeral = true;

commands/mod/slowmode.js

@@ -8,6 +8,7 @@ const requiredPermission = Discord.PermissionFlagsBits.ManageChannels;
 
 export default async (client, interaction, ephemeral) => {
     try {
+        if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
         let adminBool = isAdmin(client, interaction.member);
         ephemeral = false;
         let slowmodeSupportedChannelTypes = [

commands/money/leaderboard.js

@@ -28,6 +28,7 @@ export default async (client, interaction, ephemeral) => {
                 .setDescription(leaderboardStringGlobal)
                 .setTitle(`Global Leaderboard:`);
         } else {
+            if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
             // Server leaderboard
             let icon = interaction.guild.iconURL(globalVars.displayAvatarSettings);
             let leaderboardString = money_db.filter(user => client.users.cache.get(user.user_id) && memberFetch.get(user.user_id))

commands/virtual_simulation/shinx.js

@@ -12,15 +12,15 @@ import playing_reaction from "../../util/shinx/getPlayingReaction.js";
 
 export default async (client, interaction, ephemeral) => {
     try {
+        // Every subcommand here except maybe "play" should be accessible in DMs honestly but I don't feel like rewriting them significantly for now to actually allow for that
         let ephemeralArg = interaction.options.getBoolean("ephemeral");
         if (ephemeralArg !== null) ephemeral = ephemeralArg;
 
-        let shinx, res;
+        let shinx, res, time;
         let canvas, ctx, img;
         let returnString = "";
-        let userFinder = await interaction.guild.members.fetch();
-        let messageFile = null;
-        let time;
+        let userFinder, messageFile = null;
+        if (interaction.inGuild()) userFinder = await interaction.guild.members.fetch();
 
         const now = new Date();
         let master = interaction.user;
@@ -37,7 +37,6 @@ export default async (client, interaction, ephemeral) => {
             case "info":
                 shinx = await getShinx(master.id);
                 const is_user_male = shinx.user_male;
-                const avatar = client.user.displayAvatarURL(globalVars.displayAvatarSettings);
 
                 canvas = Canvas.createCanvas(791, 441);
                 ctx = canvas.getContext('2d');
@@ -82,6 +81,7 @@ export default async (client, interaction, ephemeral) => {
                 return sendMessage({ client: client, interaction: interaction, files: messageFile, ephemeral: ephemeral });
                 break;
             case "feed":
+                if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
                 // let foodArg = interaction.options.getInteger("food");
                 res = await feedShinx(master.id);
                 switch (res) {
@@ -134,6 +134,7 @@ export default async (client, interaction, ephemeral) => {
                 });
                 break;
             case "play":
+                if (!interaction.inGuild()) return sendMessage({ client: client, interaction: interaction, content: globalVars.guildRequiredString });
                 shinx = await getShinx(master.id);
                 canvas = Canvas.createCanvas(578, 398);
                 ctx = canvas.getContext('2d');

events/interactionCreate.js

@@ -63,7 +63,6 @@ export default async (client, interaction) => {
         let pkmQuizModalId = 'pkmQuizModal';
         switch (interaction.type) {
             case Discord.InteractionType.ApplicationCommand:
-                if (!interaction.member) return sendMessage({ client: client, interaction: interaction, content: `Sorry, you're not allowed to use commands in private messages!\nThis is because a lot of the responses require a server to be present.\nDon't worry, similar to this message, most of my replies will be invisible to other server members!` });
                 // Grab the command data from the client.commands Enmap
                 let cmd;
                 let commandName = interaction.commandName.toLowerCase().replace(" ", "");

objects/globalVars.json

@@ -10,7 +10,8 @@
     "sysbotLogChannelID": "771363190780854293",
     "currency": "💰",
     "embedColor": "#219DCD",
-    "lackPerms": "You do not have the required permissions to do this.",
+    "lackPermsString": "You do not have the required permissions to do this.",
+    "guildRequiredString": "This command can only be used inside a server.",
     "starboardLimit": 3,
     "battling": {
         "yes": false

util/areEmotesAllowed.js

@@ -2,7 +2,7 @@ import Discord from "discord.js";
 import isAdmin from "./isAdmin.js";
 import logger from "./logger.js";
 
-export default (client, interaction, ephemeral) => {
+export default (client, interaction, ephemeral = true) => {
     try {
         if (!interaction.inGuild()) return true;
         let adminBot = isAdmin(client, interaction.guild.members.me);