From 7f876f4555d0a88e07ec80987251e03464f03bb8 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Sun, 29 Sep 2024 13:01:25 -0400 Subject: [PATCH] Add a dev workflow --- .gitea/workflows/dev-docker | 45 +++++++++++++++++++++++++++++++++ CustomModules/ButtonHandlers.js | 8 ++++++ CustomModules/Embeds.js | 27 +++++++++++++++++++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/dev-docker diff --git a/.gitea/workflows/dev-docker b/.gitea/workflows/dev-docker new file mode 100644 index 0000000..37e96fb --- /dev/null +++ b/.gitea/workflows/dev-docker @@ -0,0 +1,45 @@ +name: NodBot PE Dockerization + +on: + push: + tags: + - 'v*-dev*' + +env: + DHUB_UNAME: ${{ secrets.DHUB_UNAME }} + DHUB_PWORD: ${{ secrets.DHUB_PWORD }} + +jobs: + build: + runs-on: self-hosted + steps: + - name: Pull latest from Git + run: | + echo "Branch: ${{ gitea.ref_name }}" + pwd + whoami + mkdir -p /var/lib/act_runner/ + cd /var/lib/act_runner/ + if [ ! -d "nodbot" ]; then + git clone https://git.vfsh.dev/voidf1sh/nodbot-dev + cd nodbot-dev + else + cd nodbot-dev + git pull + fi + git checkout ${{ gitea.ref_name }} + - name: Build the Docker image + run: | + cd /var/lib/act_runner/nodbot-dev + docker build . --file Dockerfile --tag v0idf1sh/nodbot-dev + - name: Log into Docker Hub + run: docker login -u $DHUB_UNAME -p $DHUB_PWORD + - name: Push image to Docker Hub + run: | + cd /var/lib/act_runner/nodbot-dev + docker push v0idf1sh/nodbot-dev + - name: Restart the container + run: | + cd /srv/docker/nodbot-dev + docker-compose down + docker-compose up -d \ No newline at end of file diff --git a/CustomModules/ButtonHandlers.js b/CustomModules/ButtonHandlers.js index f059370..57db6d6 100644 --- a/CustomModules/ButtonHandlers.js +++ b/CustomModules/ButtonHandlers.js @@ -52,6 +52,9 @@ module.exports = { case 'cancelGif': module.exports.gifSearchPage(interaction); break; + case 'closeRequests': + module.exports.closeRequests(interaction); + break; default: return; } @@ -199,5 +202,10 @@ module.exports = { const gifEmbed = customEmbeds.core.gifSearch({ author: interaction.user.username }, indexedGifs); // Update the interaction interaction.update({ embeds: [gifEmbed], components: [gifSearchAR], ephemeral: true }); + }, + closeRequests(interaction) { + const closeRequestModal = customEmbeds.modals.closeRequestsModal(); + interaction.showModal(closeRequestModal); + interaction.update({ content: 'The requests menu has been closed.', components: [] }); } } \ No newline at end of file diff --git a/CustomModules/Embeds.js b/CustomModules/Embeds.js index 95f40cb..4a76665 100644 --- a/CustomModules/Embeds.js +++ b/CustomModules/Embeds.js @@ -1,4 +1,4 @@ -const { MessageActionRow, MessageButton, MessageEmbed } = require('discord.js'); +const { MessageActionRow, MessageButton, MessageEmbed, TextInputComponent } = require('discord.js'); module.exports = { actionRows: { @@ -73,6 +73,11 @@ module.exports = { .setCustomId('nextRequestsPage') .setLabel('➡️') .setStyle('SECONDARY'); + + const closeButton = new MessageButton() + .setCustomId('closeRequests') + .setLabel('Close Requests') + .setStyle('DANGER'); switch (state) { case 'first': @@ -138,6 +143,26 @@ module.exports = { .addComponents(previousButton, nextButton); } }, + modals: { + closeRequestsModal() { + const requestNumberInput = new TextInputComponent() + .setCustomId('requestNumber') + .setLabel('Request Number') + .setPlaceholder('420') + .setMinLength(1) + .setMaxLength(5) + .setStyle('SHORT') + .setRequired(true); + + const actionRow = new MessageActionRow() + .addComponents([requestNumberInput]); + + return new Modal() + .setTitle('Close Request') + .setDescription('Please enter the number of the request you would like to close.') + .addComponents([actionRow]); + } + }, core: { gifSearch(commandData, indexedGifs) { return new MessageEmbed()