diff --git a/.DS_Store b/.DS_Store old mode 100644 new mode 100755 index 3eeca27..5d17b2d Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.dockerignore b/.dockerignore old mode 100644 new mode 100755 diff --git a/.eslintrc.json b/.eslintrc.json old mode 100644 new mode 100755 diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml old mode 100644 new mode 100755 diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 0edf60a..da7938b --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,4 @@ WORKDIR /usr/src/app COPY package.json ./ RUN npm install COPY . . -CMD [ "node", "main.js" ] \ No newline at end of file +CMD ["/bin/sh", "-c", "node main.js 2> /logs/error.log 1> /logs/silvanus.log"] \ No newline at end of file diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/TODO.md b/TODO.md old mode 100644 new mode 100755 diff --git a/data/config.json b/data/config.json old mode 100644 new mode 100755 diff --git a/data/strings.json b/data/strings.json old mode 100644 new mode 100755 diff --git a/main.js b/main.js old mode 100644 new mode 100755 diff --git a/modules/CustomClasses.js b/modules/CustomClasses.js old mode 100644 new mode 100755 index ff7d714..17abb1d --- a/modules/CustomClasses.js +++ b/modules/CustomClasses.js @@ -54,9 +54,9 @@ module.exports = { this.watchChannelId = watchChannelId; return this; } - setRoles(waterRoleId, fruitRoleId) { - this.waterRoleId = waterRoleId; - if (fruitRoleId) this.fruitRoleId = fruitRoleId; + setRoles(waterRole, fruitRole) { + this.waterRoleId = waterRole.id; + if (fruitRole) this.fruitRoleId = fruitRole.id; return this; } queryBuilder(query) { @@ -127,11 +127,18 @@ module.exports = { return queryParts.join(''); break; case "setRoles": - queryParts = [ - `UPDATE guild_info SET water_role_id = ${db.escape(this.waterRoleId)}, `, - `fruit_role_id = ${db.escape(this.fruitRoleId)} `, - `WHERE guild_id = ${db.escape(this.guildId)}` - ]; + if (this.fruitRoleId != "") { + queryParts = [ + `UPDATE guild_info SET water_role_id = ${db.escape(this.waterRoleId)}, `, + `fruit_role_id = ${db.escape(this.fruitRoleId)} `, + `WHERE guild_id = ${db.escape(this.guildId)}` + ]; + } else { + queryParts = [ + `UPDATE guild_info SET water_role_id = ${db.escape(this.waterRoleId)} `, + `WHERE guild_id = ${db.escape(this.guildId)}` + ]; + } return queryParts.join(''); break; default: diff --git a/modules/_clear-commands.js b/modules/_clear-commands.js old mode 100644 new mode 100755 diff --git a/modules/_deploy-commands.js b/modules/_deploy-commands.js old mode 100644 new mode 100755 diff --git a/modules/_deploy-global.js b/modules/_deploy-global.js old mode 100644 new mode 100755 diff --git a/modules/_prepareStrings.js b/modules/_prepareStrings.js old mode 100644 new mode 100755 diff --git a/modules/dbfn.js b/modules/dbfn.js old mode 100644 new mode 100755 diff --git a/modules/functions.js b/modules/functions.js old mode 100644 new mode 100755 index ef1f18d..4079141 --- a/modules/functions.js +++ b/modules/functions.js @@ -70,12 +70,12 @@ const functions = { ); return refreshActionRow; }, - treeRoleMenu() { - return new ActionRowBuilder() - .addComponents( - this.buttons.waterPing(), - this.buttons.fruitPing() - ); + treeRoleMenu(fruit) { + let actionRow = new ActionRowBuilder().addComponents(this.buttons.waterPing()); + if (fruit) { + actionRow.addComponents(this.buttons.fruitPing()); + } + return actionRow; }, buttons: { acceptRules() { @@ -100,10 +100,10 @@ const functions = { }, embeds: { treeRoleMenu(guildInfo) { - const actionRow = functions.builders.actionRows.treeRoleMenu(); + const actionRow = functions.builders.actionRows.treeRoleMenu(guildInfo.fruitRoleId == "" ? false : true); let tempStrings = strings.embeds.treeRoleMenu; let description = tempStrings[0] + tempStrings[1] + `<@&${guildInfo.waterRoleId}>` + tempStrings[2]; - if (guildInfo.fruitRoleId != undefined) { + if (guildInfo.fruitRoleId != "") { description += tempStrings[3] + `<@&${guildInfo.fruitRoleId}>` + tempStrings[4]; } const embed = new EmbedBuilder() diff --git a/modules/testing.js b/modules/testing.js old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/slash-commands/.DS_Store b/slash-commands/.DS_Store old mode 100644 new mode 100755 diff --git a/slash-commands/commands.js b/slash-commands/commands.js old mode 100644 new mode 100755 diff --git a/slash-commands/compare.js b/slash-commands/compare.js old mode 100644 new mode 100755 diff --git a/slash-commands/help.js b/slash-commands/help.js old mode 100644 new mode 100755 diff --git a/slash-commands/notifications.js b/slash-commands/notifications.js old mode 100644 new mode 100755 diff --git a/slash-commands/optout.js b/slash-commands/optout.js old mode 100644 new mode 100755 diff --git a/slash-commands/reset.js b/slash-commands/reset.js old mode 100644 new mode 100755 diff --git a/slash-commands/rolemenu.js b/slash-commands/rolemenu.js old mode 100644 new mode 100755 index 4fe096d..d10f7c3 --- a/slash-commands/rolemenu.js +++ b/slash-commands/rolemenu.js @@ -19,7 +19,7 @@ module.exports = { await interaction.deferReply().catch(err => console.error(err)); if (interaction.client.guildInfos.has(interaction.guildId)) { let guildInfo = interaction.client.guildInfos.get(interaction.guildId); - guildInfo.setRoles(interaction.options.getRole('waterrole').id, interaction.options.getRole('fruitrole').id); + guildInfo.setRoles(interaction.options.getRole('waterrole'), interaction.options.getRole('fruitrole')); await dbfn.setGuildInfo(guildInfo.queryBuilder("setRoles")); await fn.collectionBuilders.guildInfos(interaction.client); await interaction.editReply(fn.builders.embeds.treeRoleMenu(guildInfo)).catch(err => console.error(err)); diff --git a/slash-commands/setup.js b/slash-commands/setup.js old mode 100644 new mode 100755 diff --git a/slash-commands/setupinfo.js b/slash-commands/setupinfo.js old mode 100644 new mode 100755 diff --git a/slash-commands/template b/slash-commands/template old mode 100644 new mode 100755 diff --git a/slash-commands/timetoheight.js b/slash-commands/timetoheight.js old mode 100644 new mode 100755 diff --git a/slash-commands/watertime.js b/slash-commands/watertime.js old mode 100644 new mode 100755