several small improvements

Update telegram_bot_api_version to v3.2.4

DeepLinksBot/README.md

@@ -0,0 +1,9 @@
+# DeepLinksBot
+
+This bot will send you deeplink to this bot when you send some text message and react on the `start` button
+
+## Launch
+
+```bash
+../gradlew run --args="BOT_TOKEN"
+```

DeepLinksBot/build.gradle

@@ -0,0 +1,21 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'kotlin'
+apply plugin: 'application'
+
+mainClassName="DeepLinksBotKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+}

DeepLinksBot/src/main/kotlin/DeepLinksBot.kt

@@ -0,0 +1,39 @@
+import dev.inmo.micro_utils.coroutines.subscribeSafelySkippingExceptions
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitDeepLinks
+import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
+import dev.inmo.tgbotapi.extensions.utils.formatting.makeTelegramDeepLink
+import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
+
+/**
+ * This bot will send you deeplink to this bot when you send some text message and react on the `start` button
+ */
+suspend fun main(vararg args: String) {
+    val botToken = args.first()
+
+    telegramBotWithBehaviourAndLongPolling(botToken) {
+        val me = bot.getMe()
+        println(me)
+
+        onText(
+            initialFilter = { it.content.textSources.none { it is BotCommandTextSource } } // excluding messages with commands
+        ) {
+            reply(it, makeTelegramDeepLink(me.username, it.content.text))
+        }
+
+        onCommand("start", requireOnlyCommandInMessage = true) { // handling of `start` without args
+            reply(it, "Hi :) Send me any text and I will try hard to create deeplink for you")
+        }
+        onDeepLink { (it, deepLink) ->
+            reply(it, "Ok, I got deep link \"${deepLink}\" in trigger")
+        }
+        waitDeepLinks().subscribeSafelyWithoutExceptions(this) { (it, deepLink) ->
+            reply(it, "Ok, I got deep link \"${deepLink}\" in waiter")
+            println(triggersHolder.handleableCommandsHolder.handleable)
+        }
+    }.second.join()
+}

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.formatting.*
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
+import dev.inmo.tgbotapi.utils.botCommand
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.first
 
