Merge 88b54d4a0e into 99232b53d7

CustomBot/README.md

@@ -1,9 +0,0 @@
-# CustomBot
-
-This bot basically have no any useful behaviour, but you may customize it as a playground
-
-## Launch
-
-```bash
-../gradlew run --args="BOT_TOKEN"
-```

CustomBot/build.gradle

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

CustomBot/src/main/kotlin/CustomBot.kt

@@ -1,33 +0,0 @@
-import dev.inmo.kslog.common.KSLog
-import dev.inmo.kslog.common.LogLevel
-import dev.inmo.kslog.common.defaultMessageFormatter
-import dev.inmo.kslog.common.setDefaultKSLog
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
-import dev.inmo.tgbotapi.utils.PreviewFeature
-import kotlinx.coroutines.*
-
-/**
- * The main purpose of this bot is just to answer "Oh, hi, " and add user mention here
- */
-@OptIn(PreviewFeature::class)
-suspend fun main(vararg args: String) {
-    val botToken = args.first()
-
-    val isDebug = args.any { it == "debug" }
-
-    if (isDebug) {
-        setDefaultKSLog(
-            KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
-                println(defaultMessageFormatter(level, tag, message, throwable))
-            }
-        )
-    }
-
-    telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        val me = getMe()
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
-    }.second.join()
-}

LiveLocationsBot/src/main/kotlin/LiveLocationsBot.kt

@@ -1,16 +1,33 @@
 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.edit.location.live.stopLiveLocation
 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
@@ -47,7 +64,7 @@ suspend fun main(vararg args: String) {
                 handleLiveLocation(
                     it.chat.id,
                     locationsFlow,
-                    sentMessageFlow = FlowCollector { currentMessageState.emit(it) },
+                    sentMessageFlow = FlowCollector { currentMessageState.emit(it) }
                 )
             }
 

PollsBot/src/main/kotlin/PollsBot.kt

@@ -1,19 +1,11 @@
 import com.benasher44.uuid.uuid4
-import dev.inmo.kslog.common.KSLog
-import dev.inmo.kslog.common.LogLevel
-import dev.inmo.kslog.common.defaultMessageFormatter
-import dev.inmo.kslog.common.setDefaultKSLog
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
 import dev.inmo.tgbotapi.extensions.api.send.*
-import dev.inmo.tgbotapi.extensions.api.send.polls.sendQuizPoll
 import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.customEmojiTextSourceOrNull
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgsSources
 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,13 +17,15 @@ 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.message.MarkdownV2
