add opportunity to set port different with 8080 in WebAppServer sample

7.0.0

.github/workflows/build.yml

@@ -8,6 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt install -y libcurl4-openssl-dev
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -48,7 +48,7 @@ suspend fun main(args: Array<String>) {
                 +"Send me some content or " + botCommand("stop") + " if you want to stop sending"
             }
 
-            val contentMessage = waitContentMessage().filter { message ->
+            val contentMessage = waitAnyContentMessage().filter { message ->
                 message.sameThread(it.sourceMessage)
             }.first()
             val content = contentMessage.content

FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt

@@ -1,10 +1,39 @@
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.files.downloadFile
+import dev.inmo.tgbotapi.extensions.api.files.downloadFileToTemp
 import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.replyWithAnimation
+import dev.inmo.tgbotapi.extensions.api.send.replyWithAudio
+import dev.inmo.tgbotapi.extensions.api.send.replyWithDocument
+import dev.inmo.tgbotapi.extensions.api.send.replyWithMediaGroup
+import dev.inmo.tgbotapi.extensions.api.send.replyWithPhoto
+import dev.inmo.tgbotapi.extensions.api.send.replyWithSticker
+import dev.inmo.tgbotapi.extensions.api.send.replyWithVideo
+import dev.inmo.tgbotapi.extensions.api.send.replyWithVideoNote
+import dev.inmo.tgbotapi.extensions.api.send.replyWithVoice
+import dev.inmo.tgbotapi.extensions.api.send.withAction
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMedia
+import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
+import dev.inmo.tgbotapi.requests.send.SendAction
+import dev.inmo.tgbotapi.types.actions.BotAction
+import dev.inmo.tgbotapi.types.actions.TypingAction
+import dev.inmo.tgbotapi.types.media.TelegramMediaAudio
+import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
+import dev.inmo.tgbotapi.types.media.TelegramMediaPhoto
+import dev.inmo.tgbotapi.types.media.TelegramMediaVideo
+import dev.inmo.tgbotapi.types.message.content.AnimationContent
+import dev.inmo.tgbotapi.types.message.content.AudioContent
+import dev.inmo.tgbotapi.types.message.content.DocumentContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.StickerContent
+import dev.inmo.tgbotapi.types.message.content.VideoContent
+import dev.inmo.tgbotapi.types.message.content.VideoNoteContent
+import dev.inmo.tgbotapi.types.message.content.VoiceContent
 import dev.inmo.tgbotapi.utils.filenameFromUrl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,15 +52,72 @@ suspend fun main(args: Array<String>) {
             reply(it, "Send me any media (like photo or video) to download it")
         }
         onMedia(initialFilter = null) {
-            val pathedFile = bot.getFileAdditionalInfo(it.content.media)
+            val content = it.content
+            val pathedFile = bot.getFileAdditionalInfo(content.media)
             val outFile = File(directoryOrFile, pathedFile.filePath.filenameFromUrl)
             runCatching {
-                bot.downloadFile(it.content.media, outFile)
+                bot.downloadFile(content.media, outFile)
             }.onFailure {
                 it.printStackTrace()
+            }.onSuccess { _ ->
+                reply(it, "Saved to ${outFile.absolutePath}")
+                withAction(it.chat.id, TypingAction) {
+                    when (content) {
+                        is PhotoContent -> replyWithPhoto(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is AnimationContent -> replyWithAnimation(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is VideoContent -> replyWithVideo(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is StickerContent -> replyWithSticker(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is MediaGroupContent<*> -> replyWithMediaGroup(
+                            it,
+                            content.group.map {
+                                when (val innerContent = it.content) {
+                                    is AudioContent -> TelegramMediaAudio(
+                                        downloadFileToTemp(innerContent.media).asMultipartFile()
+                                    )
+                                    is DocumentContent -> TelegramMediaDocument(
+                                        downloadFileToTemp(innerContent.media).asMultipartFile()
+                                    )
+                                    is PhotoContent -> TelegramMediaPhoto(
+                                        downloadFileToTemp(innerContent.media).asMultipartFile()
+                                    )
+                                    is VideoContent -> TelegramMediaVideo(
+                                        downloadFileToTemp(innerContent.media).asMultipartFile()
+                                    )
+                                }
+                            }
+                        )
+                        is AudioContent -> replyWithAudio(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is DocumentContent -> replyWithDocument(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is VoiceContent -> replyWithVoice(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                        is VideoNoteContent -> replyWithVideoNote(
+                            it,
+                            outFile.asMultipartFile()
+                        )
+                    }
+                }
             }
-            reply(it, "Saved to ${outFile.absolutePath}")
         }
-        onContentMessage { println(it) }
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
     }.second.join()
 }

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -1,12 +1,14 @@
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
-import dev.inmo.tgbotapi.extensions.utils.formatting.*
+import dev.inmo.tgbotapi.extensions.utils.formatting.makeLink
 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.buildEntities
 import dev.inmo.tgbotapi.utils.code
+import dev.inmo.tgbotapi.utils.link
 import dev.inmo.tgbotapi.utils.regular
 import kotlinx.coroutines.*
 
@@ -40,7 +42,14 @@ suspend fun main(vararg args: String) {
                             is ExtendedBot -> regular("Bot ")
                         } + 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.FromChannel -> {
+                        regular("Channel (") + (forwardInfo.channelChat.username ?.let {
+                            link(
+                                forwardInfo.channelChat.title,
+                                makeLink(it)
+                            )
+                        } ?: code(forwardInfo.channelChat.title)) + ")"
+                    }
                     is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")"
                     is ForwardInfo.PublicChat.SentByChannel -> regular("Sent by channel (") + code(forwardInfo.channelChat.title) + ")"
                 }

LiveLocationsBot/README.md

@@ -0,0 +1,9 @@
+# LiveLocationsBot
+
+This bot will send you live location and update it from time to time
+
+## Launch
+
+```bash
+../gradlew run --args="BOT_TOKEN"
+```

LiveLocationsBot/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="LiveLocationsBotKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+}

LiveLocationsBot/src/main/kotlin/LiveLocationsBot.kt

@@ -0,0 +1,84 @@
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.api.EditLiveLocationInfo
+import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
+import dev.inmo.tgbotapi.extensions.api.edit.edit
+import dev.inmo.tgbotapi.extensions.api.handleLiveLocation
+import dev.inmo.tgbotapi.extensions.api.send.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
+import dev.inmo.tgbotapi.extensions.behaviour_builder.oneOf
+import dev.inmo.tgbotapi.extensions.behaviour_builder.parallel
+import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
+import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
+import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
+import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
+import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
+import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chat.GroupChat
+import dev.inmo.tgbotapi.types.chat.PrivateChat
+import dev.inmo.tgbotapi.types.chat.SupergroupChat
+import dev.inmo.tgbotapi.types.location.LiveLocation
+import dev.inmo.tgbotapi.types.message.MarkdownV2
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.LiveLocationContent
+import dev.inmo.tgbotapi.types.message.content.LocationContent
+import dev.inmo.tgbotapi.utils.PreviewFeature
+import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+
+/**
+ * This bot will send you live location and update it from time to time
+ */
+suspend fun main(vararg args: String) {
+    val botToken = args.first()
+
+    telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
+        val locationsFlow = flow {
+            var i = 0
+            while (isActive) {
+                val newInfo = EditLiveLocationInfo(
+                    latitude = i.toDouble(),
+                    longitude = i.toDouble(),
+                    replyMarkup = flatInlineKeyboard {
+                        dataButton("Cancel", "cancel")
+                    }
+                )
+                emit(newInfo)
+                i++
+                delay(3000L) // 3 seconds
+            }
+        }
+        onCommand("start") {
+            // in this flow will be actual message with live location
+            val currentMessageState = MutableStateFlow<ContentMessage<LocationContent>?>(null)
+            val sendingJob = launch {
+                handleLiveLocation(
+                    it.chat.id,
+                    locationsFlow,
+                    sentMessageFlow = FlowCollector { currentMessageState.emit(it) }
+                )
+            }
+
+            waitMessageDataCallbackQuery().filter {
+                it.message.sameMessage(
+                    currentMessageState.value ?: return@filter false
+                ) && it.data == "cancel"
+            }.first()
+
+            sendingJob.cancel() // ends live location
+            currentMessageState.value ?.let {
+                edit(it, replyMarkup = null) // removing reply keyboard
+            }
+        }
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
+    }.second.join()
+}
+

README.md

@@ -4,6 +4,8 @@ This repository contains several examples of simple bots which are using Telegra
 
 ## How to use this repository
 
+***TO RUN NATIVE TARGETS ON LINUX YOU SHOULD INSTALL CURL LIBRARY. FOR EXAMPLE: `sudo apt install libcurl4-gnutls-dev`***
+
 This repository contains several important things:
 
 * Example subprojects

RandomFileSenderBot/build.gradle

@@ -8,14 +8,45 @@ buildscript {
     }
 }
 
-apply plugin: 'kotlin'
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+}
+
 apply plugin: 'application'
 
 mainClassName="RandomFileSenderBotKt"
 
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+kotlin {
+    def hostOs = System.getProperty("os.name")
+    def isMingwX64 = hostOs.startsWith("Windows")
+    def nativeTarget
+    if (hostOs == "Linux") nativeTarget = linuxX64("native") { binaries { executable() } }
+    else if (isMingwX64) nativeTarget = mingwX64("native") { binaries { executable() } }
+    else throw new GradleException("Host OS is not supported in Kotlin/Native.")
 
-    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+    jvm()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+            }
+        }
+
+        nativeMain {
+            dependencies {
+                def engine
+
+                if (hostOs == "Linux") engine = "curl"
+                else if (isMingwX64) engine = "winhttp"
+                else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+                api "io.ktor:ktor-client-$engine:$ktor_version"
+            }
+        }
+    }
 }