@@ -37,12 +38,11 @@ suspend fun main(args: Array<String>) {
         }
     ) {
         strictlyOn<ExpectContentOrStopState> {
-            sendMessage(
-                it.context,
-                buildEntities {
-                    +"Send me some content or " + botCommand("stop") + " if you want to stop sending"
-                }
-            )
+            send(
+                it.context
+            ) {
+                +"Send me some content or " + botCommand("stop") + " if you want to stop sending"
+            }
 
             val contentMessage = waitContentMessage().first()
             val content = contentMessage.content
@@ -56,7 +56,7 @@ suspend fun main(args: Array<String>) {
             }
         }
         strictlyOn<StopState> {
-            send(it.context, "You have stopped sending of content")
+            send(it.context) { +"You have stopped sending of content" }
 
             null
         }

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -6,6 +6,8 @@ import dev.inmo.tgbotapi.types.chat.CommonBot
 import dev.inmo.tgbotapi.types.chat.CommonUser
 import dev.inmo.tgbotapi.types.chat.ExtendedBot
 import dev.inmo.tgbotapi.types.message.*
+import dev.inmo.tgbotapi.utils.code
+import dev.inmo.tgbotapi.utils.regular
 import kotlinx.coroutines.*
 
 /**
@@ -33,9 +35,10 @@ suspend fun main(vararg args: String) {
                                     regular("User ")
                                 }
                             }
+
                             is CommonBot,
                             is ExtendedBot -> regular("Bot ")
-                        } + code(user.id.chatId.toString()) + " (${user.firstName} ${user.lastName}: ${user.username ?.username ?: "Without username"})"
+                        } + code(user.id.chatId.toString()) + " (${user.firstName} ${user.lastName}: ${user.username?.username ?: "Without username"})"
                     }
                     is ForwardInfo.PublicChat.FromChannel -> regular("Channel (") + code(forwardInfo.channelChat.title) + ")"
                     is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")"

GetMeBot/build.gradle

@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'kotlin'
 apply plugin: 'application'
 
-mainClassName="HelloBotKt"
+mainClassName="GetMeBotKt"
 
 
 dependencies {

HelloBot/src/main/kotlin/HelloBot.kt

@@ -3,8 +3,11 @@ 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.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
+import dev.inmo.tgbotapi.extensions.utils.ifChannelChat
+import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage
 import dev.inmo.tgbotapi.types.chat.*
 import dev.inmo.tgbotapi.types.chat.GroupChat
 import dev.inmo.tgbotapi.types.chat.PrivateChat
@@ -24,21 +27,35 @@ suspend fun main(vararg args: String) {
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         onContentMessage { message ->
             val chat = message.chat
-            if (chat is ChannelChat) {
-                val answer = "Hi everybody in this channel \"${chat.title}\""
-                send(chat, answer, MarkdownV2)
-                return@onContentMessage
-            }
-            val answerText = "Oh, hi, " + when (chat) {
-                is User -> "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id)
-                is PrivateChat -> "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id)
-                is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
-                    chat.title.linkMarkdownV2(it)
-                } ?: chat.title
-                is GroupChat -> bot.getChat(chat).inviteLink ?.let {
-                    chat.title.linkMarkdownV2(it)
-                } ?: chat.title
-                else -> "Unknown :(".escapeMarkdownV2Common()
+
+            val answerText = when (val chat = message.chat) {
+                is ChannelChat -> {
+                    val answer = "Hi everybody in this channel \"${chat.title}\""
+                    reply(message, answer, MarkdownV2)
+                    return@onContentMessage
+                }
+                is PrivateChat -> {
+                    reply(message, "Hi, " + "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id), MarkdownV2)
+                    return@onContentMessage
+                }
+                is GroupChat -> {
+                    message.ifFromChannelGroupContentMessage {
+                        val answer = "Hi, ${it.senderChat.title}"
+                        reply(message, answer, MarkdownV2)
+                        return@onContentMessage
+                    }
+                    "Oh, hi, " + when (chat) {
+                        is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
+                            chat.title.linkMarkdownV2(it)
+                        } ?: chat.title
+                        else -> bot.getChat(chat).inviteLink ?.let {
+                            chat.title.linkMarkdownV2(it)
+                        } ?: chat.title
+                    }
+                }
+                is UnknownExtendedChat,
+                is UnknownChatType -> "Unknown :(".escapeMarkdownV2Common()
+                else -> error("Something went wrong: unknown type of chat $chat")
             }
             reply(
                 message,

KeyboardsBot/KeyboardsBotLib/src/commonMain/kotlin/KeyboardsBot.kt

@@ -7,12 +7,11 @@ import dev.inmo.tgbotapi.extensions.api.edit.edit
 import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.botCommand
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.extensions.utils.withContent
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.message.content.TextContent
+import dev.inmo.tgbotapi.utils.*
 import kotlinx.coroutines.*
 
 private const val nextPageData = "next"
@@ -71,13 +70,14 @@ suspend fun activateKeyboardsBot(
             val numberOfPages = args.firstOrNull() ?.toIntOrNull() ?: 10
             reply(
                 message,
-                "Your inline keyboard with $numberOfPages pages",
                 replyMarkup = inlineKeyboard {
                     row {
                         includePageButtons(1, numberOfPages)
                     }
                 }
-            )
+            ) {
+                regular("Your inline keyboard with $numberOfPages pages")
+            }
         }
 
         onMessageDataCallbackQuery {
@@ -86,35 +86,33 @@ suspend fun activateKeyboardsBot(
                 return@onMessageDataCallbackQuery
             }
 
-            val text = "This is $page of $count"
-
             edit(
                 it.message.withContent<TextContent>() ?: it.let {
                     answer(it, "Unsupported message type :(")
                     return@onMessageDataCallbackQuery
                 },
-                text,
                 replyMarkup = inlineKeyboard {
                     row {
                         includePageButtons(page, count)
                     }
                 }
-            )
+            ) {
+                regular("This is $page of $count")
+            }
             answer(it)
         }
 
         onUnhandledCommand {
             reply(
                 it,
-                buildEntities {
-                    +"Use " + botCommand("inline") + " to get pagination inline keyboard"
-                },
                 replyMarkup = replyKeyboard(resizeKeyboard = true, oneTimeKeyboard = true) {
                     row {
                         simpleButton("/inline")
                     }
                 }
-            )
+            ) {
+                +"Use " + botCommand("inline") + " to get pagination inline keyboard"
+            }
         }
 
         setMyCommands(BotCommand("inline", "Creates message with pagination inline keyboard"))

StickerInfoBot/StickerInfoBotLib/src/commonMain/kotlin/StickerInfoBot.kt

@@ -7,10 +7,11 @@ import dev.inmo.tgbotapi.extensions.api.get.getStickerSet
 import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.*
 import dev.inmo.tgbotapi.types.StickerType
 import dev.inmo.tgbotapi.types.message.textsources.*
 import dev.inmo.tgbotapi.types.stickers.StickerSet
+import dev.inmo.tgbotapi.utils.bold
+import dev.inmo.tgbotapi.utils.buildEntities
 import kotlinx.coroutines.*
 
 fun StickerSet.buildInfo() = buildEntities {

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -7,16 +7,13 @@ import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.botCommand
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
-import dev.inmo.tgbotapi.utils.PreviewFeature
-import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import dev.inmo.tgbotapi.utils.*
 import io.ktor.http.*
 import io.ktor.server.application.call
 import io.ktor.server.http.content.*

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx768m
 
 
 kotlin_version=1.7.10
-telegram_bot_api_version=3.1.1
-micro_utils_version=0.12.1
-serialization_version=1.4.0-RC
-ktor_version=2.1.0
+telegram_bot_api_version=3.2.6
+micro_utils_version=0.12.13
+serialization_version=1.4.0
+ktor_version=2.1.1

settings.gradle

@@ -6,6 +6,8 @@ include ":HelloBot"
 
 include ":GetMeBot"
 
+include ":DeepLinksBot"
+
 include ":FilesLoaderBot"
 
 include ":ResenderBot:ResenderBotLib"