-import dev.inmo.tgbotapi.types.polls.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.types.polls.Poll
+import dev.inmo.tgbotapi.types.polls.PollAnswer
+import dev.inmo.tgbotapi.types.polls.PollOption
+import dev.inmo.tgbotapi.types.polls.RegularPoll
+import dev.inmo.tgbotapi.utils.PreviewFeature
 import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlin.random.Random
 
 /**
  * This bot will answer with anonymous or public poll and send message on
@@ -43,15 +37,6 @@ import kotlin.random.Random
 @OptIn(PreviewFeature::class)
 suspend fun main(vararg args: String) {
     val botToken = args.first()
-    val isDebug = args.any { it == "debug" }
-
-    if (isDebug) {
-        setDefaultKSLog(
-            KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
-                println(defaultMessageFormatter(level, tag, message, throwable))
-            }
-        )
-    }
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         val me = getMe()
@@ -59,27 +44,12 @@ suspend fun main(vararg args: String) {
         val pollToChat = mutableMapOf<PollId, IdChatIdentifier>()
         val pollToChatMutex = Mutex()
 
-        onCommand("anonymous", requireOnlyCommandInMessage = false) {
-            val customEmoji = it.content.parseCommandsWithArgsSources()
-                .toList()
-                .firstOrNull { it.first.command == "anonymous" }
-                ?.second
-                ?.firstNotNullOfOrNull { it.customEmojiTextSourceOrNull() }
+        onCommand("anonymous") {
             val sentPoll = sendRegularPoll(
-                it.chat.id,
-                buildEntities {
-                    regular("Test regular anonymous poll")
-                    if (customEmoji != null) {
-                        customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                    }
-                },
+                it.chat,
+                "Test regular anonymous poll",
                 (1 .. 10).map {
-                    InputPollOption {
-                        regular(it.toString()) + " "
-                        if (customEmoji != null) {
-                            customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                        }
-                    }
+                    it.toString()
                 },
                 isAnonymous = true,
                 replyParameters = ReplyParameters(it)
@@ -89,27 +59,12 @@ suspend fun main(vararg args: String) {
             }
         }
 
-        onCommand("public", requireOnlyCommandInMessage = false) {
-            val customEmoji = it.content.parseCommandsWithArgsSources()
-                .toList()
-                .firstOrNull { it.first.command == "public" }
-                ?.second
-                ?.firstNotNullOfOrNull { it.customEmojiTextSourceOrNull() }
+        onCommand("public") {
             val sentPoll = sendRegularPoll(
-                it.chat.id,
-                buildEntities {
-                    regular("Test regular non anonymous poll")
-                    if (customEmoji != null) {
-                        customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                    }
-                },
+                it.chat,
+                "Test regular anonymous poll",
                 (1 .. 10).map {
-                    InputPollOption {
-                        regular(it.toString()) + " "
-                        if (customEmoji != null) {
-                            customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                        }
-                    }
+                    it.toString()
                 },
                 isAnonymous = false,
                 replyParameters = ReplyParameters(it)
@@ -119,44 +74,6 @@ suspend fun main(vararg args: String) {
             }
         }
 
-        onCommand("quiz", requireOnlyCommandInMessage = false) {
-            val customEmoji = it.content.parseCommandsWithArgsSources()
-                .toList()
-                .firstOrNull { it.first.command == "quiz" }
-                ?.second
-                ?.firstNotNullOfOrNull { it.customEmojiTextSourceOrNull() }
-            val correctAnswer = Random.nextInt(10)
-            val sentPoll = sendQuizPoll(
-                it.chat.id,
-                questionEntities = buildEntities {
-                    regular("Test quiz poll")
-                    if (customEmoji != null) {
-                        customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                    }
-                },
-                (1 .. 10).map {
-                    InputPollOption {
-                        regular(it.toString()) + " "
-                        if (customEmoji != null) {
-                            customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                        }
-                    }
-                },
-                isAnonymous = false,
-                replyParameters = ReplyParameters(it),
-                correctOptionId = correctAnswer,
-                explanationTextSources = buildEntities {
-                    regular("Random solved it to be ") + underline((correctAnswer + 1).toString()) + " "
-                    if (customEmoji != null) {
-                        customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
-                    }
-                }
-            )
-            pollToChatMutex.withLock {
-                pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id
-            }
-        }
-
         onPollAnswer {
             val chatId = pollToChat[it.pollId] ?: return@onPollAnswer
 
@@ -175,12 +92,6 @@ suspend fun main(vararg args: String) {
             }
         }
 
-        setMyCommands(
-            BotCommand("anonymous", "Create anonymous regular poll"),
-            BotCommand("public", "Create non anonymous regular poll"),
-            BotCommand("quiz", "Create quiz poll with random right answer"),
-        )
-
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
     }.second.join()
 }

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

@@ -7,7 +7,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.possiblyWithEffectMessageOrNull
 import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
 import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
 import dev.inmo.tgbotapi.types.ReplyParameters
@@ -40,8 +39,7 @@ suspend fun activateResenderBot(
                                 entities = quote ?.textSources ?: emptyList(),
                                 quotePosition = quote ?.position
                             )
-                        },
-                        effectId = it.possiblyWithEffectMessageOrNull() ?.effectId
+                        }
                     )
                 ) {
                     it.forEach(print)

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -1,5 +1,4 @@
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.files.downloadFile
 import dev.inmo.tgbotapi.extensions.api.files.downloadFileToTemp
@@ -78,18 +77,10 @@ suspend fun main(args: Array<String>) {
             runCatchingSafely {
                 getStickerSet(stickerSetName)
             }.onSuccess { stickerSet ->
-                runCatching {
-                    addStickerToSet(it.chat.id.toChatId(), stickerSet.name, newSticker).also { _ ->
-                        reply(
-                            it,
-                            getStickerSet(stickerSetName).stickers.last()
-                        )
-                    }
-                }.onFailure { exception ->
-                    exception.printStackTrace()
+                addStickerToSet(it.chat.id.toChatId(), stickerSet.name, newSticker).also { _ ->
                     reply(
                         it,
-                        "Unable to add sticker in stickerset"
+                        getStickerSet(stickerSetName).stickers.last()
                     )
                 }
             }.onFailure { exception ->
@@ -109,9 +100,5 @@ suspend fun main(args: Array<String>) {
                 }
             }
         }
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
-            println(it)
-        }
     }.second.join()
 }

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -1,4 +1,7 @@
-import dev.inmo.kslog.common.*
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.LogLevel
+import dev.inmo.kslog.common.defaultMessageFormatter
+import dev.inmo.kslog.common.setDefaultKSLog
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.tgbotapi.extensions.api.answers.answer
@@ -37,7 +40,6 @@ import java.nio.charset.Charset
  *
  * * Telegram Token
  * * URL where will be placed
- * * Port (default 8080)
  *
  * Will start the server to share the static (index.html and WebApp.js) on 0.0.0.0:8080
  */
