-
Notifications
You must be signed in to change notification settings - Fork 4
Feat/new db format #80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TheBjoRedCraft
wants to merge
11
commits into
version/6.0.0
Choose a base branch
from
feat/new-db-format
base: version/6.0.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f12cae4
feat: add CreateWhitelistCommand for managing whitelists
TheBjoRedCraft fc2541e
chore: update version to 6.0.19-SNAPSHOT
TheBjoRedCraft 62387c8
feat: update CreateWhitelistCommand to use 'discord-user' option and …
TheBjoRedCraft 069e142
feat: update whitelist delete modal title for clarity
TheBjoRedCraft 4d226b7
feat: enhance whitelist editing functionality with error handling and…
TheBjoRedCraft a733222
feat: add role assignment for whitelisted users in CreateWhitelistCom…
TheBjoRedCraft d4924fa
feat: simplify description for external error in TicketCloseReason
TheBjoRedCraft 037b033
feat: enhance ticket leave handling with user feedback and logging
TheBjoRedCraft 1c2eb11
feat: improve welcome message for returning users in TicketLeaveListener
TheBjoRedCraft 42574e8
feat: simplify user member check in TicketLeaveListener
TheBjoRedCraft 3b00422
feat: implement migration to new social connections and whitelist tables
TheBjoRedCraft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| version=6.0.18-SNAPSHOT | ||
| version=6.0.20-SNAPSHOT |
23 changes: 23 additions & 0 deletions
23
src/main/kotlin/dev/slne/surf/discord/command/console/impl/SocialsMigrationCommand.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package dev.slne.surf.discord.command.console.impl | ||
|
|
||
| import dev.slne.surf.discord.command.console.ConsoleCommand | ||
| import dev.slne.surf.discord.ticket.database.whitelist.SocialsMigration | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.launch | ||
| import org.springframework.stereotype.Component | ||
|
|
||
| @Component | ||
| class SocialsMigrationCommand( | ||
| private val discordScope: CoroutineScope | ||
| ) : ConsoleCommand { | ||
| override val name = "migrate-socials" | ||
|
|
||
| override fun execute(args: List<String>) { | ||
| discordScope.launch { | ||
| println("Starting social whitelist migration...") | ||
| SocialsMigration.migrateLegacy() | ||
|
|
||
| println("\nMigration finished.") | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/main/kotlin/dev/slne/surf/discord/ticket/command/whitelist/CreateWhitelistCommand.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package dev.slne.surf.discord.ticket.command.whitelist | ||
|
|
||
| import dev.minn.jda.ktx.coroutines.await | ||
| import dev.slne.surf.discord.command.CommandOption | ||
| import dev.slne.surf.discord.command.CommandOptionType | ||
| import dev.slne.surf.discord.command.DiscordCommand | ||
| import dev.slne.surf.discord.command.SlashCommand | ||
| import dev.slne.surf.discord.config.botConfig | ||
| import dev.slne.surf.discord.jda | ||
| import dev.slne.surf.discord.messages.translatable | ||
| import dev.slne.surf.discord.permission.DiscordPermission | ||
| import dev.slne.surf.discord.permission.hasPermission | ||
| import dev.slne.surf.discord.ticket.database.whitelist.SocialService | ||
| import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent | ||
| import org.springframework.stereotype.Component | ||
|
|
||
| @DiscordCommand( | ||
| name = "wl-create", | ||
| description = "Whitelist Eintrag erstellen", | ||
| options = [CommandOption( | ||
| name = "discord-user", | ||
| description = "Der Discord Nutzer, der gewhitelisted werden soll", | ||
| type = CommandOptionType.USER, | ||
| required = true | ||
| ), | ||
| CommandOption( | ||
| name = "minecraft-name", | ||
| description = "Der Minecraft Name, der gewhitelisted werden soll.", | ||
| type = CommandOptionType.STRING, | ||
| required = true | ||
| )] | ||
| ) | ||
| @Component | ||
| class CreateWhitelistCommand( | ||
| private val socialService: SocialService | ||
| ) : SlashCommand { | ||
| override suspend fun execute(event: SlashCommandInteractionEvent) { | ||
| if (!event.member.hasPermission(DiscordPermission.WHITELIST_CREATE)) { | ||
| event.reply(translatable("no-permission")).setEphemeral(true).queue() | ||
| return | ||
| } | ||
|
|
||
| val userId = event.getOption("discord-user")?.asUser?.idLong ?: return | ||
| val minecraftName = event.getOption("minecraft-name")?.asString ?: return | ||
|
|
||
| if (socialService.getWhitelist(userId) != null) { | ||
| event.reply(translatable("whitelist.command.already-whitelisted.discord")) | ||
| .setEphemeral(true) | ||
| .queue() | ||
| return | ||
| } | ||
|
|
||
| if (socialService.getWhitelist(minecraftName) != null) { | ||
| event.reply(translatable("whitelist.command.already-whitelisted.minecraft")) | ||
| .setEphemeral(true) | ||
| .queue() | ||
| return | ||
| } | ||
|
|
||
| val whitelist = socialService.whitelist(userId, minecraftName) | ||
|
|
||
| val discordUser = event.jda.retrieveUserById(userId).await() | ||
|
|
||
| jda.guilds.forEach { | ||
| val role = it.getRoleById(botConfig.whitelistedRoleId) ?: return@forEach | ||
| it.addRoleToMember(discordUser, role).queue() | ||
| } | ||
|
|
||
| event.reply( | ||
| translatable( | ||
| "whitelist.command.create.success", | ||
| "<@${whitelist?.discordId}>", | ||
| whitelist?.getMinecraftName() ?: whitelist?.minecraftUuid.toString() | ||
| ) | ||
| ) | ||
|
Comment on lines
+60
to
+75
|
||
| .setEphemeral(true) | ||
| .queue() | ||
| } | ||
| } | ||
9 changes: 9 additions & 0 deletions
9
src/main/kotlin/dev/slne/surf/discord/ticket/database/util/AuditableLongIdTable.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package dev.slne.surf.discord.ticket.database.util | ||
|
|
||
| import dev.slne.surf.discord.ticket.database.column.offsetDateTime | ||
| import org.jetbrains.exposed.v1.core.dao.id.LongIdTable | ||
|
|
||
| open class AuditableLongIdTable(name: String) : LongIdTable(name) { | ||
| val createdAt = offsetDateTime("created_at") | ||
| val updatedAt = offsetDateTime("updated_at") | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
old-discord-idis used as the record selector for updates, but it's a normal editable text input. Despite the label warning, users can accidentally change it and end up editing a different whitelist entry than intended. Consider not taking this value from user input (e.g., keep the original ID in server-side state / modal custom-id payload), or at least validating it against the originally opened entry before applying changes.