Merge branch 'master' into starboard

Author: TheMonDon

commands/Items/create-item.js

@@ -38,7 +38,7 @@ class CreateItem extends Command {
     const storeSize = Object.keys(store).length;
     if (storeSize > 50) {
       return msg.channel.send(
-        'The store has reached the maximum number of items allowed. Please use `delete-item` to delete some before creating more.',
+        'The store has reached the maximum number of items allowed (50). Please use `delete-item` to delete some before creating more.',
       );
     }
 

commands/Logging/log-system.js

@@ -17,12 +17,13 @@ class logSystem extends Command {
   }
 
   async run(msg) {
-    if (!(await db.get(`servers.${msg.guild.id}.logs.channel`)))
+    if (!(await db.get(`servers.${msg.guild.id}.logs.channel`))) {
       return msg.channel.send(`The log system is not set up! Use \`${msg.settings.prefix}Setup Logging <Channel>\``);
+    }
 
     async function getLogInfo(guildId, logType) {
       const logValue = await db.get(`servers.${guildId}.logs.logSystem.${logType}`);
-      return logValue === 'enabled' ? 'Enabled' : ':x:';
+      return logValue === 'enabled' ? '✅' : '❌';
     }
 
     async function getAllLogInfo(msg) {
@@ -62,14 +63,11 @@ class logSystem extends Command {
     }
 
     const logOutput = await getAllLogInfo(msg);
+    const logChannel = await db.get(`servers.${msg.guild.id}.logs.channel`);
 
     const embed = new EmbedBuilder().setColor(msg.settings.embedColor).addFields([
-      {
-        name: 'Toggle Status',
-        value: logOutput,
-        inline: true,
-      },
-      { name: 'Log Channel', value: `<#${await db.get(`servers.${msg.guild.id}.logs.channel`)}>` },
+      { name: 'Toggle Status', value: logOutput, inline: true },
+      { name: 'Log Channel', value: `<#${logChannel}>` },
     ]);
 
     return msg.channel.send({ embeds: [embed] });

events/Bot/ready.mjs

@@ -172,8 +172,8 @@ export async function run(client) {
           const timeDiff = Date.now() - leaveTimestamp;
           if (timeDiff >= 2592000000) {
             await db.delete(`servers.${serverId}`);
-            this.client.settings.delete(serverId);
-            this.client.logger.log(`Deleted server data for ${serverId}.`);
+            client.settings.delete(serverId);
+            client.logger.log(`Deleted server data for ${serverId}.`);
           }
         }
       }

slash_commands/Moderator/warn.js

@@ -9,7 +9,7 @@ exports.conf = {
 exports.commandData = new SlashCommandBuilder()
   .setName('warn')
   .setContexts(InteractionContextType.Guild)
-  .setDescription('Warns a user, by default members are kicked at 8 and banned at 10 points.')
+  .setDescription('Warn a user')
   .addUserOption((option) => option.setName('user').setDescription('The user you want to warn').setRequired(true))
   .addStringOption((option) =>
     option.setName('reason').setDescription('Why you are warning the user').setRequired(true),