feat: update errs, update reports

wdhdev · Jul 2, 2023 · e5bbcf8 · e5bbcf8
1 parent 9d67829
commit e5bbcf8
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 10 deletions.
diff --git a/src/buttons/logs/delete-message.js b/src/buttons/logs/delete-message.js
@@ -53,6 +53,8 @@ module.exports = {
                         deleted++;
                         resolve(true);
                     } catch(err) {
+                        client.logError(err);
+
                         resolve(false);
                     }
                 }))

diff --git a/src/commands/dev/admin.js b/src/commands/dev/admin.js
@@ -363,6 +363,8 @@ module.exports = {
 
                     await interaction.editReply({ embeds: [sent] });
                 } catch(err) {
+                    client.logError(err);
+
                     const error = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.error)
                         .setDescription(`${emoji.error} The appeal menu could not be sent.`)
@@ -437,6 +439,8 @@ module.exports = {
 
                     await interaction.editReply({ embeds: [sent] });
                 } catch(err) {
+                    client.logError(err);
+
                     const error = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.error)
                         .setDescription(`${emoji.error} The list could not be sent.`)
@@ -503,7 +507,7 @@ module.exports = {
                 const verifiedUsers = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.default)
                 	.setTitle("✅ Verified Users")
-                    .setDescription(`<@${users.join(">\n<@")}>`)
+                    .setDescription(`<@${users.join(">, <@")}>`)
 
                 await interaction.editReply({ embeds: [verifiedUsers] });
                 return;

diff --git a/src/commands/info/developers.js b/src/commands/info/developers.js
@@ -33,7 +33,7 @@ module.exports = {
             const developers = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)
                 .setTitle("💻 Developers")
-                .setDescription(`<@${users.join(">\n<@")}>`)
+                .setDescription(`<@${users.join(">, <@")}>`)
 
             await interaction.editReply({ embeds: [developers] });
         } catch(err) {

diff --git a/src/commands/info/moderators.js b/src/commands/info/moderators.js
@@ -33,7 +33,7 @@ module.exports = {
             const moderators = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)
                 .setTitle("🔨 Moderators")
-                .setDescription(`<@${users.join(">\n<@")}>`)
+                .setDescription(`<@${users.join(">, <@")}>`)
 
             await interaction.editReply({ embeds: [moderators] });
         } catch(err) {

diff --git a/src/commands/info/supporters.js b/src/commands/info/supporters.js
@@ -33,7 +33,7 @@ module.exports = {
             const supporters = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)
                 .setTitle("💖 Supporters")
-                .setDescription(`<@${users.join(">\n<@")}>`)
+                .setDescription(`<@${users.join(">, <@")}>`)
 
             await interaction.editReply({ embeds: [supporters] });
         } catch(err) {

diff --git a/src/commands/user/suggest.js b/src/commands/user/suggest.js
@@ -47,7 +47,7 @@ module.exports = {
                 message.react(`${emoji.tick}`);
                 message.react(`${emoji.cross}`);
             } catch(err) {
-                client.logCommandError(err, interaction, Discord);
+                client.logError(err);
 
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)

diff --git a/src/context-menu/message/Report Message.js b/src/context-menu/message/Report Message.js
@@ -7,7 +7,7 @@ module.exports = {
 	name: "Report Message",
     type: 3,
     botPermissions: [],
-    cooldown: 3,
+    cooldown: 30,
     enabled: true,
     hidden: false,
 	async execute(interaction, client, Discord) {
@@ -26,6 +26,15 @@ module.exports = {
             const data = await messageSchema.findOne({ messages: message.url });
             const reportChannel = client.channels.cache.get(client.config_channels.reports);
 
+            if(data.user === interaction.user.id) {
+                const error = new Discord.EmbedBuilder()
+                    .setColor(client.config_embeds.error)
+                    .setDescription(`${emoji.error} You can't report yourself!`)
+
+                await interaction.editReply({ embeds: [error], ephemeral: true });
+                return;
+            }
+
             try {
                 const report = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.default)
@@ -49,7 +58,7 @@ module.exports = {
                             .setStyle(Discord.ButtonStyle.Secondary)
                             .setCustomId(`delete-message-${data._id}`)
                             .setEmoji("🗑️")
-                            .setLabel("Delete Message")
+                            .setLabel("Delete")
                     )
 
                 const msgData = await messageSchema.findOne({ messages: message.url });
@@ -70,9 +79,9 @@ module.exports = {
                 if(msgData.content) messageEmbed.setDescription(msgData.content);
                 if(msgData.attachment) messageEmbed.setImage(msgData.attachment);
 
-                reportChannel.send({ embeds: [report, messageEmbed], components: [actions] });
+                reportChannel.send({ content: `<@&${client.config_roles.mod}>`, embeds: [report, messageEmbed], components: [actions] });
             } catch(err) {
-                client.logContextError(err, interaction, Discord);
+                client.logError(err);
 
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)

diff --git a/src/handlers/event.js b/src/handlers/event.js
@@ -3,6 +3,10 @@ module.exports = (client, Discord) => {
 
     load(client, Discord);
 
+    client.logError = async function(err) {
+        client.sentry.captureException(err);
+    }
+
     client.logEventError = async function(err) {
         client.sentry.captureException(err);
     }

diff --git a/src/util/interaction/button.js b/src/util/interaction/button.js
@@ -29,7 +29,7 @@ module.exports = async (client, Discord, interaction) => {
 
                     const error = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.error)
-                        .setDescription(`${emoji.error} There was an error while executing that command!`)
+                        .setDescription(`${emoji.error} There was an error while executing that button!`)
 
                     await interaction.reply({ embeds: [error], ephemeral: true });
                 }