Skip to content

Commit cb401f8

Browse files
committed
Added @DCMenu to selection menu and also removed unused imports
1 parent 0d2e2d6 commit cb401f8

File tree

16 files changed

+18
-38
lines changed

16 files changed

+18
-38
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,10 @@ jobs:
4343
- name: Determine image tags and deploy environment
4444
id: tags
4545
run: |
46-
if [[ "${GITHUB_EVENT_NAME}" == "release" ]]; then
47-
VERSION=${{ github.event.release.tag_name }}
48-
echo "backend_tags=${{ env.BACKEND_IMAGE }}:${VERSION},${{ env.BACKEND_IMAGE }}:latest" >> $GITHUB_OUTPUT
49-
echo "frontend_tags=${{ env.FRONTEND_IMAGE }}:${VERSION},${{ env.FRONTEND_IMAGE }}:latest" >> $GITHUB_OUTPUT
50-
echo "deploy_env=production" >> $GITHUB_OUTPUT
51-
else
52-
echo "backend_tags=${{ env.BACKEND_IMAGE }}:stage-${GITHUB_SHA::7},${{ env.BACKEND_IMAGE }}:stage-latest" >> $GITHUB_OUTPUT
53-
echo "frontend_tags=${{ env.FRONTEND_IMAGE }}:stage-${GITHUB_SHA::7},${{ env.FRONTEND_IMAGE }}:stage-latest" >> $GITHUB_OUTPUT
54-
echo "deploy_env=stage" >> $GITHUB_OUTPUT
55-
fi
46+
VERSION=${{ github.event.release.tag_name }}
47+
echo "backend_tags=${{ env.BACKEND_IMAGE }}:${VERSION},${{ env.BACKEND_IMAGE }}:latest" >> $GITHUB_OUTPUT
48+
echo "frontend_tags=${{ env.FRONTEND_IMAGE }}:${VERSION},${{ env.FRONTEND_IMAGE }}:latest" >> $GITHUB_OUTPUT
49+
echo "deploy_env=production" >> $GITHUB_OUTPUT
5650
5751
build-backend:
5852
needs: detect-changes
@@ -128,4 +122,4 @@ jobs:
128122
port: ${{ secrets.SERVER_SSH_PORT }}
129123
script: |
130124
chmod +x ~/infra/deploy.sh
131-
~/infra/deploy.sh ${{ needs.detect-changes.outputs.deploy_env }}
125+
~/infra/deploy.sh production

backend/src/main/kotlin/org/vzbot/discord/commands/BlogCommand.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.ktbot.api.discord.components.commands.actionsenders.ActionSender
88
import com.ktbot.api.discord.components.commands.annotations.DCommand
99
import com.ktbot.api.discord.components.commands.annotations.DCommandOption
1010
import com.ktbot.api.discord.components.commands.annotations.DSubCommand
11-
import com.ktbot.api.util.TempFile
1211
import kotlinx.coroutines.runBlocking
1312
import net.dv8tion.jda.api.entities.Message
1413
import net.dv8tion.jda.api.interactions.components.ActionRow

backend/src/main/kotlin/org/vzbot/discord/commands/PrinterCommand.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import com.ktbot.api.discord.components.commands.actionsenders.ActionSender
88
import com.ktbot.api.discord.components.commands.annotations.DCommand
99
import com.ktbot.api.discord.components.commands.annotations.DCommandOption
1010
import com.ktbot.api.discord.components.commands.annotations.DSubCommand
11-
import net.dv8tion.jda.api.entities.Message
1211
import net.dv8tion.jda.api.interactions.components.ActionRow
1312
import net.dv8tion.jda.api.interactions.components.text.TextInput
1413
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle
15-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
1614
import org.jetbrains.exposed.sql.transactions.transaction
1715
import org.vzbot.discord.restrictions.TeamMemberRestriction
1816
import org.vzbot.io.*
19-
import org.vzbot.models.*
17+
import org.vzbot.models.Printer
18+
import org.vzbot.models.PrinterMedia
19+
import org.vzbot.models.PrinterProfile
20+
import org.vzbot.models.Printers
2021
import org.vzbot.models.generated.toModel
2122
import java.awt.Color
2223

backend/src/main/kotlin/org/vzbot/discord/commands/SerialCommand.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package org.vzbot.discord.commands
22

