small fixes

3.1.1

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()
+}

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,

ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt

@@ -25,7 +25,9 @@ suspend fun activateResenderBot(
         ) {
             val chat = it.chat
             withTypingAction(chat) {
-                executeUnsafe(it.content.createResend(chat.id, replyToMessageId = it.messageId))
+                executeUnsafe(it.content.createResend(chat.id, replyToMessageId = it.messageId)) {
+                    it.forEach(print)
+                }
             }
         }
         onVisualGallery {

StickerInfoBot/StickerInfoBotLib/build.gradle

@@ -0,0 +1,33 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+}
+
+
+kotlin {
+    jvm()
+//    js(LEGACY) {
+    js(IR) {
+        browser()
+        binaries.executable()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+            }
+        }
+    }
+}

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

@@ -0,0 +1,71 @@
+import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandler
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
+import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.extensions.api.get.getCustomEmojiStickerOrNull
+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 kotlinx.coroutines.*
+
+fun StickerSet.buildInfo() = buildEntities {
+    bold("StickerSet name: ") + "${name}\n"
+    bold("StickerSet title: ") + "${title}\n"
+    bold(
+        when (stickerType) {
+            StickerType.CustomEmoji -> "Custom emoji"
+            StickerType.Mask -> "Mask"
+            StickerType.Regular -> "Regular"
+            is StickerType.Unknown -> "Unknown type \"${stickerType.type}\""
+        }
+    ) + " sticker set with title " + bold(title) + " and name " + bold(name)
+}
+
+suspend fun activateStickerInfoBot(
+    token: String,
+    print: (Any) -> Unit
+) {
+    val bot = telegramBot(token)
+
+    print(bot.getMe())
+
+    defaultSafelyWithoutExceptionHandler = {
+        it.printStackTrace()
+    }
+
+    bot.buildBehaviourWithLongPolling(CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
+        onText {
+            withTypingAction(it.chat) {
+                it.content.textSources.mapNotNull {
+                    if (it is CustomEmojiTextSource) {
+                        getCustomEmojiStickerOrNull(it.customEmojiId) ?.stickerSetName
+                    } else {
+                        null
+                    }
+                }.distinct().map {
+                    getStickerSet(it)
+                }.distinct().flatMap {
+                    it.buildInfo() + regular("\n")
+                }.separateForText().map { entities ->
+                    reply(it, entities)
+                }
+            }
+        }
+        onSticker {
+            val stickerSetInfo = getStickerSet(it.content.media)
+            reply(
+                it,
+                stickerSetInfo.buildInfo()
+            )
+        }
+
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
+            println(it)
+        }
+    }.join()
+}

StickerInfoBot/StickerInfoBotLib/src/jsMain/kotlin/StickerInfoBot.kt

@@ -0,0 +1,32 @@
+import kotlinx.browser.document
+import kotlinx.coroutines.*
+import org.w3c.dom.*
+
+private val scope = CoroutineScope(Dispatchers.Default)
+
+fun main() {
+    document.addEventListener(
+        "DOMContentLoaded",
+        {
+            val botsContainer = document.getElementById("bots_container") ?: return@addEventListener
+
+            (document.getElementById("bot_token_form") as? HTMLFormElement) ?.onsubmit = {
+                (document.getElementById("bot_token") as? HTMLInputElement) ?.value ?.let { token ->
+                    val botContainer = document.createElement("div") as HTMLDivElement
+                    botsContainer.append(botContainer)
+
+                    val infoDiv = document.createElement("div") as HTMLDivElement
+                    botContainer.append(infoDiv)
+
+                    scope.launch {
+                        activateStickerInfoBot(token) {
+                            infoDiv.innerHTML = it.toString()
+                        }
+                    }
+                }
+
+                false
+            }
+        }
+    )
+}

StickerInfoBot/StickerInfoBotLib/src/jsMain/resources/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Resender bot</title>
+</head>
+<body>
+    <form id="bot_token_form">
+        <input type="text" id="bot_token">
+        <input type="submit" value="Start bot">
+    </form>
+    <div id="start_offer">Type your bot token to the input above to start its work</div>
+    <script type="text/javascript" src="StickerInfoBotLib.js"></script>
+    <div id="bots_container"></div>
+</body>
+</html>

