➕ flume

build.gradle.kts

@@ -12,6 +12,9 @@ version = "0.1.0"
 repositories {
     maven("https://jitpack.io")
     mavenCentral()
+    flatDir {
+        dirs = mutableSetOf(file("dependencies"))
+    }
 }
 
 val jupyterVersion = "5.6.0"
@@ -20,15 +23,17 @@ val kotlinVersion = "1.5.30"
 dependencies {
     implementation("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlinVersion)
     implementation("org.jetbrains.kotlin", "kotlin-reflect", kotlinVersion)
-    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-protobuf", "1.2.2")
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.5.1")
+    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-protobuf", "1.3.0")
+    runtimeOnly("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", "1.0-M1-1.4.0-rc")
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.5.2")
 
     implementation("com.github.elbekD", "kt-telegram-bot", "1.3.8")
+    implementation("org.pool-party", "flume", "0.0.1")
 
     implementation("com.natpryce", "konfig", "1.6.10.0")
 
     implementation("org.slf4j", "slf4j-simple", "2.0.0-alpha2")
-    implementation("io.github.microutils", "kotlin-logging", "2.0.10")
+    implementation("io.github.microutils", "kotlin-logging", "2.0.11")
 
     testImplementation("org.jetbrains.kotlin", "kotlin-test-junit5", kotlinVersion)
     testImplementation("org.junit.jupiter", "junit-jupiter-api", jupyterVersion)

src/main/kotlin/com/github/pool_party/resistance_bot/Configuration.kt

@@ -1,23 +1,9 @@
 package com.github.pool_party.resistance_bot
 
+import com.github.pool_party.flume.configuration.AbstractConfiguration
 import com.github.pool_party.resistance_bot.state.Board
-import com.github.pool_party.resistance_bot.utils.ConfigurationUtils.boolean
-import com.github.pool_party.resistance_bot.utils.ConfigurationUtils.int
-import com.github.pool_party.resistance_bot.utils.ConfigurationUtils.seconds
-import com.github.pool_party.resistance_bot.utils.ConfigurationUtils.string
 
-object Configuration {
-
-    val APP_URL by string()
-    val USERNAME by string()
-    val PORT by int()
-    val HOST by string()
-
-    val DEBUG by boolean()
-
-    val LONGPOLL by boolean()
-
-    val TELEGRAM_TOKEN by string()
+object Configuration : AbstractConfiguration() {
 
     val REGISTRATION_TIME by seconds()
 
@@ -52,8 +38,5 @@ object Configuration {
 
     init {
         check((PLAYERS_GAME_MINIMUM..PLAYERS_GAME_MAXIMUM).all { it in BOARDS })
-        if (DEBUG) {
-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "DEBUG")
-        }
     }
 }

src/main/kotlin/com/github/pool_party/resistance_bot/Main.kt

@@ -1,26 +1,54 @@
 package com.github.pool_party.resistance_bot
 
-import com.elbekD.bot.Bot
-import com.elbekD.bot.server
-import com.github.pool_party.resistance_bot.utils.initHandlers
+import com.github.pool_party.resistance_bot.callback.CallbackDispatcher
+import com.github.pool_party.resistance_bot.callback.MissionVoteCallback
+import com.github.pool_party.resistance_bot.callback.SquadChoiceCallback
+import com.github.pool_party.resistance_bot.callback.SquadVoteCallback
+import com.github.pool_party.resistance_bot.callback.StopVoteCallback
+import com.github.pool_party.resistance_bot.command.ExtendCommand
+import com.github.pool_party.resistance_bot.command.GameCommand
+import com.github.pool_party.resistance_bot.command.HistoryCommand
+import com.github.pool_party.resistance_bot.command.RulesCommand
+import com.github.pool_party.resistance_bot.command.StartCommand
+import com.github.pool_party.resistance_bot.command.StopCommand
+import com.github.pool_party.resistance_bot.command.TagCommand
+import com.github.pool_party.resistance_bot.state.Coder
+import com.github.pool_party.resistance_bot.state.InMemoryStateStorage
+import com.github.pool_party.resistance_bot.state.LongCoder
+import com.github.pool_party.resistance_bot.state.StateStorage
+import com.github.pool_party.telegram_bot_utils.bot.BotBuilder
 
 fun main() {
-    val token = Configuration.TELEGRAM_TOKEN
-    val userName = Configuration.USERNAME
+    val stateStorage: StateStorage = InMemoryStateStorage()
+    val longCoder: Coder<Long> = LongCoder()
 
-    val bot = if (Configuration.LONGPOLL) {
-        Bot.createPolling(userName, token)
-    } else {
-        Bot.createWebhook(userName, token) {
-            url = "${Configuration.APP_URL}/$token"
+    val callbacks = listOf(
+        SquadChoiceCallback(stateStorage),
+        MissionVoteCallback(stateStorage),
+        SquadVoteCallback(stateStorage),
+        StopVoteCallback(stateStorage),
+    )
 
-            server {
-                host = Configuration.HOST
-                port = Configuration.PORT
-            }
-        }
-    }
-
-    bot.initHandlers()
-    bot.start()
+    BotBuilder(Configuration).apply {
+        interactions = listOf(
+            // registration
+            listOf(
+                GameCommand(stateStorage, longCoder),
+                StartCommand(stateStorage, longCoder),
+                StopCommand(stateStorage),
+            ),
+            // game
+            listOf(
+                HistoryCommand(stateStorage),
+                TagCommand(stateStorage),
+            ),
+            // utils
+            listOf(
+                ExtendCommand(stateStorage),
+                RulesCommand(),
+            ),
+            // other
+            listOf(CallbackDispatcher(callbacks)),
+        )
+    }.start()
 }

src/main/kotlin/com/github/pool_party/resistance_bot/action/RoleDistribution.kt

@@ -1,10 +1,10 @@
 package com.github.pool_party.resistance_bot.action
 
 import com.elbekD.bot.Bot
+import com.github.pool_party.flume.utils.sendMessageLogging
 import com.github.pool_party.resistance_bot.message.RECEIVE_RESISTANCE_ROLE
 import com.github.pool_party.resistance_bot.message.receiveSpyRole
 import com.github.pool_party.resistance_bot.state.StateStorage
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
 
 suspend fun Bot.distributeRoles(chatId: Long, stateStorage: StateStorage) {
     val state = stateStorage.getGameState(chatId) ?: return

src/main/kotlin/com/github/pool_party/resistance_bot/action/SquadChoice.kt

@@ -2,13 +2,13 @@ package com.github.pool_party.resistance_bot.action
 
 import com.elbekD.bot.Bot
 import com.elbekD.bot.types.InlineKeyboardButton
+import com.github.pool_party.flume.utils.sendMessageLogging
+import com.github.pool_party.flume.utils.toMarkUp
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.callback.SquadChoiceCallbackData
 import com.github.pool_party.resistance_bot.message.leaderChooseMessage
 import com.github.pool_party.resistance_bot.message.roundSummary
 import com.github.pool_party.resistance_bot.state.StateStorage
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
-import com.github.pool_party.resistance_bot.utils.toMarkUp
 
 suspend fun Bot.chooseSquad(chatId: Long, stateStorage: StateStorage) {
 

src/main/kotlin/com/github/pool_party/resistance_bot/action/StartGame.kt

@@ -1,13 +1,13 @@
 package com.github.pool_party.resistance_bot.action
 
 import com.elbekD.bot.Bot
+import com.github.pool_party.flume.utils.deleteMessageLogging
+import com.github.pool_party.flume.utils.sendMessageLogging
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.message.ON_GAME_START
 import com.github.pool_party.resistance_bot.message.ON_LESS_PLAYERS
 import com.github.pool_party.resistance_bot.message.ON_MORE_PLAYERS
 import com.github.pool_party.resistance_bot.state.StateStorage
-import com.github.pool_party.resistance_bot.utils.deleteMessageLogging
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
 
 suspend fun Bot.startGame(chatId: Long, stateStorage: StateStorage) {
     val state = stateStorage.getRegistrationState(chatId) ?: return

src/main/kotlin/com/github/pool_party/resistance_bot/action/Vote.kt

@@ -2,14 +2,14 @@ package com.github.pool_party.resistance_bot.action
 
 import com.elbekD.bot.Bot
 import com.elbekD.bot.types.InlineKeyboardButton
+import com.github.pool_party.flume.utils.sendMessageLogging
+import com.github.pool_party.flume.utils.toMarkUp
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.callback.CallbackData
 import com.github.pool_party.resistance_bot.callback.MissionVoteCallbackData
 import com.github.pool_party.resistance_bot.callback.SquadVoteCallbackData
 import com.github.pool_party.resistance_bot.message.MISSION_VOTE
 import com.github.pool_party.resistance_bot.message.TEAM_VOTE
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
-import com.github.pool_party.resistance_bot.utils.toMarkUp
 
 private suspend fun Bot.vote(text: String, memberIds: List<Long>, verdictVoteCallBackData: (Boolean) -> CallbackData) {
 

src/main/kotlin/com/github/pool_party/resistance_bot/callback/AbstractVoteCallback.kt

@@ -2,21 +2,22 @@ package com.github.pool_party.resistance_bot.callback
 
 import com.elbekD.bot.Bot
 import com.elbekD.bot.types.CallbackQuery
+import com.github.pool_party.flume.interaction.callback.Callback
+import com.github.pool_party.flume.utils.editMessageTextLogging
+import com.github.pool_party.flume.utils.name
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.action.chooseSquad
 import com.github.pool_party.resistance_bot.state.GameState
 import com.github.pool_party.resistance_bot.state.Member
 import com.github.pool_party.resistance_bot.state.StateStorage
 import com.github.pool_party.resistance_bot.state.Vote
-import com.github.pool_party.resistance_bot.utils.editMessageTextLogging
-import com.github.pool_party.resistance_bot.utils.name
 
 interface VoteCallbackData {
     val gameChatId: Long
     val verdict: Boolean
 }
 
-abstract class AbstractVoteCallback(protected val stateStorage: StateStorage) : Callback {
+abstract class AbstractVoteCallback(protected val stateStorage: StateStorage) : Callback<CallbackData> {
 
     abstract suspend fun getMemberNumber(voteCallbackData: VoteCallbackData): Int?
 

src/main/kotlin/com/github/pool_party/resistance_bot/callback/CallbackDispatcher.kt

@@ -0,0 +1,30 @@
+package com.github.pool_party.resistance_bot.callback
+
+import com.github.pool_party.flume.interaction.callback.AbstractCallbackDispatcher
+import com.github.pool_party.flume.interaction.callback.Callback
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromByteArray
+import kotlinx.serialization.encodeToByteArray
+import kotlinx.serialization.protobuf.ProtoBuf
+
+/**
+ * There is a hack with short property serial names to fit into 64 Telegram API callback data bytes.
+ */
+@Serializable
+sealed class CallbackData {
+    abstract val gameChatId: Long
+
+    val encoded: String
+        get() = ProtoBuf.encodeToByteArray(this).joinToString("") { it.toInt().toChar().toString() }
+
+    companion object {
+        fun of(string: String) =
+            ProtoBuf.decodeFromByteArray<CallbackData>(string.map { it.code.toByte() }.toByteArray())
+    }
+}
+
+class CallbackDispatcher(callbacks: List<Callback<CallbackData>>) :
+    AbstractCallbackDispatcher<CallbackData>(callbacks) {
+
+    override fun getCallbackData(data: String): CallbackData = CallbackData.of(data)
+}

src/main/kotlin/com/github/pool_party/resistance_bot/callback/MissionVoteCallback.kt

@@ -1,12 +1,12 @@
 package com.github.pool_party.resistance_bot.callback
 
 import com.elbekD.bot.Bot
+import com.github.pool_party.flume.utils.sendMessageLogging
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.state.GameState
 import com.github.pool_party.resistance_bot.state.RoundResult
 import com.github.pool_party.resistance_bot.state.StateStorage
 import com.github.pool_party.resistance_bot.state.Vote
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/com/github/pool_party/resistance_bot/callback/SquadChoiceCallback.kt

@@ -2,16 +2,17 @@ package com.github.pool_party.resistance_bot.callback
 
 import com.elbekD.bot.Bot
 import com.elbekD.bot.types.CallbackQuery
+import com.github.pool_party.flume.interaction.callback.Callback
+import com.github.pool_party.flume.utils.editMessageReplyMarkupLogging
+import com.github.pool_party.flume.utils.editMessageTextLogging
+import com.github.pool_party.flume.utils.name
+import com.github.pool_party.flume.utils.sendMessageLogging
+import com.github.pool_party.flume.utils.toMarkUp
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.action.squadVote
 import com.github.pool_party.resistance_bot.state.StateStorage
-import com.github.pool_party.resistance_bot.utils.editMessageReplyMarkupLogging
-import com.github.pool_party.resistance_bot.utils.editMessageTextLogging
 import com.github.pool_party.resistance_bot.utils.goToBotMarkup
 import com.github.pool_party.resistance_bot.utils.makeUserLink
-import com.github.pool_party.resistance_bot.utils.name
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
-import com.github.pool_party.resistance_bot.utils.toMarkUp
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -23,7 +24,7 @@ data class SquadChoiceCallbackData(override val gameChatId: Long, val personId:
     }
 }
 
-class SquadChoiceCallback(private val stateStorage: StateStorage) : Callback {
+class SquadChoiceCallback(private val stateStorage: StateStorage) : Callback<CallbackData> {
 
     override val callbackDataKClass = SquadChoiceCallbackData::class
 

src/main/kotlin/com/github/pool_party/resistance_bot/callback/SquadVoteCallback.kt

@@ -1,6 +1,7 @@
 package com.github.pool_party.resistance_bot.callback
 
 import com.elbekD.bot.Bot
+import com.github.pool_party.flume.utils.sendMessageLogging
 import com.github.pool_party.resistance_bot.Configuration
 import com.github.pool_party.resistance_bot.action.missionVote
 import com.github.pool_party.resistance_bot.message.TEAM_APPROVED
@@ -10,7 +11,6 @@ import com.github.pool_party.resistance_bot.state.GameState
 import com.github.pool_party.resistance_bot.state.StateStorage
 import com.github.pool_party.resistance_bot.state.Vote
 import com.github.pool_party.resistance_bot.utils.goToBotMarkup
-import com.github.pool_party.resistance_bot.utils.sendMessageLogging
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable