Removing more deprecated code and warnings where possible

DreamExposure · Dec 11, 2024 · 9d667a4 · 9d667a4
1 parent b6bec26
commit 9d667a4
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 45 deletions.
diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/SlashCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/SlashCommand.kt
@@ -2,11 +2,8 @@ package org.dreamexposure.discal.client.commands
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent
 import discord4j.core.`object`.entity.Message
-import kotlinx.coroutines.reactor.awaitSingle
-import kotlinx.coroutines.reactor.mono
 import org.dreamexposure.discal.core.`object`.new.GuildSettings
 import org.dreamexposure.discal.core.utils.MessageSourceLoader
-import reactor.core.publisher.Mono
 
 interface SlashCommand {
     val name: String
@@ -15,14 +12,8 @@ interface SlashCommand {
 
     fun shouldDefer(event: ChatInputInteractionEvent): Boolean = true
 
-    @Deprecated("Use new handleSuspend for K-coroutines")
-    fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Mono<Message> {
-        return mono { suspendHandle(event, settings) }
-    }
 
-    suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
-        return handle(event, settings).awaitSingle()
-    }
+    suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message
 
     fun getMessage(key: String, settings: GuildSettings, vararg args: String): String {
         val src = MessageSourceLoader.getSourceByPath("command/$name/$name")

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/dev/DevCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/dev/DevCommand.kt
@@ -22,7 +22,7 @@ class DevCommand(
     override val hasSubcommands = true
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         // Validate this user is actually a dev
         if (!GlobalVal.devUserIds.contains(event.interaction.user.id))
             return event.createFollowup(getMessage("error.notDeveloper", settings))

diff --git a/...nt/src/main/kotlin/org/dreamexposure/discal/client/commands/global/AnnouncementCommand.kt b/...nt/src/main/kotlin/org/dreamexposure/discal/client/commands/global/AnnouncementCommand.kt
@@ -31,7 +31,7 @@ class AnnouncementCommand(
     override val hasSubcommands = true
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "create" -> create(event, settings)
             "type" -> type(event, settings)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/CalendarCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/CalendarCommand.kt
@@ -32,7 +32,7 @@ class CalendarCommand(
     override val ephemeral = true
     private val OVERVIEW_EVENT_COUNT = Config.CALENDAR_OVERVIEW_DEFAULT_EVENT_COUNT.getInt()
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "view" -> view(event, settings)
             "list" -> list(event, settings)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/DiscalCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/DiscalCommand.kt
@@ -20,7 +20,7 @@ class DiscalCommand(
     override val hasSubcommands = false
     override val ephemeral = false
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         val announcementCount = announcementService.getAnnouncementCount()
         val calendarCount = calendarService.getCalendarCount()
         val guildCount = event.client.guilds.count().awaitSingle()

diff --git a/...src/main/kotlin/org/dreamexposure/discal/client/commands/global/DisplayCalendarCommand.kt b/...src/main/kotlin/org/dreamexposure/discal/client/commands/global/DisplayCalendarCommand.kt
@@ -24,7 +24,7 @@ class DisplayCalendarCommand(
     override val ephemeral = true
 
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "new" -> new(event, settings)
             else -> throw IllegalStateException("Invalid subcommand specified")

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/EventCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/EventCommand.kt
@@ -34,7 +34,7 @@ class EventCommand(
     override val hasSubcommands = true
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "create" -> create(event, settings)
             "name" -> name(event, settings)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/EventsCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/EventsCommand.kt
@@ -26,7 +26,7 @@ class EventsCommand(
     override val ephemeral = false
 
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "upcoming" -> upcomingEvents(event, settings)
             "ongoing" -> ongoingEvents(event, settings)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/HelpCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/HelpCommand.kt
@@ -14,7 +14,7 @@ class HelpCommand : SlashCommand {
     override val hasSubcommands = false
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return event.createFollowup(
             getMessage("error.workInProgress", settings, "${Config.URL_BASE.getString()}/commands")
         ).withEphemeral(ephemeral).awaitSingle()

diff --git a/...nt/src/main/kotlin/org/dreamexposure/discal/client/commands/global/LinkCalendarCommand.kt b/...nt/src/main/kotlin/org/dreamexposure/discal/client/commands/global/LinkCalendarCommand.kt
@@ -25,7 +25,7 @@ class LinkCalendarCommand(
     private val OVERVIEW_EVENT_COUNT = Config.CALENDAR_OVERVIEW_DEFAULT_EVENT_COUNT.getInt()
 
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         val showOverview = event.getOption("overview")
                 .flatMap(ApplicationCommandInteractionOption::getValue)
                 .map(ApplicationCommandInteractionOptionValue::asBoolean)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/RsvpCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/RsvpCommand.kt
@@ -27,7 +27,7 @@ class RsvpCommand(
     override val ephemeral = true
 
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         return when (event.options[0].name) {
             "ontime" -> onTime(event, settings)
             "late" -> late(event, settings)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/SettingsCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/SettingsCommand.kt
@@ -25,7 +25,7 @@ class SettingsCommand(
     override val hasSubcommands = true
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         // Validate permissions
         val hasElevatedPerms = permissionService.hasElevatedPermissions(settings.guildId, event.interaction.user.id)
         if (!hasElevatedPerms) return event.createFollowup(getCommonMsg("error.perms.elevated", settings.locale))

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/TimeCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/TimeCommand.kt
@@ -21,7 +21,7 @@ class TimeCommand(
     override val hasSubcommands = false
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         val calendarNumber = event.getOption("calendar")
             .flatMap(ApplicationCommandInteractionOption::getValue)
             .map(ApplicationCommandInteractionOptionValue::asLong)

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/commands/premium/AddCalCommand.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/commands/premium/AddCalCommand.kt
@@ -20,7 +20,7 @@ class AddCalCommand(
     override val hasSubcommands = false
     override val ephemeral = true
 
-    override suspend fun suspendHandle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
+    override suspend fun handle(event: ChatInputInteractionEvent, settings: GuildSettings): Message {
         //TODO: Remove dev-only and switch to patron-only once this is completed
         if (!settings.devGuild) return event.createFollowup(getCommonMsg("error.disabled", settings.locale))
             .withEphemeral(ephemeral)

diff --git a/...src/main/kotlin/org/dreamexposure/discal/client/listeners/discord/SlashCommandListener.kt b/...src/main/kotlin/org/dreamexposure/discal/client/listeners/discord/SlashCommandListener.kt
@@ -38,7 +38,7 @@ class SlashCommandListener(
 
                 val settings = settingsService.getSettings(event.interaction.guildId.get())
 
-                command.suspendHandle(event, settings)
+                command.handle(event, settings)
             } catch (e: Exception) {
                 LOGGER.error(DEFAULT, "Error handling slash command | $event", e)
 

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/network/discal/CredentialData.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/network/discal/CredentialData.kt
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/new/Credential.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/new/Credential.kt
@@ -8,7 +8,7 @@ import org.dreamexposure.discal.core.extensions.asInstantMilli
 import java.time.Instant
 
 
-@Suppress("DataClassPrivateConstructor")
+@ConsistentCopyVisibility
 data class Credential private constructor(
     val credentialNumber: Int,
     var expiresAt: Instant,

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/AuthenticationState.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/AuthenticationState.kt
@@ -4,7 +4,9 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
+@ConsistentCopyVisibility
 @Serializable
+@Deprecated("Prefer to use new authentication implementations.")
 data class AuthenticationState private constructor(
         @Transient
         val success: Boolean = true,

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/WebCalendar.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/WebCalendar.kt
@@ -5,6 +5,7 @@ import kotlinx.serialization.Serializable
 import org.dreamexposure.discal.core.enums.calendar.CalendarHost
 import org.dreamexposure.discal.core.`object`.new.model.discal.CalendarV3Model
 
+@ConsistentCopyVisibility
 @Serializable
 @Deprecated("Prefer to use the CalendarV3Model impl")
 data class WebCalendar internal constructor(

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/WebRole.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/web/WebRole.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.LongAsStringSerializer
 import org.dreamexposure.discal.core.`object`.new.model.discal.WebRoleV3Model
 
-@Suppress("DataClassPrivateConstructor")
+@ConsistentCopyVisibility
 @Serializable
 @Deprecated("Prefer to use WebRoleV3Model instead")
 data class WebRole private constructor(