Merge 0fc1747119 into a008d861da

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgs
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameThread
 import dev.inmo.tgbotapi.extensions.utils.formatting.*
 import dev.inmo.tgbotapi.types.IdChatIdentifier
@@ -54,7 +54,7 @@ suspend fun main(args: Array<String>) {
             val content = contentMessage.content
 
             when {
-                content is TextContent && content.parseCommandsWithArgs().keys.contains("stop") -> StopState(it.context)
+                content is TextContent && content.parseCommandsWithParams().keys.contains("stop") -> StopState(it.context)
                 else -> {
                     execute(content.createResend(it.context))
                     it

InlineQueriesBot/src/commonMain/kotlin/Bot.kt

@@ -9,7 +9,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onDeepLi
 import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
-import dev.inmo.tgbotapi.types.InlineQueryId
 import dev.inmo.tgbotapi.types.inlineQueryAnswerResultsLimit
 import dev.inmo.tgbotapi.utils.buildEntities
 
@@ -32,9 +31,9 @@ suspend fun doInlineQueriesBot(token: String) {
             answer(
                 it,
                 results = results.map { resultNumber ->
-                    val inlineQueryId = InlineQueryId(resultNumber.toString())
+                    val resultAsString = resultNumber.toString()
                     InlineQueryResultArticle(
-                        inlineQueryId,
+                        resultAsString,
                         "Title $resultNumber",
                         InputTextMessageContent(
                             buildEntities {

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

@@ -15,7 +15,6 @@ import dev.inmo.tgbotapi.extensions.utils.withContent
 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.InlineQueryId
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.utils.*
 import kotlinx.coroutines.*
@@ -138,7 +137,7 @@ suspend fun activateKeyboardsBot(
                 it,
                 results = listOf(
                     InlineQueryResultArticle(
-                        InlineQueryId(it.query),
+                        it.query,
                         "Send buttons",
                         InputTextMessageContent("It is sent via inline mode inline buttons"),
                         replyMarkup = inlineKeyboard {

PollsBot/src/main/kotlin/PollsBot.kt

@@ -11,7 +11,10 @@ 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.*
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.PollIdentifier
+import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.chat.*
 import dev.inmo.tgbotapi.types.chat.GroupChat
 import dev.inmo.tgbotapi.types.chat.PrivateChat
@@ -41,7 +44,7 @@ suspend fun main(vararg args: String) {
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         val me = getMe()
 
-        val pollToChat = mutableMapOf<PollId, IdChatIdentifier>()
+        val pollToChat = mutableMapOf<PollIdentifier, IdChatIdentifier>()
         val pollToChatMutex = Mutex()
 
         onCommand("anonymous") {

RightsChangerBot/src/main/kotlin/RightsChanger.kt

@@ -1,9 +1,4 @@
-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.firstOf
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
@@ -55,19 +50,9 @@ sealed interface UserRetrievingStep : State {
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
 
-    val isDebug = args.getOrNull(2) == "debug"
-
-    if (isDebug) {
-        setDefaultKSLog(
-            KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
-                println(defaultMessageFormatter(level, tag, message, throwable))
-            }
-        )
-    }
-
     val bot = telegramBot(botToken)
 
-    val allowedAdmin = ChatId(RawChatId(args[1].toLong()))
+    val allowedAdmin = ChatId(args[1].toLong())
 
     fun Boolean?.allowedSymbol() = when (this) {
         true -> "✅"
@@ -377,8 +362,8 @@ suspend fun main(args: Array<String>) {
             initialFilter = { it.user.id == allowedAdmin }
         ) {
             val (channelIdString, userIdString) = it.data.split(" ").drop(1)
-            val channelId = ChatId(RawChatId(channelIdString.toLong()))
+            val channelId = ChatId(channelIdString.toLong())
-            val userId = ChatId(RawChatId(userIdString.toLong()))
+            val userId = ChatId(userIdString.toLong())
             val chatMember = getChatMember(channelId, userId)
             val asAdmin = chatMember.administratorChatMemberOrNull()
             val asMember = chatMember.memberChatMemberOrNull()
@@ -532,9 +517,5 @@ suspend fun main(args: Array<String>) {
             BotCommand("rights_in_channel", "Trigger granular keyboard. Use with reply to user"),
             scope = BotCommandScope.AllGroupChats
         )
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
-            println(it)
-        }
     }.join()
 }

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

@@ -44,7 +44,7 @@ fun StickerSet?.buildInfo() = buildEntities {
                 StickerType.Regular -> "Regular"
                 is StickerType.Unknown -> "Unknown type \"${stickerType.type}\""
             }
-        ) + " sticker set with title " + bold(title) + " and name " + bold(name.string)
+        ) + " sticker set with title " + bold(title) + " and name " + bold(name)
     }
 }
 

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -13,7 +13,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onSticke
 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.StickerSetName
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.toChatId
@@ -33,7 +32,7 @@ suspend fun main(args: Array<String>) {
         }
     ) {
         val me = getMe()
-        fun Chat.stickerSetName() = StickerSetName("s${id.chatId}_by_${me.username ?.withoutAt}")
+        fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username ?.usernameWithoutAt}"
         onCommand("start") {
             reply(it) {
                 botCommand("delete") + " - to clear stickers"
@@ -83,7 +82,7 @@ suspend fun main(args: Array<String>) {
             }.onFailure { _ ->
                 createNewStickerSet(
                     it.chat.id.toChatId(),
-                    stickerSetName.string,
+                    stickerSetName,
                     "Sticker set by ${me.firstName}",
                     it.content.media.stickerFormat,
                     listOf(

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -18,7 +18,6 @@ import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 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.InlineQueryId
 import dev.inmo.tgbotapi.types.LinkPreviewOptions
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
@@ -78,9 +77,9 @@ suspend fun main(vararg args: String) {
             }
             post("inline") {
                 val requestBody = call.receiveText()
-                val queryId = call.parameters[webAppQueryIdField] ?.let(::InlineQueryId) ?: error("$webAppQueryIdField should be presented")
+                val queryId = call.parameters[webAppQueryIdField] ?: error("$webAppQueryIdField should be presented")
 
-                bot.answerInlineQuery(queryId, listOf(InlineQueryResultArticle(queryId, "Result", InputTextMessageContent(requestBody))))
+                bot.answer(queryId, InlineQueryResultArticle(queryId, "Result", InputTextMessageContent(requestBody)))
                 call.respond(HttpStatusCode.OK)
             }
             post("check") {

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2344m
 
 
-kotlin_version=1.9.23
+kotlin_version=1.9.22
-telegram_bot_api_version=11.0.0
+telegram_bot_api_version=10.0.0
-micro_utils_version=0.20.39
+micro_utils_version=0.20.28
-serialization_version=1.6.3
+serialization_version=1.6.2
-ktor_version=2.3.9
+ktor_version=2.3.7

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