StickerInfoBot/jvm_launcher/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="StickerInfoBotJvmKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation project(":StickerInfoBot:StickerInfoBotLib")
+}

StickerInfoBot/jvm_launcher/src/main/kotlin/StickerInfoBotBotJvm.kt

@@ -0,0 +1,5 @@
+suspend fun main(args: Array<String>) {
+    activateStickerInfoBot(args.first()) {
+        println(it)
+    }
+}

WebApp/src/jsMain/kotlin/main.kt

@@ -3,6 +3,7 @@ import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.webapps.*
 import dev.inmo.tgbotapi.webapps.haptic.HapticFeedbackStyle
 import dev.inmo.tgbotapi.webapps.haptic.HapticFeedbackType
+import dev.inmo.tgbotapi.webapps.popup.*
 import io.ktor.client.HttpClient
 import io.ktor.client.request.*
 import io.ktor.client.statement.bodyAsText
@@ -68,6 +69,79 @@ fun main() {
                 })
                 appendText("Example button")
             } ?: window.alert("Unable to load body")
+
+            document.body ?.appendElement("p", {})
+            document.body ?.appendText("Alerts:")
+
+            document.body ?.appendElement("button") {
+                addEventListener("click", {
+                    webApp.showPopup(
+                        PopupParams(
+                            "It is sample title of default button",
+                            "It is sample message of default button",
+                            DefaultPopupButton("default", "Default button"),
+                            OkPopupButton("ok"),
+                            DestructivePopupButton("destructive", "Destructive button")
+                        )
+                    ) {
+                        document.body ?.log(
+                            when (it) {
+                                "default" -> "You have clicked default button in popup"
+                                "ok" -> "You have clicked ok button in popup"
+                                "destructive" -> "You have clicked destructive button in popup"
+                                else -> "I can't imagine where you take button with id $it"
+                            }
+                        )
+                    }
+                })
+                appendText("Popup")
+            } ?: window.alert("Unable to load body")
+
+            document.body ?.appendElement("button") {
+                addEventListener("click", {
+                    webApp.showAlert(
+                        "This is alert message"
+                    ) {
+                        document.body ?.log(
+                            "You have closed alert"
+                        )
+                    }
+                })
+                appendText("Alert")
+            } ?: window.alert("Unable to load body")
+
+            document.body ?.appendElement("button") {
+                addEventListener("click", {
+                    webApp.showConfirm(
+                        "This is confirm message"
+                    ) {
+                        document.body ?.log(
+                            "You have pressed \"${if (it) "Ok" else "Cancel"}\" in confirm"
+                        )
+                    }
+                })
+                appendText("Confirm")
+            } ?: window.alert("Unable to load body")
+
+            document.body ?.appendElement("p", {})
+
+            document.body ?.appendElement("button") {
+                fun updateText() {
+                    textContent = if (webApp.isClosingConfirmationEnabled) {
+                        "Disable closing confirmation"
+                    } else {
+                        "Enable closing confirmation"
+                    }
+                }
+                addEventListener("click", {
+                    webApp.toggleClosingConfirmation()
+                    updateText()
+                })
+                updateText()
+            } ?: window.alert("Unable to load body")
+
+            document.body ?.appendElement("p", {})
+
             webApp.apply {
                 onThemeChanged {
                     document.body ?.log("Theme changed: ${webApp.themeParams}")

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx768m
 
 
 kotlin_version=1.7.10
-telegram_bot_api_version=3.0.2
-micro_utils_version=0.12.0
-serialization_version=1.4.0-RC
-ktor_version=2.0.3
+telegram_bot_api_version=3.2.0
+micro_utils_version=0.12.4
+serialization_version=1.4.0
+ktor_version=2.1.0

settings.gradle

@@ -6,6 +6,8 @@ include ":HelloBot"
 
 include ":GetMeBot"
 
+include ":DeepLinksBot"
+
 include ":FilesLoaderBot"
 
 include ":ResenderBot:ResenderBotLib"
@@ -14,6 +16,9 @@ include ":ResenderBot:jvm_launcher"
 include ":KeyboardsBot:KeyboardsBotLib"
 include ":KeyboardsBot:jvm_launcher"
 
+include ":StickerInfoBot:StickerInfoBotLib"
+include ":StickerInfoBot:jvm_launcher"
+
 include ":SlotMachineDetectorBot"
 
 include ":WebApp"