From 52f39c71c7c99a87d6932bb61907a46d8e4cc36c Mon Sep 17 00:00:00 2001 From: Fnr Date: Sun, 6 Feb 2022 23:31:59 +0300 Subject: [PATCH 1/4] chore: bump discord.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 279dd5e..65c7524 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@discordjs/rest": "^0.1.0-canary.0", "colors": "^1.4.0", "discord-api-types": "^0.23.1", - "discord.js": "^13.3.1", + "discord.js": "^13.6.0", "dotenv": "^10.0.0", "humanize-duration": "^3.27.0", "ms": "^2.1.3", From dfc40123ef34c2cfc7b1aa366f3bcf5cb53efb9e Mon Sep 17 00:00:00 2001 From: Fnr Date: Sun, 6 Feb 2022 23:35:46 +0300 Subject: [PATCH 2/4] refactor: changed author / footer methods --- commands/ticket/config.js | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/commands/ticket/config.js b/commands/ticket/config.js index c3cef76..118b872 100644 --- a/commands/ticket/config.js +++ b/commands/ticket/config.js @@ -6,6 +6,9 @@ module.exports = { description: "Configuration ticket system.", options: configOptions, run: async(interaction, client) => { + const replyMessage = { + content: "Config has been set!" + } if (interaction.options.getSubcommand() === 'message') { const message = interaction.options.getString('message'); const content = interaction.options.getString('content') || null; @@ -14,9 +17,7 @@ module.exports = { data.message = message; data.content = content; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'category') { const channel = interaction.options.getChannel('category'); @@ -24,9 +25,7 @@ module.exports = { if (!data) data = {}; data.category = channel.id; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'color') { const success = interaction.options.getString('success'); @@ -35,9 +34,7 @@ module.exports = { if (!data) data = {}; data.success = resovleSuccess; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'role') { const staffRole = interaction.options.getRole('staff'); @@ -47,9 +44,7 @@ module.exports = { data.staff = staffRole.id; data.managers = managersRole.id; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'limit') { const limit = interaction.options.getInteger('limit'); @@ -57,9 +52,7 @@ module.exports = { if (!data) data = {}; data.limit = limit; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'name') { const ticketName = interaction.options.getString('name'); @@ -67,9 +60,7 @@ module.exports = { if (!data) data = {}; data.name = ticketName; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'log') { const logChannel = interaction.options.getChannel('channel'); @@ -77,9 +68,7 @@ module.exports = { if (!data) data = {}; data.log = logChannel.id; await client.db.set('config', interaction.guild.id, data); - return interaction.reply({ - content: "Config has been set!" - }) + return interaction.reply(replyMessage) } if (interaction.options.getSubcommand() === 'show') { const configData = await client.db.get('config', interaction.guild.id); @@ -90,9 +79,9 @@ module.exports = { }) } const embed = new MessageEmbed() - .setAuthor(interaction.guild.name, interaction.guild.iconURL()) + .setAuthor({ name: interaction.guild.name, iconURL: interaction.guild.iconURL() }) .setColor(configData.success) - .setFooter(interaction.user.tag, interaction.user.displayAvatarURL()) + .setFooter({ text: interaction.user.tag, iconURL: interaction.user.displayAvatarURL() }) .setTimestamp() if (configData.staff) { embed.addField('Staff Role:', `<@&${configData.staff}>`, true) From 33c393d6bfbecf45939adfcb8e5ea6736ee61414 Mon Sep 17 00:00:00 2001 From: Fnr Date: Sun, 6 Feb 2022 23:39:04 +0300 Subject: [PATCH 3/4] refactor: fix embed methods --- commands/general/ping.js | 2 +- commands/info/info.js | 2 +- commands/ticket/delete.js | 2 +- commands/ticket/new.js | 6 +++--- commands/ticket/open.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commands/general/ping.js b/commands/general/ping.js index 76910b0..df019b0 100644 --- a/commands/general/ping.js +++ b/commands/general/ping.js @@ -10,7 +10,7 @@ module.exports = { await interaction.reply('🏓 Pong!') const msg = await interaction.fetchReply() const embed = new Discord.MessageEmbed() - .setAuthor(interaction.user.tag, interaction.user.displayAvatarURL({ dynamic: true })) + .setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) .setColor('RANDOM') .setTimestamp() .setDescription(`**Time:** ${Math.floor(msg.createdTimestamp - interaction.createdTimestamp)} ms\n**API Ping:** ${client.ws.ping} ms`) diff --git a/commands/info/info.js b/commands/info/info.js index bacc9b8..c0152d9 100644 --- a/commands/info/info.js +++ b/commands/info/info.js @@ -21,7 +21,7 @@ module.exports = { .setTitle('__Bot Stats__') .setColor('RANDOM') .setThumbnail(client.user.displayAvatarURL()) - .setFooter(`© ${client.user.username} - Coded By Fnr#0017`) + .setFooter({ text: `© ${client.user.username} - Coded By Fnr#0017` }) .addFields( { name: " Total Guilds: ", diff --git a/commands/ticket/delete.js b/commands/ticket/delete.js index 2d03180..41a1ea4 100644 --- a/commands/ticket/delete.js +++ b/commands/ticket/delete.js @@ -34,7 +34,7 @@ module.exports = { const logChannel = interaction.guild.channels.cache.get(config.log); if (!logChannel) return; const embed = new MessageEmbed() - .setAuthor(interaction.user.tag, interaction.user.displayAvatarURL({ dynamic: true })) + .setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) .setDescription(`${interaction.user} deleted a **#${interaction.channel.name}** ticket.`) .addField("Ticket ID:", interaction.channel.id, true) .addField("Ticket Created At:", ``, true) diff --git a/commands/ticket/new.js b/commands/ticket/new.js index 8714ac0..fe4712c 100644 --- a/commands/ticket/new.js +++ b/commands/ticket/new.js @@ -63,10 +63,10 @@ module.exports = { number: filterGuildTickets.length + 1 }) const embed = new MessageEmbed() - .setAuthor(interaction.user.tag, interaction.user.displayAvatarURL({ dynamic: true })) + .setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) .setDescription(config.message) .setColor(config.success) - .setFooter(`${interaction.guild.name} Support`, interaction.guild.iconURL({ dynamic: true })) + .setFooter({ text: `${interaction.guild.name} Support`, iconURL: interaction.guild.iconURL({ dynamic: true }) }) .setTimestamp() ticketChannel.send({ content: config.content?.replaceAll('{username}', interaction.user.username) @@ -84,7 +84,7 @@ module.exports = { const logChannel = interaction.guild.channels.cache.get(config.log) if (!logChannel) return; const logEmbed = new MessageEmbed() - .setAuthor(interaction.user.tag, interaction.user.displayAvatarURL({ dynamic: true })) + .setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) .setThumbnail(interaction.user.displayAvatarURL({ dynamic: true })) .setDescription(`${interaction.user} Created a new ticket ${ticketChannel} (#${ticketChannel.name})`) .addField("Ticket ID:", ticketChannel.id, true) diff --git a/commands/ticket/open.js b/commands/ticket/open.js index 68f3c10..98f09b9 100644 --- a/commands/ticket/open.js +++ b/commands/ticket/open.js @@ -20,7 +20,7 @@ module.exports = { SEND_MESSAGES: true }); interaction.reply({ - content: `✅ Successfully re opened this ticket.` + content: `✅ Successfully reopened this ticket.` }) } } \ No newline at end of file From 16bcc4af9456916def52dab5aa7b71e4e1ec9e31 Mon Sep 17 00:00:00 2001 From: Fnr Date: Sun, 6 Feb 2022 23:43:47 +0300 Subject: [PATCH 4/4] update footer --- events/guild/interactionCreate.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/events/guild/interactionCreate.js b/events/guild/interactionCreate.js index 47e1993..c8016dd 100644 --- a/events/guild/interactionCreate.js +++ b/events/guild/interactionCreate.js @@ -24,7 +24,7 @@ module.exports = async(client, interaction) => { .setTitle('Missing Permission') .setDescription(`:x: You need \`${command.permission}\` permission to use this command`) .setColor('#ff0000') - .setFooter(interaction.user.tag, interaction.user.displayAvatarURL({ dynamic: true })) + .setFooter({ text: interaction.user.tag, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) .setTimestamp() return interaction.reply({ embeds: [embed], ephemeral: true }) } @@ -80,7 +80,7 @@ module.exports = async(client, interaction) => { if (selectedValues.includes(findCommand.name)) { const embed = new MessageEmbed() .setColor(interaction.guild.me.displayHexColor) - .setFooter(`Requested by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ dynamic: true })) + .setFooter({ text: `Requested by ${interaction.user.tag}`, iconURL: interaction.user.displayAvatarURL({ dynamic: true }) }) if (findCommand.name) { embed.setTitle(`Command: ${findCommand.name}`) }