Merge 3f5b8ce325 into 281f0840eb

9.0.0

.gitignore

@@ -10,3 +10,6 @@ build/
 out/
 
 kotlin-js-store/
+
+local.*
+local.*/

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

HelloBot/src/main/kotlin/HelloBot.kt

@@ -1,8 +1,10 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
 import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMentionWithAnyContent
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
@@ -25,24 +27,25 @@ suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        onContentMessage { message ->
+        val me = getMe()
+        onMentionWithAnyContent(me) { message ->
             val chat = message.chat
 
             val answerText = when (val chat = message.chat) {
                 is ChannelChat -> {
                     val answer = "Hi everybody in this channel \"${chat.title}\""
                     reply(message, answer, MarkdownV2)
-                    return@onContentMessage
+                    return@onMentionWithAnyContent
                 }
                 is PrivateChat -> {
                     reply(message, "Hi, " + "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id), MarkdownV2)
-                    return@onContentMessage
+                    return@onMentionWithAnyContent
                 }
                 is GroupChat -> {
                     message.ifFromChannelGroupContentMessage {
                         val answer = "Hi, ${it.senderChat.title}"
                         reply(message, answer, MarkdownV2)
-                        return@onContentMessage
+                        return@onMentionWithAnyContent
                     }
                     "Oh, hi, " + when (chat) {
                         is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {

InlineQueriesBot/build.gradle

@@ -51,6 +51,6 @@ kotlin {
 }
 
 dependencies {
-    implementation 'io.ktor:ktor-client-logging-jvm:2.3.0'
+    implementation 'io.ktor:ktor-client-logging-jvm:2.3.2'
 }
 

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<String>) {
 
     bot.buildBehaviourWithLongPolling(
         defaultExceptionsHandler = {
-            println(it)
+            it.printStackTrace()
         }
     ) {
         onCommand("simple", initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull() ?.user ?.id == allowedAdmin }) {

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -32,7 +32,7 @@ suspend fun main(args: Array<String>) {
         }
     ) {
         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"

WebApp/src/jsMain/kotlin/main.kt

@@ -67,7 +67,7 @@ fun main() {
                         }
                     }
                 })
-                appendText("Example button")
+                appendText("Exit button")
             } ?: window.alert("Unable to load body")
 
             document.body ?.appendElement("p", {})

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g
 
 
-kotlin_version=1.8.20
+kotlin_version=1.8.22
-telegram_bot_api_version=7.1.0
+telegram_bot_api_version=9.0.0
-micro_utils_version=0.17.8
+micro_utils_version=0.19.7
-serialization_version=1.5.0
+serialization_version=1.5.1
-ktor_version=2.3.0
+ktor_version=2.3.2

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