From 0d9e295baa3ad5ae5dbb5b35a0d399bc5a92f30d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 30 Jun 2023 17:49:19 +0600 Subject: [PATCH] start migration onto 9.0.0 --- DeepLinksBot/src/main/kotlin/DeepLinksBot.kt | 7 ++++++- HelloBot/src/main/kotlin/HelloBot.kt | 2 +- StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt | 2 +- gradle.properties | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/DeepLinksBot/src/main/kotlin/DeepLinksBot.kt b/DeepLinksBot/src/main/kotlin/DeepLinksBot.kt index 5614cbc..7b4f514 100644 --- a/DeepLinksBot/src/main/kotlin/DeepLinksBot.kt +++ b/DeepLinksBot/src/main/kotlin/DeepLinksBot.kt @@ -17,12 +17,17 @@ suspend fun main(vararg args: String) { telegramBotWithBehaviourAndLongPolling(botToken) { val me = bot.getMe() + val username = me.username println(me) + if (username == null) { + error("Unable to start bot work: it have no username") + } + onText( initialFilter = { it.content.textSources.none { it is BotCommandTextSource } } // excluding messages with commands ) { - reply(it, makeTelegramDeepLink(me.username, it.content.text)) + reply(it, makeTelegramDeepLink(username, it.content.text)) } onCommand("start", requireOnlyCommandInMessage = true) { // handling of `start` without args diff --git a/HelloBot/src/main/kotlin/HelloBot.kt b/HelloBot/src/main/kotlin/HelloBot.kt index 10f83eb..86c58ef 100644 --- a/HelloBot/src/main/kotlin/HelloBot.kt +++ b/HelloBot/src/main/kotlin/HelloBot.kt @@ -28,7 +28,7 @@ suspend fun main(vararg args: String) { telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) { val me = getMe() - onMentionWithAnyContent(me.username) { message -> + onMentionWithAnyContent(me) { message -> val chat = message.chat val answerText = when (val chat = message.chat) { diff --git a/StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt b/StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt index 95b6330..8e46614 100644 --- a/StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt +++ b/StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt @@ -32,7 +32,7 @@ suspend fun main(args: Array) { } ) { val me = getMe() - fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username.usernameWithoutAt}" + fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username ?.usernameWithoutAt}" onCommand("start") { reply(it) { botCommand("delete") + " - to clear stickers" diff --git a/gradle.properties b/gradle.properties index 61ca397..a093e5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -kotlin_version=1.8.21 -telegram_bot_api_version=8.0.1 -micro_utils_version=0.19.2 +kotlin_version=1.8.22 +telegram_bot_api_version=9.0.0-branch_9.0.0-build1762 +micro_utils_version=0.19.7 serialization_version=1.5.1 -ktor_version=2.3.1 +ktor_version=2.3.2