From 0d9e295baa3ad5ae5dbb5b35a0d399bc5a92f30d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 30 Jun 2023 17:49:19 +0600 Subject: [PATCH 1/5] 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 From 88b348376f8b9216fc5b7a3c7b4b04b997993e60 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 30 Jun 2023 22:53:12 +0600 Subject: [PATCH 2/5] add local folders and files into gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3129bd8..ad8ab87 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ build/ out/ kotlin-js-store/ + +local.* +local.*/ From 31d29712befa6fcd84b29c7eda50f5c30ea5061e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 1 Jul 2023 03:54:42 +0600 Subject: [PATCH 3/5] small improvements --- RightsChangerBot/src/main/kotlin/RightsChanger.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RightsChangerBot/src/main/kotlin/RightsChanger.kt b/RightsChangerBot/src/main/kotlin/RightsChanger.kt index 72cedc7..859f81e 100644 --- a/RightsChangerBot/src/main/kotlin/RightsChanger.kt +++ b/RightsChangerBot/src/main/kotlin/RightsChanger.kt @@ -1,3 +1,4 @@ +import dev.inmo.micro_utils.coroutines.runCatchingSafely import dev.inmo.tgbotapi.bot.ktor.telegramBot import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands import dev.inmo.tgbotapi.extensions.api.chat.get.getChat @@ -111,7 +112,7 @@ suspend fun main(args: Array) { bot.buildBehaviourWithLongPolling( defaultExceptionsHandler = { - println(it) + it.printStackTrace() } ) { onCommand("simple", initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull() ?.user ?.id == allowedAdmin }) { From aa3337bf3a99d2a2fccda59ea31a3d1077e0bef7 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 1 Jul 2023 13:52:48 +0600 Subject: [PATCH 4/5] update tgbotapi version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a093e5d..991cea5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.8.22 -telegram_bot_api_version=9.0.0-branch_9.0.0-build1762 +telegram_bot_api_version=9.0.0 micro_utils_version=0.19.7 serialization_version=1.5.1 ktor_version=2.3.2 From 34ed9621049651a89c3ed51acb5d09f1488397ea Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 1 Jul 2023 16:26:45 +0600 Subject: [PATCH 5/5] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2d5d93..4a71a62 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip