From 2c0c25f55d9953edad1c6758758e2527556327fb Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Mon, 3 Apr 2023 17:17:35 -0700 Subject: [PATCH] debug last commit? --- commands/config.js | 71 +++++++++++++++++++------------------- package.json | 2 +- structures/DayzArmbands.js | 4 +-- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/commands/config.js b/commands/config.js index aa0ab78..b7bd97c 100644 --- a/commands/config.js +++ b/commands/config.js @@ -331,49 +331,50 @@ module.exports = { } else client.error('exception?'); } else if (args[0].name == 'bot_admin_role') { - - if (args[0].options[0].value == 'add') { - const roleId = args[0].options[1].value; - - client.dbo.collection("guilds").updateOne({"server.serverID":GuildDB.serverID},{$push: {"server.botAdminRoles": roleId}}, function(err, res) { - if (err) return client.sendInternalError(interaction, err); - }); - - const successEmbed = new EmbedBuilder() - .setDescription(`Successfully added <@&${roleId}> as a bot admin role.\nUsers with this role can use restricted commands.`) - .setColor(client.config.Colors.Green); - - return interaction.send({ embeds: [successEmbed] }); - } else if (args[0].options[0].value== 'remove') { + if (args[0].options[0].value == 'add') { - if (!GuildDB.botADminRoles.includes(args[0].options[1].value)) { - const noRole = new EmbedBuilder() - .setColor(client.config.Colors.Yellow) - .setDescription(`**Notice:**\n> The role <@&${args[0].options[1].value}> has not been configured as a bot admin.`); + const roleId = args[0].options[1].value; - return interaction.send({ embeds: [noRole] }); - } + client.dbo.collection("guilds").updateOne({"server.serverID":GuildDB.serverID},{$push: {"server.botAdminRoles": roleId}}, function(err, res) { + if (err) return client.sendInternalError(interaction, err); + }); + + const successEmbed = new EmbedBuilder() + .setDescription(`Successfully added <@&${roleId}> as a bot admin role.\nUsers with this role can use restricted commands.`) + .setColor(client.config.Colors.Green); + + return interaction.send({ embeds: [successEmbed] }); - const prompt = new EmbedBuilder() - .setTitle(`Are you sure you want to remove this role as a bot admin?`) - .setColor(client.config.Colors.Default) + } else if (args[0].options[0].value== 'remove') { - const opt = new ActionRowBuilder() - .addComponents( - new ButtonBuilder() - .setCustomId(`RemoveBotAdminRole-yes-${args[0].options[1].value}-${interaction.member.user.id}`) - .setLabel("Yes") - .setStyle(ButtonStyle.Danger), - new ButtonBuilder() - .setCustomId(`RemoveBotAdminRole-no-${args[0].options[1].value}-${interaction.member.user.id}`) - .setLabel("No") - .setStyle(ButtonStyle.Success) - ) + if (!GuildDB.botADminRoles.includes(args[0].options[1].value)) { + const noRole = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription(`**Notice:**\n> The role <@&${args[0].options[1].value}> has not been configured as a bot admin.`); - return interaction.send({ embeds: [prompt], components: [opt], flags: (1 << 6) }); + return interaction.send({ embeds: [noRole] }); } + const prompt = new EmbedBuilder() + .setTitle(`Are you sure you want to remove this role as a bot admin?`) + .setColor(client.config.Colors.Default) + + const opt = new ActionRowBuilder() + .addComponents( + new ButtonBuilder() + .setCustomId(`RemoveBotAdminRole-yes-${args[0].options[1].value}-${interaction.member.user.id}`) + .setLabel("Yes") + .setStyle(ButtonStyle.Danger), + new ButtonBuilder() + .setCustomId(`RemoveBotAdminRole-no-${args[0].options[1].value}-${interaction.member.user.id}`) + .setLabel("No") + .setStyle(ButtonStyle.Success) + ) + + return interaction.send({ embeds: [prompt], components: [opt], flags: (1 << 6) }); + } + } else if (args[0].name == 'admin_role') { client.dbo.collection("guilds").updateOne({"server.serverID":GuildDB.serverID},{$set: {"server.adminRole": args[0].options[0].value}}, function(err, res) { if (err) return client.sendInternalError(interaction, err); diff --git a/package.json b/package.json index bb52b8e..2d5517d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayz-armbands", - "version": "6.0.0", + "version": "6.0.1", "description": "A General Purpose Discord Bot for DayZ Servers.", "main": "index.js", "nodemonConfig": { diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js index e4d1882..b62cc25 100644 --- a/structures/DayzArmbands.js +++ b/structures/DayzArmbands.js @@ -166,9 +166,9 @@ class DayzArmbands extends Client { if (this.config.Dev != 'PROD.') console.log('---- tick ----'); this.activePlayersTick++; - await DownloadNitradoFile(`/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => { + await DownloadNitradoFile(this, `/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => { await this.readLogs(this.config.GuildID).then(async () => { - if (this.activePlayersTick == 12) await HandleActivePlayersList(this.config.GuildID); + if (this.activePlayersTick == 12) await HandleActivePlayersList(this, this.config.GuildID); }) }); this.logsUpdateTimer(); // restart this function