33
import com.ktbot.api.annotations.Restricted
4-
import com.ktbot.api.discord.components.DiscordModal
54
import com.ktbot.api.discord.components.commands.DiscordCommand
65
import com.ktbot.api.discord.components.commands.DiscordSubCommand
76
import com.ktbot.api.discord.components.commands.actionsenders.ActionSender
87
import com.ktbot.api.discord.components.commands.annotations.DCommand
98
import com.ktbot.api.discord.components.commands.annotations.DCommandOption
109
import com.ktbot.api.discord.components.commands.annotations.DSubCommand
1110
import com.ktbot.api.discord.components.custom.ConfirmModal
12-
import kotlinx.coroutines.*
11+
import kotlinx.coroutines.runBlocking
1312
import net.dv8tion.jda.api.entities.Message.Attachment
1413
import net.dv8tion.jda.api.interactions.components.ActionRow
1514
import net.dv8tion.jda.api.utils.FileUpload
@@ -23,7 +22,6 @@ import org.vzbot.discord.util.fetchFilesForSerial
2322
import org.vzbot.io.buildPrettyEmbed
2423
import org.vzbot.io.respondSuccess
2524
import org.vzbot.models.*
26-
import org.vzbot.models.generated.toModel
2725
import org.vzbot.plugins.geoClient
2826
import java.awt.Color
2927
import java.nio.file.Files

backend/src/main/kotlin/org/vzbot/discord/components/AcceptSerialRequestButton.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ import org.vzbot.discord.commands.fetchSerialTicket
2020
import org.vzbot.discord.restrictions.TeamMemberRestriction
2121
import org.vzbot.discord.restrictions.TicketRestrictions
2222
import org.vzbot.discord.util.fetchFilesForSerial
23-
import org.vzbot.io.*
23+
import org.vzbot.io.EnvVariables
24+
import org.vzbot.io.buildPrettyEmbed
25+
import org.vzbot.io.env
26+
import org.vzbot.io.prettyEmbed
2427
import org.vzbot.models.SerialNumber
2528
import java.awt.Color
26-
import java.io.File
2729

2830
@DCButton
2931
class AcceptSerialRequestButton: PermanentDiscordButton("vz_accept_serial", DiscordButton(label = "Accept", buttonStyle = ButtonStyle.SUCCESS, emoji = Emoji.fromUnicode("U+1F44D"))) {

backend/src/main/kotlin/org/vzbot/discord/components/DeleteTicketButton.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle
1212
import org.jetbrains.exposed.sql.transactions.transaction
1313
import org.vzbot.discord.commands.fetchSerialTicket
1414
import org.vzbot.discord.restrictions.TicketRestrictions
15-
import org.vzbot.io.buildPrettyEmbed
16-
import java.awt.Color
1715
import java.util.concurrent.TimeUnit
1816

1917
@DCButton

backend/src/main/kotlin/org/vzbot/discord/components/PrinterSelection.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.vzbot.discord.components
22

3+
import com.ktbot.api.annotations.DCSelection
34
import com.ktbot.api.discord.components.PermanentSimpleSelectionMenu
45
import com.ktbot.api.discord.components.SimpleSelectionMenu
56
import com.ktbot.api.discord.components.commands.actionsenders.ActionSender
@@ -13,6 +14,7 @@ import org.vzbot.models.Printer
1314
import org.vzbot.models.Printers
1415
import java.awt.Color
1516

17+
@DCSelection
1618
class PrinterSelection: PermanentSimpleSelectionMenu("vz_selection_printers", SimpleSelectionMenu("Please select your printer", options = transaction { Printer.all().map { SelectOption.of(it.name, it.name) }.toMutableList() }, maxOptions = 1, minOptions = 1 )) {
1719

1820
override fun execute(selections: List<String>, sender: ActionSender, hook: Message) {

backend/src/main/kotlin/org/vzbot/discord/util/SerialFileFetcher.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.vzbot.discord.util
22

3-
import net.dv8tion.jda.api.utils.FileUpload
43
import org.vzbot.io.BotLogger
54
import org.vzbot.io.EnvVariables
65
import org.vzbot.io.env

backend/src/main/kotlin/org/vzbot/io/EnvUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.vzbot.io
22

3+
import com.ktbot.api.util.EnvType
34
import io.github.cdimascio.dotenv.Dotenv
45
import io.github.cdimascio.dotenv.dotenv
56
import io.github.oshai.kotlinlogging.KotlinLogging
6-
import com.ktbot.api.util.EnvType
77

88
val mode: ProgramMode = ProgramMode.valueOf(System.getenv("VZ_MODE"))
99

backend/src/main/kotlin/org/vzbot/io/TeamLoader.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.vzbot.io
22

33
import com.ktbot.api.KtBot
44
import com.ktbot.api.util.scheduling.runRepeating
5-
import io.ktor.http.*
65
import org.vzbot.models.author
76
import org.vzbot.models.generated.BlogAuthorModelDTO
87
import org.vzbot.models.generated.toModel

0 commit comments

Comments
 (0)