From 5f7b70fd8fd1c35cf5da3c0ccaf64fd4b870bd0b Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Mon, 4 Nov 2024 22:32:21 +0100 Subject: [PATCH] Upgrade kordex gradle plugin --- .../schlaubi/mikbot/core/gdpr/InfoCommand.kt | 12 ++++++------ .../schlaubi/mikbot/core/health/Rebalancer.kt | 6 +++--- .../core/redeploy_hook/RedeployCommand.kt | 2 +- gradle/libs.versions.toml | 4 ++-- .../schlaubi/mikmusic/commands/FixCommand.kt | 18 +++++++++--------- .../schlaubi/mikmusic/commands/MoveCommand.kt | 7 +++---- .../schlaubi/mikmusic/commands/NextCommand.kt | 2 +- .../mikmusic/commands/NowPlayingCommand.kt | 16 ++++++++-------- .../schlaubi/mikmusic/commands/QueueCommand.kt | 6 +++--- .../schlaubi/mikmusic/commands/RadioCommand.kt | 4 ++-- .../mikmusic/commands/RemoveCommand.kt | 6 +++--- .../mikmusic/commands/SchedulerCommands.kt | 8 ++++---- .../schlaubi/mikmusic/commands/SeekCommand.kt | 2 +- .../schlaubi/mikmusic/commands/SkipCommand.kt | 4 ++-- .../mikmusic/context/PlayMessageAction.kt | 2 +- .../core/settings/commands/DjModeCommand.kt | 8 ++++---- .../core/settings/commands/FixMusicChannel.kt | 8 ++++---- .../settings/commands/LeaveTimeoutCommand.kt | 12 ++++++------ .../settings/commands/SponsorBlockCommand.kt | 4 ++-- .../mikmusic/playlist/commands/AddCommand.kt | 4 ++-- .../mikmusic/playlist/commands/Common.kt | 6 +++--- .../mikmusic/playlist/commands/ListCommand.kt | 4 ++-- .../playlist/commands/RemoveCommand.kt | 2 +- .../playlist/commands/RenameCommand.kt | 4 ++-- .../mikmusic/playlist/commands/SaveCommand.kt | 6 +++--- .../mikmusic/playlist/commands/SongsCommand.kt | 2 +- .../commands/ToggleVisibilityCommand.kt | 8 ++++---- music/lyrics/src/main/kotlin/KaraokeCommand.kt | 2 +- music/lyrics/src/main/kotlin/LyricsCommand.kt | 10 +++++----- .../schlaubi/mikmusic/checks/MusicQuizCheck.kt | 2 +- .../schlaubi/mikmusic/checks/PlayingCheck.kt | 2 +- .../mikmusic/checks/VoiceChannelCheck.kt | 8 ++++---- .../dev/schlaubi/mikmusic/core/MusicModule.kt | 2 +- .../mikmusic/gdpr/MusicGdprExtension.kt | 6 +++--- .../musicchannel/MusicChannelCommand.kt | 12 ++++++------ .../mikmusic/musicchannel/MusicChannelUI.kt | 12 ++++++------ .../musicchannel/MusicInteractionModule.kt | 6 +++--- .../dev/schlaubi/mikmusic/player/AutoPlay.kt | 3 +-- .../mikmusic/player/queue/SongSearch.kt | 2 +- .../mikmusic/player/queue/TrackFinder.kt | 18 +++++++++--------- 40 files changed, 125 insertions(+), 127 deletions(-) diff --git a/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt b/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt index 9136e358..63431bc6 100644 --- a/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt +++ b/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt @@ -24,15 +24,15 @@ fun GDPRModule.infoCommand() = ephemeralSubCommand { title = translate(GdprTranslations.Commands.Gdpr.Info.title) dataPoint( - translate(GdprTranslations.Commands.Gdpr.Info.stored_data), + translate(GdprTranslations.Commands.Gdpr.Info.storedData), storedData, - translate(GdprTranslations.Gdpr.General.Persistent_data.explainer) + translate(GdprTranslations.Gdpr.General.PersistentData.explainer) ) - dataPoint(translate(GdprTranslations.Commands.Gdpr.Info.anonymized_data), anonymizedData) + dataPoint(translate(GdprTranslations.Commands.Gdpr.Info.anonymizedData), anonymizedData) dataPoint( - translate(GdprTranslations.Commands.Gdpr.Info.data_processing), + translate(GdprTranslations.Commands.Gdpr.Info.dataProcessing), processedData, - translate(GdprTranslations.Gdpr.General.Persistent_data.explainer) + translate(GdprTranslations.Gdpr.General.PersistentData.explainer) ) } } @@ -64,7 +64,7 @@ private suspend fun List.toDescription(commandContext: CommandContext append(commandContext.translate(descriptionKey)) if (sharingDescriptionKey != null) { appendLine() - append(commandContext.translate(GdprTranslations.Gdpr.General.data_sharing)) + append(commandContext.translate(GdprTranslations.Gdpr.General.dataSharing)) append(' ') append( commandContext.translate( diff --git a/core/kubernetes/src/main/kotlin/dev/schlaubi/mikbot/core/health/Rebalancer.kt b/core/kubernetes/src/main/kotlin/dev/schlaubi/mikbot/core/health/Rebalancer.kt index 2b104d6c..f6bff3c9 100644 --- a/core/kubernetes/src/main/kotlin/dev/schlaubi/mikbot/core/health/Rebalancer.kt +++ b/core/kubernetes/src/main/kotlin/dev/schlaubi/mikbot/core/health/Rebalancer.kt @@ -43,8 +43,8 @@ private var lastRebalanceCheck = TimeSource.Monotonic.markNow() private class RebalanceArguments() : Arguments() { val forceTo by optionalInt { - name = KubernetesTranslations.Commands.Rebalance.Arguments.Force_to.name - description = KubernetesTranslations.Commands.Rebalance.Arguments.Force_to.description + name = KubernetesTranslations.Commands.Rebalance.Arguments.ForceTo.name + description = KubernetesTranslations.Commands.Rebalance.Arguments.ForceTo.description } } @@ -94,7 +94,7 @@ class RebalancerExtension(context: PluginContext) : MikBotModule(context) { } else if (arguments.forceTo != null) { reBalance(arguments.forceTo!!) } else { - discordError(KubernetesTranslations.Commands.Rebalance.already_balanced) + discordError(KubernetesTranslations.Commands.Rebalance.alreadyBalanced) } respond { diff --git a/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt b/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt index f0e67b23..67f71b15 100644 --- a/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt +++ b/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt @@ -49,6 +49,6 @@ suspend fun OwnerModule.redeployCommand() = ephemeralSlashCommand { private suspend fun EphemeralSlashCommandContext<*, *>.notAvailable() { respond { - content = translate(RedeployHookTranslations.Commands.Redeploy.not_satisfied) + content = translate(RedeployHookTranslations.Commands.Redeploy.notSatisfied) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 926cf135..9204f63f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,10 +6,10 @@ coroutines = "1.9.0" serialization = "1.7.3" ktor = "3.0.1" kord = "feature-user-apps-20241102.180018-12" -api = "4.0.5" +api = "4.1.0" ksp = "2.0.21-1.0.26" lavakord = "8.0.1" -kordex-plugin = "1.5.5" +kordex-plugin = "1.5.6" [libraries] kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt index ed306b05..59a6d20e 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt @@ -43,7 +43,7 @@ suspend fun MusicModule.fixCommand() = ephemeralControlSlashCommand { val current: RecoveryStep = nextStep edit { - content = translate(MusicTranslations.Commands.Fix.running_step, translate(current.nameKey)) + content = translate(MusicTranslations.Commands.Fix.runningStep, translate(current.nameKey)) components = mutableListOf() } @@ -52,7 +52,7 @@ suspend fun MusicModule.fixCommand() = ephemeralControlSlashCommand { } edit { - content = translate(MusicTranslations.Commands.Fix.ran_step, translate(current.nameKey)) + content = translate(MusicTranslations.Commands.Fix.ranStep, translate(current.nameKey)) if (applicableRecoverySteps.hasNext()) { nextStep = applicableRecoverySteps.next() @@ -68,7 +68,7 @@ suspend fun MusicModule.fixCommand() = ephemeralControlSlashCommand { } } else { edit { - content = translate(MusicTranslations.Command.Fix.troubleshooting_done) + content = translate(MusicTranslations.Command.Fix.troubleshootingDone) } nextStep = null } @@ -109,7 +109,7 @@ private interface RecoveryStep { } private object ReJoinVoiceChannel : RecoveryStep { - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.re_join_channel + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.reJoinChannel override val MusicPlayer.applicable: Boolean get() = link.lastChannelId == null || link.state == Link.State.NOT_CONNECTED @@ -119,7 +119,7 @@ private object ReJoinVoiceChannel : RecoveryStep { } private object UnPausePlayback : RecoveryStep { - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.unpause_plackback + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.unpausePlackback override val MusicPlayer.applicable: Boolean get() = link.player.paused @@ -130,7 +130,7 @@ private object UnPausePlayback : RecoveryStep { private object RestartPlayback : RecoveryStep { - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.restart_playback + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.restartPlayback override suspend fun EphemeralSlashCommandContext<*, *>.apply(musicPlayer: MusicPlayer) { musicPlayer.player.pause(true) @@ -141,7 +141,7 @@ private object RestartPlayback : RecoveryStep { private object ReEstablishVoiceConnection : RecoveryStep { - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.re_establish_voice_connection + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.reEstablishVoiceConnection override suspend fun EphemeralSlashCommandContext<*, *>.apply(musicPlayer: MusicPlayer) { val state = musicPlayer.toState() @@ -155,7 +155,7 @@ private object ReEstablishVoiceConnection : RecoveryStep { } private object SwitchVoiceServers : RecoveryStep { - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.switch_voice_server + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.switchVoiceServer override suspend fun EphemeralSlashCommandContext<*, *>.apply(musicPlayer: MusicPlayer) { val channel = musicPlayer.getChannel()!! @@ -178,7 +178,7 @@ object SkipTrack : RecoveryStep { override val MusicPlayer.applicable: Boolean get() = queuedTracks.isNotEmpty() - override val nameKey: Key = MusicTranslations.Commands.Fix.Step.skip_track + override val nameKey: Key = MusicTranslations.Commands.Fix.Step.skipTrack override suspend fun EphemeralSlashCommandContext<*, *>.apply(musicPlayer: MusicPlayer) { musicPlayer.skip() diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt index a9dd9f32..c9880f83 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt @@ -1,12 +1,11 @@ package dev.schlaubi.mikmusic.commands +import dev.arbjerg.lavalink.protocol.v4.Track import dev.kordex.core.commands.Arguments import dev.kordex.core.commands.application.slash.EphemeralSlashCommand import dev.kordex.core.commands.application.slash.EphemeralSlashCommandContext import dev.kordex.core.commands.application.slash.ephemeralSubCommand import dev.kordex.core.commands.converters.impl.int -import dev.arbjerg.lavalink.protocol.v4.Track -import dev.kordex.core.i18n.EMPTY_KEY import dev.kordex.core.i18n.toKey import dev.schlaubi.mikbot.plugin.api.util.translate import dev.schlaubi.mikbot.translations.MusicTranslations @@ -43,7 +42,7 @@ suspend fun MusicModule.moveCommand() { val toValue = safeArguments.to().coerceAtLeast(1) if (toValue > musicPlayer.queuedTracks.size) { respond { - content = translate(MusicTranslations.Commands.Move.Invalid_index.to) + content = translate(MusicTranslations.Commands.Move.InvalidIndex.to) } return@action } @@ -60,7 +59,7 @@ suspend fun MusicModule.moveCommand() { } } else { respond { - content = translate(MusicTranslations.Commands.Move.Invalid_index.from) + content = translate(MusicTranslations.Commands.Move.InvalidIndex.from) } } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt index c6f5cf96..221e8bcd 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt @@ -27,7 +27,7 @@ suspend fun MusicModule.nextCommand() = ephemeralControlSlashCommand { respond { content = translate(MusicTranslations.Commands.Skip.skipped) } } else { musicPlayer.skipChapter() - respond { content = translate(MusicTranslations.Commands.Next.skipped_chapter) } + respond { content = translate(MusicTranslations.Commands.Next.skippedChapter) } } } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt index a0d83f4c..ea77ce26 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt @@ -16,16 +16,16 @@ import kotlin.time.toDuration class NowPlayingArguments : Arguments() { val index by optionalInt { - name = MusicTranslations.Commands.Now_playing.Arguments.Position.name - description = MusicTranslations.Commands.Now_playing.Arguments.Position.description + name = MusicTranslations.Commands.NowPlaying.Arguments.Position.name + description = MusicTranslations.Commands.NowPlaying.Arguments.Position.description } } private val regex = """\.[0-9]*""".toRegex() suspend fun MusicModule.nowPlayingCommand() = publicSlashCommand(::NowPlayingArguments) { - name = MusicTranslations.Commands.Now_playing.name - description = MusicTranslations.Commands.Now_playing.description + name = MusicTranslations.Commands.NowPlaying.name + description = MusicTranslations.Commands.NowPlaying.description musicControlContexts() check { @@ -37,7 +37,7 @@ suspend fun MusicModule.nowPlayingCommand() = publicSlashCommand(::NowPlayingArg val index = arguments.index val (playingTrack) = if (index != null) { musicPlayer.queuedTracks.getOrNull(index) ?: run { - respond { translate(MusicTranslations.Commands.Now_playing.invalid_index) } + respond { translate(MusicTranslations.Commands.NowPlaying.invalidIndex) } return@action } } else musicPlayer.playingTrack ?: return@action @@ -47,17 +47,17 @@ suspend fun MusicModule.nowPlayingCommand() = publicSlashCommand(::NowPlayingArg addSong(this@action, playingTrack) field { - name = translate(MusicTranslations.Commands.Now_playing.Serving_node.discord) + name = translate(MusicTranslations.Commands.NowPlaying.ServingNode.discord) value = "`${java.net.InetAddress.getLocalHost().hostName}`" } field { - name = translate(MusicTranslations.Commands.Now_playing.Serving_node.music) + name = translate(MusicTranslations.Commands.NowPlaying.ServingNode.music) value = "`${link.node.host}`" } field { - name = translate(MusicTranslations.Commands.Now_playing.progress) + name = translate(MusicTranslations.Commands.NowPlaying.progress) value = "${player.positionDuration.toString().replace(regex, "")}/${ playingTrack.info.length.toDuration( diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt index f98a663d..fc1b8601 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt @@ -29,12 +29,12 @@ suspend fun MusicModule.queueCommand() = ephemeralSlashCommand { respond { embed { musicPlayer.addAutoPlaySongs(this@action) - description = translate(MusicTranslations.Commands.Queue.now_playing, track.format()) + description = translate(MusicTranslations.Commands.Queue.nowPlaying, track.format()) } } } else { respond { - content = translate(MusicTranslations.Commands.Queue.no_songs) + content = translate(MusicTranslations.Commands.Queue.noSongs) } } return@action @@ -49,7 +49,7 @@ suspend fun MusicModule.queueCommand() = ephemeralSlashCommand { val playingTrack = musicPlayer.playingTrack if (playingTrack != null) { field { - name = translate(MusicTranslations.Music.Queue.now_playing) + name = translate(MusicTranslations.Music.Queue.nowPlaying) value = playingTrack.format(musicPlayer.repeat) } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RadioCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RadioCommand.kt index 675cee9e..7c43d660 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RadioCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RadioCommand.kt @@ -36,7 +36,7 @@ suspend fun MusicModule.radioCommand() { action { if (musicPlayer.hasAutoPlay) { - discordError(MusicTranslations.Commands.Radio.already_enabled) + discordError(MusicTranslations.Commands.Radio.alreadyEnabled) } val seedItem = (musicPlayer.loadItem(arguments.query)) @@ -56,7 +56,7 @@ suspend fun MusicModule.radioCommand() { val realItems = item.filterNotNull() if (realItems.isEmpty()) { - discordError(MusicTranslations.Commands.Radio.no_matching_songs) + discordError(MusicTranslations.Commands.Radio.noMatchingSongs) } if (isTrack) { diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt index 2298e171..885e63eb 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt @@ -52,7 +52,7 @@ suspend fun MusicModule.removeCommand() = ephemeralControlSlashCommand { } } else { respond { - content = translate(MusicTranslations.Commands.Remove.Invalid_index.multiple) + content = translate(MusicTranslations.Commands.Remove.InvalidIndex.multiple) } } } @@ -70,7 +70,7 @@ suspend fun MusicModule.removeCommand() = ephemeralControlSlashCommand { } } else { respond { - content = translate(MusicTranslations.Commands.Remove.Invalid_index.single) + content = translate(MusicTranslations.Commands.Remove.InvalidIndex.single) } } } @@ -83,7 +83,7 @@ suspend fun MusicModule.removeCommand() = ephemeralControlSlashCommand { doRemove { val to = arguments.to ?: arguments.from if (to < arguments.from) { - discordError(MusicTranslations.Commands.Remove.Range.invalid_range_end) + discordError(MusicTranslations.Commands.Remove.Range.invalidRangeEnd) } val range = arguments.from..to diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt index 6d2eb46f..007321c8 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt @@ -44,16 +44,16 @@ suspend fun MusicModule.schedulerCommands() { } ephemeralControlSlashCommand { - name = MusicTranslations.Commands.Loop_queue.name - description = MusicTranslations.Commands.Loop_queue.description + name = MusicTranslations.Commands.LoopQueue.name + description = MusicTranslations.Commands.LoopQueue.description musicControlContexts() action { schedulerOption( MusicPlayer::loopQueue, MusicPlayer::shuffle, MusicPlayer::repeat, - enabled = MusicTranslations.Commands.Loop_queue.enabled, - disabled = MusicTranslations.Commands.Loop_queue.disabled, + enabled = MusicTranslations.Commands.LoopQueue.enabled, + disabled = MusicTranslations.Commands.LoopQueue.disabled, ) } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt index 6f367719..51314da5 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt @@ -21,7 +21,7 @@ class SeekArguments : Arguments() { validate { if (!value.matches(seekRegex)) { - discordError(MusicTranslations.Command.Seek.invalid_format) + discordError(MusicTranslations.Command.Seek.invalidFormat) } } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt index 652f3938..b5292347 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt @@ -27,11 +27,11 @@ suspend fun MusicModule.skipCommand() = ephemeralControlSlashCommand(::SkipArgum return@action } if (arguments.to < 1 && musicPlayer.hasAutoPlay) { - discordError(MusicTranslations.Commands.skips_exceed_autoplay_range) + discordError(MusicTranslations.Commands.skipsExceedAutoplayRange) } if (arguments.to > (musicPlayer.queuedTracks.size + musicPlayer.autoPlayTrackCount)) { respond { - content = translate(MusicTranslations.Commands.Skip.exceeds_range) + content = translate(MusicTranslations.Commands.Skip.exceedsRange) } return@action } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt index 973d5539..5d054a95 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt @@ -13,7 +13,7 @@ import dev.schlaubi.mikmusic.player.queue.queueTracks suspend fun MusicModule.playMessageAction() = ephemeralMessageCommand { - name = MusicTranslations.Context.Message.play_as_track + name = MusicTranslations.Context.Message.playAsTrack musicControlContexts() diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt index 932c9d8c..3dbed7cb 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt @@ -12,15 +12,15 @@ import dev.schlaubi.mikmusic.core.settings.MusicSettingsDatabase private class DjModeArguments : Arguments() { val djRole by optionalRole { - name = MusicTranslations.Commands.Dj_mode.Arguments.Role.name - description = MusicTranslations.Commands.Dj_mode.Arguments.Role.description + name = MusicTranslations.Commands.DjMode.Arguments.Role.name + description = MusicTranslations.Commands.DjMode.Arguments.Role.description } } suspend fun SettingsModule.djModeCommand() { ephemeralSlashCommand(::DjModeArguments) { - name = MusicTranslations.Commands.Dj_mode.name - description = MusicTranslations.Commands.Dj_mode.description + name = MusicTranslations.Commands.DjMode.name + description = MusicTranslations.Commands.DjMode.description guildAdminOnly() diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt index 2939b132..93c16af1 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt @@ -10,15 +10,15 @@ import dev.schlaubi.mikmusic.core.settings.MusicSettingsDatabase import dev.schlaubi.mikmusic.util.musicModule suspend fun SettingsModule.fixMusicChannel() = ephemeralSlashCommand { - name = MusicTranslations.Commands.Fix_music_channel.name - description = MusicTranslations.Commands.Fix_music_channel.description + name = MusicTranslations.Commands.FixMusicChannel.name + description = MusicTranslations.Commands.FixMusicChannel.description musicControlContexts() action { val guildSettings = MusicSettingsDatabase.findGuild(safeGuild) if (guildSettings.musicChannelData == null) { respond { - content = translate(MusicTranslations.Commands.Fix_music_channel.not_enabled) + content = translate(MusicTranslations.Commands.FixMusicChannel.notEnabled) } return@action @@ -27,7 +27,7 @@ suspend fun SettingsModule.fixMusicChannel() = ephemeralSlashCommand { musicModule.getMusicPlayer(safeGuild).updateMusicChannelMessage() respond { - content = translate(MusicTranslations.Commands.Fix_music_channel.success) + content = translate(MusicTranslations.Commands.FixMusicChannel.success) } } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt index e84851e7..30f4eaf1 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt @@ -18,20 +18,20 @@ private val limit = 10.minutes class LeaveTimeoutArguments : Arguments() { val timeout by duration { - name = MusicTranslations.Commands.Leave_timeout.Arguments.Timeout.name - description = MusicTranslations.Commands.Leave_timeout.Arguments.Timeout.description + name = MusicTranslations.Commands.LeaveTimeout.Arguments.Timeout.name + description = MusicTranslations.Commands.LeaveTimeout.Arguments.Timeout.description validate { if (value.toDuration(TimeZone.UTC) > limit) { - discordError(MusicTranslations.Command.Leave_timeout.limit_exceeded.withOrdinalPlaceholders(limit)) + discordError(MusicTranslations.Command.LeaveTimeout.limitExceeded.withOrdinalPlaceholders(limit)) } } } } suspend fun SettingsModule.leaveTimeoutCommand() = ephemeralSlashCommand(::LeaveTimeoutArguments) { - name = MusicTranslations.Commands.Leave_timeout.name - description = MusicTranslations.Commands.Leave_timeout.description + name = MusicTranslations.Commands.LeaveTimeout.name + description = MusicTranslations.Commands.LeaveTimeout.description guildAdminOnly() @@ -42,7 +42,7 @@ suspend fun SettingsModule.leaveTimeoutCommand() = ephemeralSlashCommand(::Leave MusicSettingsDatabase.guild.save(newGuild) respond { - content = translate(MusicTranslations.Commands.Leave_timeout.success, duration) + content = translate(MusicTranslations.Commands.LeaveTimeout.success, duration) } } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt index f20d1239..8829843c 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt @@ -16,8 +16,8 @@ import dev.schlaubi.mikmusic.util.musicModule private class SponsorBlockArguments : Arguments() { val enableSponsorBlock by optionalBoolean { - name = MusicTranslations.Commands.Sponsorblock.Arguments.Use_sponsorblock.name - description = MusicTranslations.Commands.Sponsorblock.Arguments.Use_sponsorblock.description + name = MusicTranslations.Commands.Sponsorblock.Arguments.UseSponsorblock.name + description = MusicTranslations.Commands.Sponsorblock.Arguments.UseSponsorblock.description } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt index 95b7f367..096c4301 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt @@ -15,8 +15,8 @@ import dev.schlaubi.mikmusic.util.mapToEncoded class PlaylistAddArguments : PlaylistArguments(), QueueOptions { override val query by autoCompletedYouTubeQuery(MusicTranslations.Commands.Playlist.Add.Arguments.Query.name, MusicTranslations.Commands.Playlist.Add.Arguments.Query.description) override val searchProvider: QueueOptions.SearchProvider? by optionalEnumChoice { - name = MusicTranslations.Commands.Playlist.Add.Arguments.Search_provider.name - description = MusicTranslations.Commands.Playlist.Add.Arguments.Search_provider.description + name = MusicTranslations.Commands.Playlist.Add.Arguments.SearchProvider.name + description = MusicTranslations.Commands.Playlist.Add.Arguments.SearchProvider.description typeName = EMPTY_KEY } val search by defaultingBoolean { diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt index f50c11fd..60ada3c7 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt @@ -64,7 +64,7 @@ fun Arguments.playlistName(onlyMine: Boolean) = string { } private suspend fun CommandContext.notFound(value: String): Nothing { - throw DiscordRelayedException(MusicTranslations.Command.Playlist.unknown_playlist.withOrdinalPlaceholders(value)) + throw DiscordRelayedException(MusicTranslations.Command.Playlist.unknownPlaylist.withOrdinalPlaceholders(value)) } private suspend fun getPlaylistOrNull(userBehavior: UserBehavior, name: String) = @@ -118,7 +118,7 @@ suspend inline fun EphemeralSlashCommandContext<*, *>.checkName(name: String, pu val existingPlaylist = PlaylistDatabase.collection.findOne(findBson) if (existingPlaylist != null) { respond { - content = translate(MusicTranslations.Commands.Playlist.Save.already_exists, name) + content = translate(MusicTranslations.Commands.Playlist.Save.alreadyExists, name) } } @@ -129,7 +129,7 @@ suspend inline fun EphemeralSlashCommandContext.checkP val playlist = getPlaylist() if (playlist.authorId != user.id) { respond { - content = translate(MusicTranslations.Commands.Playlist.Delete.no_permission) + content = translate(MusicTranslations.Commands.Playlist.Delete.noPermission) } return } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt index bd830ca4..cf9af0b2 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt @@ -12,8 +12,8 @@ import org.litote.kmongo.or class PlayListListArguments : Arguments() { val onlyMine by defaultingBoolean { - name = MusicTranslations.Commands.Playlist.List.Arguments.Only_mine.name - description = MusicTranslations.Commands.Playlist.List.Arguments.Only_mine.description + name = MusicTranslations.Commands.Playlist.List.Arguments.OnlyMine.name + description = MusicTranslations.Commands.Playlist.List.Arguments.OnlyMine.description defaultValue = false } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RemoveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RemoveCommand.kt index 4f1dab28..09deef7e 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RemoveCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RemoveCommand.kt @@ -22,7 +22,7 @@ fun PlaylistModule.removeCommand() = ephemeralSubCommand(::PlaylistRemoveArgumen val item = playlist.songs.getOrNull(index) if (item == null) { respond { - content = translate(MusicTranslations.Commands.Playlist.Remove.too_high_index) + content = translate(MusicTranslations.Commands.Playlist.Remove.tooHighIndex) } return@action diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RenameCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RenameCommand.kt index d1d4a58b..a5b1a37e 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RenameCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/RenameCommand.kt @@ -7,8 +7,8 @@ import dev.schlaubi.mikmusic.playlist.PlaylistDatabase class PlaylistRenameArguments : PlaylistArguments() { val newName by string { - name = MusicTranslations.Commands.Playlist.Rename.Arguments.New_name.name - description = MusicTranslations.Commands.Playlist.Rename.Arguments.New_name.description + name = MusicTranslations.Commands.Playlist.Rename.Arguments.NewName.name + description = MusicTranslations.Commands.Playlist.Rename.Arguments.NewName.description } } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt index 4774a3b1..28f61cc6 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt @@ -26,8 +26,8 @@ class PlaylistSaveArguments : Arguments(), QueueOptions { defaultValue = false } val importFrom by optionalString { - name = MusicTranslations.Commands.Playlist.Save.Arguments.Import_from.name - description = MusicTranslations.Commands.Playlist.Save.Arguments.Import_from.description + name = MusicTranslations.Commands.Playlist.Save.Arguments.ImportFrom.name + description = MusicTranslations.Commands.Playlist.Save.Arguments.ImportFrom.description } override val query: String get() = importFrom ?: error("Cannot find tracks if importFrom is not specified") @@ -48,7 +48,7 @@ fun PlaylistModule.saveCommand() = ephemeralSubCommand(::PlaylistSaveArguments) action { if (musicPlayer.playingTrack == null && arguments.importFrom == null) { respond { - content = translate(MusicTranslations.Music.Checks.not_playing) + content = translate(MusicTranslations.Music.Checks.notPlaying) } return@action } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SongsCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SongsCommand.kt index df53c148..28c03194 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SongsCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SongsCommand.kt @@ -16,7 +16,7 @@ fun PlaylistModule.songsCommand() = ephemeralSubCommand(::PlaylistSongsArguments val playlist = getPlaylist() if (playlist.songs.isEmpty()) { respond { - content = translate(MusicTranslations.Commands.Playlist.Songs.is_empty) + content = translate(MusicTranslations.Commands.Playlist.Songs.isEmpty) } return@action } diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ToggleVisibilityCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ToggleVisibilityCommand.kt index f9089236..529e3abd 100644 --- a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ToggleVisibilityCommand.kt +++ b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ToggleVisibilityCommand.kt @@ -7,8 +7,8 @@ import dev.schlaubi.mikmusic.playlist.PlaylistDatabase class PlaylistToggleVisibilityCommand : PlaylistArguments() fun PlaylistModule.toggleVisibilityCommand() = ephemeralSubCommand(::PlaylistToggleVisibilityCommand) { - name = MusicTranslations.Commands.Playlist.Toggle_visibility.name - description = MusicTranslations.Commands.Playlist.Toggle_visibility.description + name = MusicTranslations.Commands.Playlist.ToggleVisibility.name + description = MusicTranslations.Commands.Playlist.ToggleVisibility.description action { checkPermissions { playlist -> @@ -16,9 +16,9 @@ fun PlaylistModule.toggleVisibilityCommand() = ephemeralSubCommand(::PlaylistTog respond { content = if (!playlist.public) { - translate(MusicTranslations.Commands.Playlist.Toggle_visibility.on) + translate(MusicTranslations.Commands.Playlist.ToggleVisibility.on) } else { - translate(MusicTranslations.Commands.Playlist.Toggle_visibility.off) + translate(MusicTranslations.Commands.Playlist.ToggleVisibility.off) } } } diff --git a/music/lyrics/src/main/kotlin/KaraokeCommand.kt b/music/lyrics/src/main/kotlin/KaraokeCommand.kt index 3bb06439..faf698c5 100644 --- a/music/lyrics/src/main/kotlin/KaraokeCommand.kt +++ b/music/lyrics/src/main/kotlin/KaraokeCommand.kt @@ -24,7 +24,7 @@ suspend fun Extension.karaokeCommand() = ephemeralSlashCommand { val lyrics = runCatching { player.requestLyrics() }.getOrNull() if (lyrics !is TimedLyrics) { - discordError(LyricsTranslations.Commands.Karaoke.not_available) + discordError(LyricsTranslations.Commands.Karaoke.notAvailable) } val token = requestToken(user.id) diff --git a/music/lyrics/src/main/kotlin/LyricsCommand.kt b/music/lyrics/src/main/kotlin/LyricsCommand.kt index 1f606dfc..b8fc2b24 100644 --- a/music/lyrics/src/main/kotlin/LyricsCommand.kt +++ b/music/lyrics/src/main/kotlin/LyricsCommand.kt @@ -18,8 +18,8 @@ import dev.schlaubi.stdx.core.paginate class LyricsArguments : Arguments() { val name by optionalString { - name = LyricsTranslations.Commands.Lyrics.Arguments.Song_name.name - description = LyricsTranslations.Commands.Lyrics.Arguments.Song_name.description + name = LyricsTranslations.Commands.Lyrics.Arguments.SongName.name + description = LyricsTranslations.Commands.Lyrics.Arguments.SongName.description } } @@ -40,7 +40,7 @@ suspend fun Extension.lyricsCommand() = publicSlashCommand(::LyricsArguments) { if (query == null) { respond { - content = translate(LyricsTranslations.Command.Lyrics.no_song_playing) + content = translate(LyricsTranslations.Command.Lyrics.noSongPlaying) } return@action @@ -50,11 +50,11 @@ suspend fun Extension.lyricsCommand() = publicSlashCommand(::LyricsArguments) { player.requestLyrics() } else { val (videoId) = link.node.searchLyrics(query).firstOrNull() - ?: discordError(LyricsTranslations.Command.Lyrics.no_lyrics) + ?: discordError(LyricsTranslations.Command.Lyrics.noLyrics) link.node.requestLyrics(videoId) } } catch (e: RestException) { - discordError(LyricsTranslations.Command.Lyrics.no_lyrics) + discordError(LyricsTranslations.Command.Lyrics.noLyrics) } val lines = if (lyrics is TimedLyrics) { diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/MusicQuizCheck.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/MusicQuizCheck.kt index 1bf7c8ea..75617d4a 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/MusicQuizCheck.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/MusicQuizCheck.kt @@ -6,7 +6,7 @@ import dev.schlaubi.mikbot.translations.MusicTranslations import dev.schlaubi.mikmusic.core.MusicModule suspend fun CheckContext<*>.musicQuizAntiCheat(musicModule: MusicModule) { - failIf(MusicTranslations.Commands.Now_playing.cheat_attempt) { + failIf(MusicTranslations.Commands.NowPlaying.cheatAttempt) { val musicPlayer = musicModule.getMusicPlayer(guildFor(event)!!) musicPlayer.disableMusicChannel } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/PlayingCheck.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/PlayingCheck.kt index 2bc21e8d..8525bbed 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/PlayingCheck.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/PlayingCheck.kt @@ -14,6 +14,6 @@ suspend fun CheckContext.anyMusicPlaying(musicMo val guild = guildFor(event) ?: error("This check needs to also use anyGuild()") val player = musicModule.getMusicPlayer(guild) if (player.player.playingTrack == null) { - fail(MusicTranslations.Music.Checks.not_playing) + fail(MusicTranslations.Music.Checks.notPlaying) } } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/VoiceChannelCheck.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/VoiceChannelCheck.kt index 87a93271..ee45676d 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/VoiceChannelCheck.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/checks/VoiceChannelCheck.kt @@ -36,7 +36,7 @@ suspend fun CheckContext.joinSameChannelCheck(extensibleBot: Exte deafened = true } } else if (voiceChannel != botChannel) { - fail(MusicTranslations.Music.Checks.already_in_use) + fail(MusicTranslations.Music.Checks.alreadyInUse) } } } @@ -44,10 +44,10 @@ suspend fun CheckContext.joinSameChannelCheck(extensibleBot: Exte suspend fun CheckContext.musicControlCheck(ignoreDjMode: Boolean = false) { abstractMusicCheck(ignoreDjMode) { if (botChannel == null) { - return@abstractMusicCheck fail(MusicTranslations.Music.Checks.no_running) + return@abstractMusicCheck fail(MusicTranslations.Music.Checks.noRunning) } if (voiceChannel != botChannel) { - fail(MusicTranslations.Music.Checks.no_running) + fail(MusicTranslations.Music.Checks.noRunning) } } } @@ -68,7 +68,7 @@ private suspend inline fun CheckContext.abstractMusicCheck( } } val voiceChannel = member?.getVoiceStateOrNull()?.channelId - ?: return fail(MusicTranslations.Music.Checks.not_in_vc) + ?: return fail(MusicTranslations.Music.Checks.notInVc) val guild = member.guild val guildSettings = MusicSettingsDatabase.findGuild(guild) diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/MusicModule.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/MusicModule.kt index 0ec070af..2bb2de80 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/MusicModule.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/MusicModule.kt @@ -182,7 +182,7 @@ suspend fun checkOtherSchedulerOptions( ) { if (properties.any { it.get(musicPlayer) }) { val (confirmed) = confirmation { - content = translator.translate(MusicTranslations.Music.multiple_scheduler_options) + content = translator.translate(MusicTranslations.Music.multipleSchedulerOptions) } if (!confirmed) { edit { content = translator.translate(MusicTranslations.Music.General.aborted) } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/gdpr/MusicGdprExtension.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/gdpr/MusicGdprExtension.kt index 1e94a59b..3f2c8a9e 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/gdpr/MusicGdprExtension.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/gdpr/MusicGdprExtension.kt @@ -16,9 +16,9 @@ class MusicGdprExtension : GDPRExtensionPoint { // Data sent to Google for AutoComplete on search commands val AutoCompleteDataPoint = AnonymizedData( - MusicTranslations.Gdpr.Auto_complete.description, - MusicTranslations.Gdpr.Auto_complete.Sharing.description + MusicTranslations.Gdpr.AutoComplete.description, + MusicTranslations.Gdpr.AutoComplete.Sharing.description ) // Data required for music-channel -val MusicChannelDataPoint = ProcessedData(MusicTranslations.Gdpr.Music_channel.description, null) +val MusicChannelDataPoint = ProcessedData(MusicTranslations.Gdpr.MusicChannel.description, null) diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelCommand.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelCommand.kt index 1ae7aee8..59dde756 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelCommand.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelCommand.kt @@ -30,14 +30,14 @@ import org.koin.core.component.get private class MusicChannelArguments : Arguments() { val channel by optionalChannel { - name = MusicTranslations.Commands.Music_channel.Arguments.Channel.name - description = MusicTranslations.Commands.Music_channel.Arguments.Channel.description + name = MusicTranslations.Commands.MusicChannel.Arguments.Channel.name + description = MusicTranslations.Commands.MusicChannel.Arguments.Channel.description validate { val channel = value ?: return@validate val botPermissions = (channel.fetchChannel() as TextChannel).getEffectivePermissions(channel.kord.selfId) if (Permission.ManageMessages !in botPermissions) { - discordError(MusicTranslations.Command.Music_channel.channel_missing_perms) + discordError(MusicTranslations.Command.MusicChannel.channelMissingPerms) } } requiredChannelTypes.add(ChannelType.GuildText) @@ -47,8 +47,8 @@ private class MusicChannelArguments : Arguments() { @OptIn(KordUnsafe::class, KordExperimental::class) suspend fun SettingsModule.musicChannel() { ephemeralSlashCommand(::MusicChannelArguments) { - name = MusicTranslations.Commands.Music_channel.name - description = MusicTranslations.Commands.Music_channel.description + name = MusicTranslations.Commands.MusicChannel.name + description = MusicTranslations.Commands.MusicChannel.description guildAdminOnly() @@ -93,7 +93,7 @@ suspend fun SettingsModule.musicChannel() { if (textChannel.getLastMessage() != null) { val (confirmed) = confirmation { - content = translate(MusicTranslations.Settings.Musicchannel.try_delete_messages) + content = translate(MusicTranslations.Settings.Musicchannel.tryDeleteMessages) } if (confirmed) { diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelUI.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelUI.kt index 356eb0f5..4ef86708 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelUI.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicChannelUI.kt @@ -76,7 +76,7 @@ suspend fun updateMessage( if (playingQueueTrack is ChapterQueuedTrack) { field { - name = translate(MusicTranslations.Music.Music_channel.chapter) + name = translate(MusicTranslations.Music.MusicChannel.chapter) value = playingQueueTrack.chapters[playingQueueTrack.chapterIndex].name } } @@ -87,9 +87,9 @@ suspend fun updateMessage( if (musicPlayer.queuedTracks.isNotEmpty()) { field { - name = translate(MusicTranslations.Music.Music_channel.next_song_at) + name = translate(MusicTranslations.Music.MusicChannel.nextSongAt) value = if (musicPlayer.player.paused) { - translate(MusicTranslations.Music.Music_channel.paused) + translate(MusicTranslations.Music.MusicChannel.paused) } else { "" } @@ -97,16 +97,16 @@ suspend fun updateMessage( } } - title = translate(MusicTranslations.Music.Music_channel.queue) + title = translate(MusicTranslations.Music.MusicChannel.queue) description = musicPlayer.queuedTracks.take(5).mapIndexed { index, track -> track to index } .joinToString("\n") { (track, index) -> (index + 1).toString() + ". " + track.format() - }.ifBlank { translate(MusicTranslations.Music.Music_channel.Queue.empty) } + }.ifBlank { translate(MusicTranslations.Music.MusicChannel.Queue.empty) } musicPlayer.addAutoPlaySongs(translatableContext) footer { - text = translate(MusicTranslations.Music.Music_channel.footer) + text = translate(MusicTranslations.Music.MusicChannel.footer) } } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt index 555bacec..13384d52 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt @@ -42,7 +42,7 @@ class MusicInteractionModule(context: PluginContext) : MikBotModule(context) { /* return */ interaction.message.id != guildSettings.musicChannelData?.musicChannelMessage } - failIf(MusicTranslations.Music.Music_channel.disabled) { + failIf(MusicTranslations.Music.MusicChannel.disabled) { val player = musicModule.getMusicPlayer(event.interaction.guild) player.disableMusicChannel } @@ -94,7 +94,7 @@ class MusicInteractionModule(context: PluginContext) : MikBotModule(context) { try { player.enableAutoPlay() } catch (_: IllegalStateException) { - discordError(MusicTranslations.Commands.Radio.no_matching_songs) + discordError(MusicTranslations.Commands.Radio.noMatchingSongs) } } else { player.resetAutoPlay() @@ -118,7 +118,7 @@ class MusicInteractionModule(context: PluginContext) : MikBotModule(context) { inChannel(channelId) ifPassing { // only respond if this check fails - failIf(MusicTranslations.Music.Music_channel.disabled) { + failIf(MusicTranslations.Music.MusicChannel.disabled) { val player = musicModule.getMusicPlayer(guild) player.disableMusicChannel } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/AutoPlay.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/AutoPlay.kt index a95a7743..411f78da 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/AutoPlay.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/AutoPlay.kt @@ -5,7 +5,6 @@ import dev.arbjerg.lavalink.protocol.v4.Track import dev.kord.rest.builder.message.EmbedBuilder import dev.kordex.core.types.TranslatableContext import dev.schlaubi.lavakord.rest.loadItem -import dev.schlaubi.mikbot.plugin.api.util.Translator import dev.schlaubi.mikbot.plugin.api.util.translate import dev.schlaubi.mikbot.translations.MusicTranslations import dev.schlaubi.mikmusic.util.LinkedListSerializer @@ -84,7 +83,7 @@ suspend fun MusicPlayer.addAutoPlaySongs(translator: TranslatableContext) { val songs = autoPlay?.songs?.take(5) if (!songs.isNullOrEmpty()) { field { - name = translator.translate(MusicTranslations.Music.Auto_play.next_song) + name = translator.translate(MusicTranslations.Music.AutoPlay.nextSong) value = songs.joinToString("\n", transform = Track::format) } } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/SongSearch.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/SongSearch.kt index 24e9b012..40ac19a8 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/SongSearch.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/SongSearch.kt @@ -52,7 +52,7 @@ suspend fun CommandContext.searchSong( paginator.destroy() val track = tracks.firstOrNull { it.info.identifier == selection } - ?: discordError(MusicTranslations.Music.Queue.Search.not_found) + ?: discordError(MusicTranslations.Music.Queue.Search.notFound) return SingleTrack(track) } diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt index 48e56320..675731b5 100644 --- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt +++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt @@ -64,8 +64,8 @@ abstract class SchedulingArguments : SortedArguments(), SchedulingOptions { } override val loopQueue: Boolean? by optionalBoolean { - name = MusicTranslations.Scheduler.Options.Loop_queue.name - description = MusicTranslations.Scheduler.Options.Loop_queue.description + name = MusicTranslations.Scheduler.Options.LoopQueue.name + description = MusicTranslations.Scheduler.Options.LoopQueue.description } } @@ -86,8 +86,8 @@ abstract class QueueArguments : SchedulingArguments(), QueueOptions { defaultValue = false } override val searchProvider by optionalEnumChoice { - name = MusicTranslations.Queue.Options.Search_provider.name - description = MusicTranslations.Queue.Options.Search_provider.description + name = MusicTranslations.Queue.Options.SearchProvider.name + description = MusicTranslations.Queue.Options.SearchProvider.description typeName = EMPTY_KEY } } @@ -194,7 +194,7 @@ suspend fun CommandContext.queueTracks( ) { val searchResult = findTracks(musicPlayer.node, search, arguments, respond, editingPaginator) ?: return - val title = if (musicPlayer.nextSongIsFirst) translate(MusicTranslations.Music.Queue.now_playing) else translate( + val title = if (musicPlayer.nextSongIsFirst) translate(MusicTranslations.Music.Queue.nowPlaying) else translate( MusicTranslations.Music.Queue.queued, with(searchResult) { type() } ) @@ -216,7 +216,7 @@ suspend fun CommandContext.queueTracks( } else { musicPlayer.remainingQueueDuration.toString() } - text = translate(MusicTranslations.Music.Plays_in.estimated, item) + text = translate(MusicTranslations.Music.PlaysIn.estimated, item) } } @@ -231,7 +231,7 @@ suspend fun CommandContext.queueTracks( private suspend fun TranslatableContext.noMatches(respond: MessageSender) { respond { - content = translate(MusicTranslations.Music.Queue.no_matches) + content = translate(MusicTranslations.Music.Queue.noMatches) } } @@ -243,7 +243,7 @@ private suspend fun TranslatableContext.handleError( when (error.severity) { Exception.Severity.COMMON -> { respond { - content = translate(MusicTranslations.Music.Queue.Load_failed.common, error.message) + content = translate(MusicTranslations.Music.Queue.LoadFailed.common, error.message) } } @@ -251,7 +251,7 @@ private suspend fun TranslatableContext.handleError( LOG.error(FriendlyException(error.severity, error.message)) { "An error occurred whilst queueing a song" } respond { - content = translate(MusicTranslations.Music.Queue.Load_failed.uncommon) + content = translate(MusicTranslations.Music.Queue.LoadFailed.uncommon) } } }