@@ -56,7 +58,6 @@ suspend fun main(vararg args: String) {
             }
         )
     }
-    val initiationLogger = KSLog("Initialization")
 
     val bot = telegramBot(telegramBotAPIUrlsKeeper)
     createKtorServer(
@@ -68,28 +69,12 @@ suspend fun main(vararg args: String) {
     ) {
         routing {
             val baseJsFolder = File("WebApp/build/dist/js/")
-            val prodSubFolder = File(baseJsFolder, "productionExecutable")
-            val devSubFolder = File(baseJsFolder, "developmentExecutable")
-
-            val staticFolder = when {
-                prodSubFolder.exists() -> {
-                    initiationLogger.i("Folder for static is ${prodSubFolder.absolutePath}")
-                    prodSubFolder
+            baseJsFolder.list() ?.forEach {
+                if (it == "productionExecutable" || it == "developmentExecutable") {
+                    staticFiles("", File(baseJsFolder, it)) {
+                        default("WebApp/build/dist/js/$it/index.html")
+                    }
                 }
-                devSubFolder.exists() -> {
-                    initiationLogger.i("Folder for static is ${devSubFolder.absolutePath}")
-                    devSubFolder
-                }
-                else -> error("""
-                    Unable to detect any folder with static. Current working directory: ${File("").absolutePath}.
-                    Searched paths:
-                    * ${prodSubFolder.absolutePath}
-                    * ${devSubFolder.absolutePath}
-                """.trimIndent())
-            }
-
-            staticFiles("", staticFolder) {
-                default("${staticFolder.absolutePath}${File.separator}index.html")
             }
             post("inline") {
                 val requestBody = call.receiveText()

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2344m
 
 
 kotlin_version=1.9.23
-telegram_bot_api_version=14.0.0
-micro_utils_version=0.20.45
+telegram_bot_api_version=12.0.0
+micro_utils_version=0.20.44
 serialization_version=1.6.3
-ktor_version=2.3.10
+ktor_version=2.3.9

settings.gradle

@@ -49,5 +49,3 @@ include ":LinkPreviewsBot"
 include ":BoostsInfoBot"
 
 include ":BusinessConnectionsBot"
-
-include ":CustomBot"