+

RandomFileSenderBot/src/commonMain/kotlin/Bot.kt

@@ -1,23 +1,25 @@
+import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filesize
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocument
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocumentsGroup
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.withUploadDocumentAction
+import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommandWithArgs
 import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
 import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
-import java.io.File
 
 private const val command = "send_file"
 
+expect fun pickFile(currentRoot: MPPFile): MPPFile?
+
 /**
  * This bot will send files inside of working directory OR from directory in the second argument.
  * You may send /send_file command to this bot to get random file from the directory OR
@@ -25,19 +27,10 @@ private const val command = "send_file"
  * /send_file and `/send_file 1` will have the same effect - bot will send one random file.
  * But if you will send `/send_file 5` it will choose 5 random files and send them as group
  */
-suspend fun main(args: Array<String>) {
-    val botToken = args.first()
-    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("")
+suspend fun doRandomFileSenderBot(token: String, folder: MPPFile) {
+    val bot = telegramBot(token)
 
-    fun pickFile(currentRoot: File = directoryOrFile): File? {
-        if (currentRoot.isFile) {
-            return currentRoot
-        } else {
-            return pickFile(currentRoot.listFiles() ?.takeIf { it.isNotEmpty() } ?.random() ?: return null)
-        }
-    }
-
-    suspend fun TelegramBot.sendFiles(chat: Chat, files: List<File>) {
+    suspend fun TelegramBot.sendFiles(chat: Chat, files: List<MPPFile>) {
         when (files.size) {
             1 -> sendDocument(
                 chat.id,
@@ -52,8 +45,6 @@ suspend fun main(args: Array<String>) {
         }
     }
 
-    val bot = telegramBot(botToken)
-
     bot.buildBehaviourWithLongPolling (defaultExceptionsHandler = { it.printStackTrace() }) {
         onCommandWithArgs(command) { message, args ->
 
@@ -62,10 +53,10 @@ suspend fun main(args: Array<String>) {
                 var sent = false
 
                 var left = count
-                val chosen = mutableListOf<File>()
+                val chosen = mutableListOf<MPPFile>()
 
                 while (left > 0) {
-                    val picked = pickFile() ?.takeIf { it.filesize > 0 } ?: continue
+                    val picked = pickFile(folder) ?.takeIf { it.filesize > 0 } ?: continue
                     chosen.add(picked)
                     left--
                     if (chosen.size >= mediaCountInMediaGroup.last) {

RandomFileSenderBot/src/jvmMain/kotlin/ActualPickFile.kt

@@ -0,0 +1,10 @@
+import dev.inmo.micro_utils.common.MPPFile
+import java.io.File
+
+actual fun pickFile(currentRoot: MPPFile): File? {
+    if (currentRoot.isFile) {
+        return currentRoot
+    } else {
+        return pickFile(currentRoot.listFiles() ?.takeIf { it.isNotEmpty() } ?.random() ?: return null)
+    }
+}

RandomFileSenderBot/src/jvmMain/kotlin/RandomFileSenderBot.kt

@@ -0,0 +1,5 @@
+import dev.inmo.micro_utils.common.MPPFile
+
+suspend fun main(args: Array<String>) {
+    doRandomFileSenderBot(args.first(), MPPFile(args.getOrNull(1) ?: ""))
+}

RandomFileSenderBot/src/nativeMain/kotlin/ActualPickFile.kt

@@ -0,0 +1,10 @@
+import dev.inmo.micro_utils.common.MPPFile
+import okio.FileSystem
+
+actual fun pickFile(currentRoot: MPPFile): MPPFile? {
+    if (FileSystem.SYSTEM.exists(currentRoot) && FileSystem.SYSTEM.listOrNull(currentRoot) == null) {
+        return currentRoot
+    } else {
+        return pickFile(FileSystem.SYSTEM.list(currentRoot).takeIf { it.isNotEmpty() } ?.random() ?: return null)
+    }
+}

RandomFileSenderBot/src/nativeMain/kotlin/RandomFileSenderBot.kt

@@ -0,0 +1,8 @@
+import kotlinx.coroutines.runBlocking
+import okio.Path.Companion.toPath
+
+fun main(args: Array<String>) {
+    runBlocking {
+        doRandomFileSenderBot(args.first(), args.getOrNull(1) ?.toPath() ?: "".toPath())
+    }
+}

ResenderBot/ResenderBotLib/build.gradle

@@ -20,6 +20,8 @@ kotlin {
         browser()
         binaries.executable()
     }
+    linuxX64()
+    mingwX64()
 
     sourceSets {
         commonMain {

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

@@ -15,11 +15,7 @@ suspend fun activateResenderBot(
     token: String,
     print: (Any) -> Unit
 ) {
-    val bot = telegramBot(token)
-
-    print(bot.getMe())
-
-    bot.buildBehaviourWithLongPolling(CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
+    telegramBotWithBehaviourAndLongPolling(token, scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
         onContentMessage(
             subcontextUpdatesFilter = MessageFilterByChat,
         ) {
@@ -43,5 +39,6 @@ suspend fun activateResenderBot(
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
-    }.join()
+        print(bot.getMe())
+    }.second.join()
 }

ResenderBot/native_launcher/build.gradle

@@ -0,0 +1,46 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+}
+
+
+kotlin {
+    def hostOs = System.getProperty("os.name")
+    def isMingwX64 = hostOs.startsWith("Windows")
+    def nativeTarget
+    if (hostOs == "Linux") nativeTarget = linuxX64("native") { binaries { executable() } }
+    else if (isMingwX64) nativeTarget = mingwX64("native") { binaries { executable() } }
+    else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api project(":ResenderBot:ResenderBotLib")
+            }
+        }
+
+        nativeMain {
+            dependencies {
+                def engine
+
+                if (hostOs == "Linux") engine = "curl"
+                else if (isMingwX64) engine = "winhttp"
+                else throw new GradleException("Host OS is not supported in Kotlin/Native.")
+
+                api "io.ktor:ktor-client-$engine:$ktor_version"
+            }
+        }
+    }
+}
+

ResenderBot/native_launcher/src/nativeMain/kotlin/ResenderBot.kt

@@ -0,0 +1,9 @@
+import kotlinx.coroutines.runBlocking
+
+fun main(vararg args: String) {
+    runBlocking {
+        activateResenderBot(args.first()) {
+            println(it)
+        }
+    }
+}

RightsChangerBot/src/main/kotlin/RightsChanger.kt

@@ -109,7 +109,11 @@ suspend fun main(args: Array<String>) {
         }
     }
 
-    bot.buildBehaviourWithLongPolling {
+    bot.buildBehaviourWithLongPolling(
+        defaultExceptionsHandler = {
+            println(it)
+        }
+    ) {
         onCommand("simple", initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull() ?.user ?.id == allowedAdmin }) {
             val replyMessage = it.replyTo
             val userInReply = replyMessage ?.fromUserMessageOrNull() ?.user ?.id ?: return@onCommand

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

@@ -6,9 +6,21 @@ import dev.inmo.tgbotapi.extensions.api.get.*
 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.types.StickerFormat
 import dev.inmo.tgbotapi.types.StickerType
 import dev.inmo.tgbotapi.types.message.textsources.*
+import dev.inmo.tgbotapi.types.stickers.AnimatedStickerSet
+import dev.inmo.tgbotapi.types.stickers.CustomEmojiSimpleStickerSet
+import dev.inmo.tgbotapi.types.stickers.CustomEmojiStickerSet
+import dev.inmo.tgbotapi.types.stickers.CustomEmojiVideoStickerSet
+import dev.inmo.tgbotapi.types.stickers.MaskSimpleStickerSet
+import dev.inmo.tgbotapi.types.stickers.MaskStickerSet
+import dev.inmo.tgbotapi.types.stickers.MaskVideoStickerSet
+import dev.inmo.tgbotapi.types.stickers.RegularSimpleStickerSet
+import dev.inmo.tgbotapi.types.stickers.RegularStickerSet
+import dev.inmo.tgbotapi.types.stickers.RegularVideoStickerSet
 import dev.inmo.tgbotapi.types.stickers.StickerSet
+import dev.inmo.tgbotapi.types.stickers.UnknownStickerSet
 import dev.inmo.tgbotapi.utils.bold
 import dev.inmo.tgbotapi.utils.buildEntities
 import kotlinx.coroutines.*
@@ -19,6 +31,12 @@ fun StickerSet?.buildInfo() = buildEntities {
     } else {
         bold("StickerSet name: ") + "${name}\n"
         bold("StickerSet title: ") + "${title}\n"
+        bold("Sticker format: ") + when (stickerFormat) {
+            StickerFormat.Animated -> "Animated"
+            StickerFormat.Static -> "Static"
+            is StickerFormat.Unknown -> stickerFormat.type
+            StickerFormat.Video -> "Video"
+        } + "\n"
         bold(
             when (stickerType) {
                 StickerType.CustomEmoji -> "Custom emoji"

StickerSetHandler/README.md

@@ -0,0 +1,9 @@
+# StickerSetHandler
+
+Send sticker to this bot to form your own stickers set. Send /delete to delete this sticker set
+
+## How to run
+
+```bash
+./gradlew run --args="TOKEN"
+```

StickerSetHandler/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="StickerSetHandlerBotKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+}

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -0,0 +1,101 @@
+import dev.inmo.micro_utils.coroutines.runCatchingSafely
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
+import dev.inmo.tgbotapi.extensions.api.files.downloadFile
+import dev.inmo.tgbotapi.extensions.api.files.downloadFileToTemp
+import dev.inmo.tgbotapi.extensions.api.get.getStickerSet
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.stickers.addStickerToSet
+import dev.inmo.tgbotapi.extensions.api.stickers.createNewStickerSet
+import dev.inmo.tgbotapi.extensions.api.stickers.deleteStickerSet
+import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onSticker
+import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sticker
+import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
+import dev.inmo.tgbotapi.requests.stickers.InputSticker
+import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.types.toChatId
+import dev.inmo.tgbotapi.utils.botCommand
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+
+/**
+ * Send sticker to this bot to form your own stickers set. Send /delete to delete this sticker set
+ */
+suspend fun main(args: Array<String>) {
+    telegramBotWithBehaviourAndLongPolling(
+        args.first(),
+        scope = CoroutineScope(Dispatchers.IO),
+        defaultExceptionsHandler = {
+            it.printStackTrace()
+        }
+    ) {
+        val me = getMe()
+        fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username.usernameWithoutAt}"
+        onCommand("start") {
+            reply(it) {
+                botCommand("delete") + " - to clear stickers"
+            }
+        }
+        onCommand("delete") {
+            val deleted = runCatchingSafely {
+                deleteStickerSet(it.chat.stickerSetName())
+            }.getOrElse { false }
+
+            if (deleted) {
+                reply(it, "Deleted")
+            } else {
+                reply(it, "Can't delete for some of reason")
+            }
+        }
+        onSticker {
+            val stickerSetName = it.chat.stickerSetName()
+            val sticker = it.content.media
+            val newSticker = when (sticker) {
+                is CustomEmojiSticker -> InputSticker.WithKeywords.CustomEmoji(
+                    downloadFileToTemp(sticker.fileId).asMultipartFile(),
+                    listOf(sticker.emoji ?: "\uD83D\uDE0A"),
+                    emptyList()
+                )
+                is MaskSticker -> InputSticker.Mask(
+                    downloadFileToTemp(sticker.fileId).asMultipartFile(),
+                    listOf(sticker.emoji ?: "\uD83D\uDE0A"),
+                    sticker.maskPosition
+                )
+                is RegularSticker -> InputSticker.WithKeywords.Regular(
+                    downloadFileToTemp(sticker.fileId).asMultipartFile(),
+                    listOf(sticker.emoji ?: "\uD83D\uDE0A"),
+                    emptyList()
+                )
+                is UnknownSticker -> return@onSticker
+            }
+            runCatchingSafely {
+                getStickerSet(stickerSetName)
+            }.onSuccess { stickerSet ->
+                addStickerToSet(it.chat.id.toChatId(), stickerSet.name, newSticker).also { _ ->
+                    reply(
+                        it,
+                        getStickerSet(stickerSetName).stickers.last()
+                    )
+                }
+            }.onFailure { _ ->
+                createNewStickerSet(
+                    it.chat.id.toChatId(),
+                    stickerSetName,
+                    "Sticker set by ${me.firstName}",
+                    it.content.media.stickerFormat,
+                    listOf(
+                        newSticker
+                    ),
+                    (sticker as? CustomEmojiSticker) ?.needsRepainting ?: false
+                ).also { _ ->
+                    reply(
+                        it,
+                        getStickerSet(stickerSetName).stickers.first()
+                    )
+                }
+            }
+        }
+    }.second.join()
+}

WebApp/README.md

@@ -12,6 +12,6 @@ What is there in this module:
 
 ## How to run
 
-```kotlin
+```bash
 ./gradlew run --args="TOKEN WEB_APP_ADDRESS"
 ```

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -43,14 +43,13 @@ suspend fun main(vararg args: String) {
     val bot = telegramBot(telegramBotAPIUrlsKeeper)
     createKtorServer(
         "0.0.0.0",
-        8080,
+        args.getOrNull(2) ?.toIntOrNull() ?: 8080,
         additionalEngineEnvironmentConfigurator = {
             parentCoroutineContext += Dispatchers.IO
         }
     ) {
         routing {
-            static {
-                files(File("WebApp/build/distributions"))
+            staticFiles("", File("WebApp/build/distributions")) {
                 default("WebApp/build/distributions/index.html")
             }
             post("inline") {

gradle.properties

@@ -1,11 +1,11 @@
 kotlin.code.style=official
 org.gradle.parallel=true
 # Due to parallel compilation project require next amount of memory on full build
-org.gradle.jvmargs=-Xmx768m
+org.gradle.jvmargs=-Xmx2g
 
 
-kotlin_version=1.7.22
-telegram_bot_api_version=5.1.0
-micro_utils_version=0.16.8
-serialization_version=1.4.1
-ktor_version=2.2.3
+kotlin_version=1.8.20
+telegram_bot_api_version=7.0.2
+micro_utils_version=0.17.8
+serialization_version=1.5.0
+ktor_version=2.3.0

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip

settings.gradle

@@ -12,6 +12,7 @@ include ":FilesLoaderBot"
 
 include ":ResenderBot:ResenderBotLib"
 include ":ResenderBot:jvm_launcher"
+include ":ResenderBot:native_launcher"
 
 include ":KeyboardsBot:KeyboardsBotLib"
 include ":KeyboardsBot:jvm_launcher"
@@ -32,3 +33,7 @@ include ":TopicsHandling"
 include ":UserChatShared"
 
 include ":RightsChangerBot"
+
+include ":LiveLocationsBot"
+
+include ":StickerSetHandler"