🐛 fixing clear command

Author: Simon Naumov

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ flyway = { id = "org.flywaydb.flyway", version.ref = "flyway" }
 
 kotlin-std = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
-kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.5.0" }
+kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-protobuf", version = "1.5.0" }
 
 exposed-core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
 exposed-dao = { group = "org.jetbrains.exposed", name = "exposed-dao", version.ref = "exposed" }

src/main/kotlin/com/github/poolParty/pullPartyBot/handler/interaction/InitHandlers.kt

@@ -33,7 +33,7 @@ suspend fun Bot.initHandlers() {
         ListCommand(partyDaoImpl),
         PartyCommand(partyDaoImpl),
         DeleteCommand(partyDaoImpl),
-        ClearCommand(chatDaoImpl),
+        ClearCommand(),
         CreateCommand(partyDaoImpl),
         AliasCommand(partyDaoImpl),
         ChangeCommand(partyDaoImpl),

src/main/kotlin/com/github/poolParty/pullPartyBot/handler/interaction/callback/Callback.kt

@@ -7,22 +7,22 @@ import com.github.poolParty.pullPartyBot.database.dao.PartyDao
 import com.github.poolParty.pullPartyBot.handler.interaction.Interaction
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.protobuf.ProtoBuf
+import kotlinx.serialization.encodeToByteArray
+import kotlinx.serialization.decodeFromByteArray
 import mu.two.KotlinLogging
 
 @Serializable
 sealed class Callback {
 
     val encoded: String
-        get() = Json.encodeToString(this)
+        get() = ProtoBuf.encodeToByteArray(this).asSequence().map { it.toInt().toChar() }.joinToString("")
 
     abstract suspend fun Bot.process(callbackQuery: CallbackQuery, partyDao: PartyDao, chatDao: ChatDao)
 
     companion object {
         fun of(string: String) = try {
-            Json.decodeFromString<Callback>(string)
+            ProtoBuf.decodeFromByteArray<Callback>(string.map { it.code.toByte() }.toByteArray())
         } catch (e: SerializationException) {
             null
         }

src/main/kotlin/com/github/poolParty/pullPartyBot/handler/interaction/command/ClearCommand.kt

@@ -3,7 +3,6 @@ package com.github.poolParty.pullPartyBot.handler.interaction.command
 import com.elbekd.bot.Bot
 import com.elbekd.bot.types.Message
 import com.github.poolParty.pullPartyBot.Configuration
-import com.github.poolParty.pullPartyBot.database.dao.ChatDao
 import com.github.poolParty.pullPartyBot.handler.Button
 import com.github.poolParty.pullPartyBot.handler.deleteMessageLogging
 import com.github.poolParty.pullPartyBot.handler.interaction.callback.ClearConfirmationCallback
@@ -12,15 +11,15 @@ import com.github.poolParty.pullPartyBot.handler.message.HelpMessages
 import com.github.poolParty.pullPartyBot.handler.sendMessageLogging
 import kotlinx.coroutines.delay
 
-class ClearCommand(private val chatDao: ChatDao) :
+class ClearCommand() :
     AdministratorCommand("clear", "shut down all the parties ever existed", HelpMessages.clear) {
 
     override suspend fun Bot.administratorAction(message: Message, args: List<String>) {
         val chatId = message.chat.id
 
         val sentMessage = sendMessageLogging(
             chatId,
-            DeleteMessages.clearSuccess,
+            DeleteMessages.clearConfirmation,
             buttons = listOf(
                 Button("No, I changed my mind", ClearConfirmationCallback(chatId, message.from?.id, false)),
                 Button("Yes, I am pretty sure", ClearConfirmationCallback(chatId, message.from?.id, true)),

src/main/kotlin/com/github/poolParty/pullPartyBot/handler/message/DeleteMessages.kt

@@ -51,4 +51,9 @@ object DeleteMessages {
         """
         Action is available for admins only. 🙅‍
         """.trimIndent()
+
+    val clearConfirmation =
+        """
+        Are you completely sure you have an undeniable intention to proceed? 🤯
+        """.trimIndent()
 }