migration onto kotlin 2.1.20 and ktgbotapi 24.0.2

BusinessConnectionsBot/src/main/kotlin/BusinessConnectionsBot.kt

@@ -2,69 +2,24 @@ 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.common.Percentage
-import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.api.business.getBusinessAccountStarBalance
-import dev.inmo.tgbotapi.extensions.api.business.deleteBusinessMessages
-import dev.inmo.tgbotapi.extensions.api.business.getBusinessAccountGifts
-import dev.inmo.tgbotapi.extensions.api.business.getBusinessAccountGiftsFlow
-import dev.inmo.tgbotapi.extensions.api.business.readBusinessMessage
-import dev.inmo.tgbotapi.extensions.api.business.removeBusinessAccountProfilePhoto
-import dev.inmo.tgbotapi.extensions.api.business.setBusinessAccountBio
-import dev.inmo.tgbotapi.extensions.api.business.setBusinessAccountName
-import dev.inmo.tgbotapi.extensions.api.business.setBusinessAccountProfilePhoto
-import dev.inmo.tgbotapi.extensions.api.business.setBusinessAccountUsername
-import dev.inmo.tgbotapi.extensions.api.business.transferBusinessAccountStars
-import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
 import dev.inmo.tgbotapi.extensions.api.chat.modify.pinChatMessage
 import dev.inmo.tgbotapi.extensions.api.chat.modify.unpinChatMessage
-import dev.inmo.tgbotapi.extensions.api.files.downloadFileToTemp
 import dev.inmo.tgbotapi.extensions.api.get.getBusinessConnection
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.send
-import dev.inmo.tgbotapi.extensions.api.stories.deleteStory
-import dev.inmo.tgbotapi.extensions.api.stories.postStory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.commonMessageOrNull
+import dev.inmo.tgbotapi.extensions.utils.accessibleMessageOrNull
-import dev.inmo.tgbotapi.extensions.utils.extendedPrivateChatOrThrow
 import dev.inmo.tgbotapi.extensions.utils.ifAccessibleMessage
 import dev.inmo.tgbotapi.extensions.utils.ifBusinessContentMessage
 import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.flushAccumulatedUpdates
-import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
-import dev.inmo.tgbotapi.requests.abstracts.multipartFile
-import dev.inmo.tgbotapi.requests.business_connection.InputProfilePhoto
-import dev.inmo.tgbotapi.requests.stories.PostStory
 import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.RawChatId
 import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.PhotoContent
-import dev.inmo.tgbotapi.types.message.content.StoryContent
-import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.content.VideoContent
-import dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
-import dev.inmo.tgbotapi.types.stories.InputStoryContent
-import dev.inmo.tgbotapi.types.stories.StoryArea
-import dev.inmo.tgbotapi.types.stories.StoryAreaPosition
-import dev.inmo.tgbotapi.types.stories.StoryAreaType
-import dev.inmo.tgbotapi.utils.botCommand
-import dev.inmo.tgbotapi.utils.code
-import dev.inmo.tgbotapi.utils.extensions.splitForText
-import dev.inmo.tgbotapi.utils.row
-import korlibs.time.seconds
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.json.Json
 
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
@@ -79,25 +34,21 @@ suspend fun main(args: Array<String>) {
     }
 
     val businessConnectionsChats = mutableMapOf<BusinessConnectionId, ChatId>()
-    val chatsBusinessConnections = mutableMapOf<ChatId, BusinessConnectionId>()
     val businessConnectionsChatsMutex = Mutex()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         val me = getMe()
         println(me)
-        flushAccumulatedUpdates()
 
         onBusinessConnectionEnabled {
             businessConnectionsChatsMutex.withLock {
                 businessConnectionsChats[it.id] = it.userChatId
-                chatsBusinessConnections[it.userChatId] = it.id
             }
             send(it.userChatId, "Business connection ${it.businessConnectionId.string} has been enabled")
         }
         onBusinessConnectionDisabled {
             businessConnectionsChatsMutex.withLock {
                 businessConnectionsChats.remove(it.id)
-                chatsBusinessConnections.remove(it.userChatId)
             }
             send(it.userChatId, "Business connection ${it.businessConnectionId.string} has been disabled")
         }
@@ -120,20 +71,7 @@ suspend fun main(args: Array<String>) {
                 if (businessContentMessage.sentByBusinessConnectionOwner) {
                     reply(sent, "You have sent this message to the ${businessContentMessage.businessConnectionId.string} related chat")
                 } else {
-                    reply(
+                    reply(sent, "User have sent this message to you in the ${businessContentMessage.businessConnectionId.string} related chat")
-                        to = sent,
-                        text = "User have sent this message to you in the ${businessContentMessage.businessConnectionId.string} related chat",
-                    )
-                    send(
-                        chatId = businessConnectionsChats[it.businessConnectionId] ?: return@ifBusinessContentMessage,
-                        text = "User have sent this message to you in the ${businessContentMessage.businessConnectionId.string} related chat",
-                        replyMarkup = inlineKeyboard {
-                            row {
-                                dataButton("Read message", "read ${it.chat.id.chatId.long} ${it.messageId.long}")
-                                dataButton("Delete message", "delete ${it.chat.id.chatId.long} ${it.messageId.long}")
-                            }
-                        }
-                    )
                 }
             }
         }
@@ -160,328 +98,5 @@ suspend fun main(args: Array<String>) {
             }
             send(businessConnectionOwnerChat, "There are several removed messages in chat ${it.chat.id}: ${it.messageIds}")
         }
-        onCommand("get_business_account_info", initialFilter = { it.chat is PrivateChat }) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id]
-            val businessConnectionInfo = businessConnectionId ?.let { getBusinessConnection(it) }
-            reply(it) {
-                if (businessConnectionInfo == null) {
-                    +"There is no business connection for current chat"
-                } else {
-                    +(Json { prettyPrint = true; encodeDefaults = true }.encodeToString(businessConnectionInfo))
-                }
-            }
-        }
-        onMessageDataCallbackQuery(Regex("read \\d+ \\d+")) {
-            val (_, chatIdString, messageIdString) = it.data.split(" ")
-            val chatId = chatIdString.toLongOrNull() ?.let(::RawChatId) ?.let(::ChatId) ?: return@onMessageDataCallbackQuery
-            val messageId = messageIdString.toLongOrNull() ?.let(::MessageId) ?: return@onMessageDataCallbackQuery
-            val businessConnectionId = chatsBusinessConnections[it.message.chat.id]
-
-            val readResponse = businessConnectionId ?.let { readBusinessMessage(it, chatId, messageId) }
-            answer(
-                it,
-                if (readResponse == null) {
-                    "There is no business connection for current chat"
-                } else {
-                    "Message has been read"
-                }
-            )
-        }
-        onMessageDataCallbackQuery(Regex("delete \\d+ \\d+")) {
-            val (_, chatIdString, messageIdString) = it.data.split(" ")
-            val chatId = chatIdString.toLongOrNull() ?.let(::RawChatId) ?.let(::ChatId) ?: return@onMessageDataCallbackQuery
-            val messageId = messageIdString.toLongOrNull() ?.let(::MessageId) ?: return@onMessageDataCallbackQuery
-            val businessConnectionId = chatsBusinessConnections[it.message.chat.id]
-
-            val readResponse = businessConnectionId ?.let { deleteBusinessMessages(it, listOf(messageId)) }
-            answer(
-                it,
-                if (readResponse == null) {
-                    "There is no business connection for current chat"
-                } else {
-                    "Message has been deleted"
-                }
-            )
-        }
-        onCommandWithArgs("set_business_account_name", initialFilter = { it.chat is PrivateChat }) { it, args ->
-            val firstName = args[0]
-            val secondName = args.getOrNull(1)
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommandWithArgs
-            val set = runCatching {
-                setBusinessAccountName(
-                    businessConnectionId,
-                    firstName,
-                    secondName
-                )
-            }.getOrElse { false }
-            reply(it) {
-                if (set) {
-                    +"Account name has been set"
-                } else {
-                    +"Account name has not been set"
-                }
-            }
-        }
-        onCommandWithArgs("set_business_account_username", initialFilter = { it.chat is PrivateChat }) { it, args ->
-            val username = args[0]
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommandWithArgs
-            val set = runCatching {
-                setBusinessAccountUsername(
-                    businessConnectionId,
-                    username
-                )
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (set) {
-                    +"Account username has been set"
-                } else {
-                    +"Account username has not been set"
-                }
-            }
-        }
-        onCommand("get_business_account_star_balance", initialFilter = { it.chat is PrivateChat }) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommand
-            val starAmount = runCatching {
-                getBusinessAccountStarBalance(businessConnectionId)
-            }.getOrElse {
-                it.printStackTrace()
-                null
-            }
-            reply(it) {
-                if (starAmount != null) {
-                    +"Account stars amount: $starAmount"
-                } else {
-                    +"Account stars amount has not been got"
-                }
-            }
-        }
-        onCommandWithArgs("transfer_business_account_stars", initialFilter = { it.chat is PrivateChat }) { it, args ->
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommandWithArgs
-            val count = args.firstOrNull() ?.toIntOrNull() ?: reply(it) {
-                "Pass amount of stars to transfer to bot with command"
-            }.let {
-                return@onCommandWithArgs
-            }
-            val transferred = runCatching {
-                transferBusinessAccountStars(businessConnectionId, count)
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (transferred) {
-                    +"Stars have been transferred"
-                } else {
-                    +"Stars have not been transferred"
-                }
-            }
-        }
-        onCommand("get_business_account_gifts", initialFilter = { it.chat is PrivateChat }) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommand
-            val giftsFlow = runCatching {
-                getBusinessAccountGiftsFlow(businessConnectionId)
-            }.getOrElse {
-                it.printStackTrace()
-                null
-            }
-            if (giftsFlow == null) {
-                reply(it) {
-                    +"Error in receiving of gifts"
-                }
-            } else {
-                giftsFlow.collect { giftsPage ->
-                    giftsPage.gifts.joinToString {
-                        it.toString()
-                    }.splitForText().forEach { message ->
-                        reply(it, message)
-                    }
-                }
-            }
-        }
-        onCommand("set_business_account_bio", requireOnlyCommandInMessage = false, initialFilter = { it.chat is PrivateChat }) {
-            val initialBio = getChat(it.chat).extendedPrivateChatOrThrow().bio
-            val bio = it.content.text.removePrefix("/set_business_account_bio").trim()
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommand
-            val set = runCatching {
-                setBusinessAccountBio(
-                    businessConnectionId,
-                    bio
-                )
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (set) {
-                    +"Account bio has been set. It will be reset within 15 seconds.\n\nInitial bio: " + code(initialBio)
-                } else {
-                    +"Account bio has not been set"
-                }
-            }
-            delay(15.seconds)
-            val reset = runCatching {
-                setBusinessAccountBio(
-                    businessConnectionId,
-                    initialBio
-                )
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (reset) {
-                    +"Account bio has been reset"
-                } else {
-                    +"Account bio has not been set. Set it manually: " + code(initialBio)
-                }
-            }
-        }
-        suspend fun handleSetProfilePhoto(it: CommonMessage<TextContent>, isPublic: Boolean) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@handleSetProfilePhoto
-            val replyTo = it.replyTo ?.commonMessageOrNull() ?.withContentOrNull<PhotoContent>()
-            if (replyTo == null) {
-                reply(it) {
-                    +"Reply to photo for using of this command"
-                }
-                return@handleSetProfilePhoto
-            }
-
-            val set = runCatching {
-                val file = downloadFileToTemp(replyTo.content)
-                setBusinessAccountProfilePhoto(
-                    businessConnectionId,
-                    InputProfilePhoto.Static(
-                        file.multipartFile()
-                    ),
-                    isPublic = isPublic
-                )
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (set) {
-                    +"Account profile photo has been set. It will be reset within 15 seconds"
-                } else {
-                    +"Account profile photo has not been set"
-                }
-            }
-            if (set == false) { return@handleSetProfilePhoto }
-            delay(15.seconds)
-            val reset = runCatching {
-                removeBusinessAccountProfilePhoto(
-                    businessConnectionId,
-                    isPublic = isPublic
-                )
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (reset) {
-                    +"Account profile photo has been reset"
-                } else {
-                    +"Account profile photo has not been set. Set it manually"
-                }
-            }
-        }
-        onCommand("set_business_account_profile_photo", initialFilter = { it.chat is PrivateChat }) {
-            handleSetProfilePhoto(it, false)
-        }
-        onCommand("set_business_account_profile_photo_public", initialFilter = { it.chat is PrivateChat }) {
-            handleSetProfilePhoto(it, true)
-        }
-
-        onCommand("post_story", initialFilter = { it.chat is PrivateChat }) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommand
-            val replyTo = it.replyTo ?.commonMessageOrNull() ?.withContentOrNull<VisualMediaGroupPartContent>()
-            if (replyTo == null) {
-                reply(it) {
-                    +"Reply to photo or video for using of this command"
-                }
-                return@onCommand
-            }
-
-            val posted = runCatching {
-                val file = downloadFileToTemp(replyTo.content)
-                postStory(
-                    businessConnectionId,
-                    when (replyTo.content) {
-                        is PhotoContent -> InputStoryContent.Photo(
-                            file.multipartFile()
-                        )
-                        is VideoContent -> InputStoryContent.Video(
-                            file.multipartFile()
-                        )
-                    },
-                    activePeriod = PostStory.ACTIVE_PERIOD_6_HOURS,
-                    areas = listOf(
-                        StoryArea(
-                            StoryAreaPosition(
-                                x = Percentage.of100(50.0),
-                                y = Percentage.of100(50.0),
-                                width = Percentage.of100(8.0),
-                                height = Percentage.of100(8.0),
-                                rotationAngle = 45.0,
-                                cornerRadius = Percentage.of100(4.0),
-                            ),
-                            StoryAreaType.Link(
-                                "https://github.com/InsanusMokrassar/TelegramBotAPI-examples/blob/master/BusinessConnectionsBot/src/main/kotlin/BusinessConnectionsBot.kt"
-                            )
-                        )
-                    )
-                ) {
-                    +"It is test of postStory :)"
-                }
-            }.getOrElse {
-                it.printStackTrace()
-                null
-            }
-            reply(it) {
-                if (posted != null) {
-                    +"Story has been posted. You may unpost it with " + botCommand("remove_story")
-                } else {
-                    +"Story has not been posted"
-                }
-            }
-        }
-
-        onCommand("delete_story", initialFilter = { it.chat is PrivateChat }) {
-            val businessConnectionId = chatsBusinessConnections[it.chat.id] ?: return@onCommand
-            val replyTo = it.replyTo ?.commonMessageOrNull() ?.withContentOrNull<StoryContent>()
-            if (replyTo == null) {
-                reply(it) {
-                    +"Reply to photo or video for using of this command"
-                }
-                return@onCommand
-            }
-
-            val deleted = runCatching {
-                deleteStory(businessConnectionId, replyTo.content.story.id)
-            }.getOrElse {
-                it.printStackTrace()
-                false
-            }
-            reply(it) {
-                if (deleted) {
-                    +"Story has been deleted"
-                } else {
-                    +"Story has not been deleted"
-                }
-            }
-        }
-
-        // Will work when some premium user sending to some other user checklist
-        onChecklistContent {
-            execute(
-                it.content.createResend(
-                    it.chat.id,
-                    businessConnectionId = it.chat.id.businessConnectionId ?: chatsBusinessConnections[it.chat.id] ?: return@onChecklistContent
-                )
-            )
-        }
     }.second.join()
 }

CustomBot/src/main/kotlin/CustomBot.kt

@@ -4,13 +4,9 @@ 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.getMyStarBalance
-import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
-import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextData
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildSubcontextInitialAction
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChannelDirectMessagesConfigurationChanged
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -69,7 +65,6 @@ suspend fun main(vararg args: String) {
         onCommand("start") {
             println(data.update)
             println(data.commonMessage)
-            println(getChat(it.chat))
         }
 
         onCommand(
@@ -82,17 +77,6 @@ suspend fun main(vararg args: String) {
             println(data.commonMessage)
         }
 
-        onCommand("getMyStarBalance") {
-            reply(
-                to = it,
-                text = getMyStarBalance().toString()
-            )
-        }
-
-        onChannelDirectMessagesConfigurationChanged {
-            println(it.chatEvent)
-        }
-
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }

InlineQueriesBot/build.gradle

@@ -29,7 +29,12 @@ kotlin {
                 implementation kotlin('stdlib')
 
                 api "dev.inmo:tgbotapi:$telegram_bot_api_version"
-                api "io.ktor:ktor-client-logging:$ktor_version"
+                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+            }
+        }
+        jvmMain {
+            dependencies {
+                api "io.ktor:ktor-client-logging-jvm:$ktor_version"
             }
         }
     }

InlineQueriesBot/src/commonMain/kotlin/Bot.kt

@@ -1,4 +1,4 @@
-import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
@@ -59,7 +59,7 @@ suspend fun doInlineQueriesBot(token: String) {
             reply(message, deepLink)
         }
 
-        allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
 

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

@@ -1,4 +1,4 @@
-import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
@@ -89,7 +89,7 @@ suspend fun activateKeyboardsBot(
         onCommandWithArgs("inline") { message, args ->
             val numberArgs = args.mapNotNull { it.toIntOrNull() }
             val numberOfPages = numberArgs.getOrNull(1) ?: numberArgs.firstOrNull() ?: 10
-            val page = numberArgs.firstOrNull()?.takeIf { numberArgs.size > 1 }?.coerceAtLeast(1) ?: 1
+            val page = numberArgs.firstOrNull() ?.takeIf { numberArgs.size > 1 } ?.coerceAtLeast(1) ?: 1
             reply(
                 message,
                 replyMarkup = inlineKeyboard {
@@ -138,8 +138,7 @@ suspend fun activateKeyboardsBot(
 
         onBaseInlineQuery {
             val page = it.query.takeWhile { it.isDigit() }.toIntOrNull() ?: return@onBaseInlineQuery
-            val count = it.query.removePrefix(page.toString()).dropWhile { !it.isDigit() }.takeWhile { it.isDigit() }
+            val count = it.query.removePrefix(page.toString()).dropWhile { !it.isDigit() }.takeWhile { it.isDigit() }.toIntOrNull() ?: return@onBaseInlineQuery
-                .toIntOrNull() ?: return@onBaseInlineQuery
 
             answer(
                 it,
@@ -171,7 +170,7 @@ suspend fun activateKeyboardsBot(
 
         setMyCommands(BotCommand("inline", "Creates message with pagination inline keyboard"))
 
-        allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
     }.join()

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

@@ -1,7 +1,4 @@
-import dev.inmo.kslog.common.KSLog
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.kslog.common.defaultMessageFormatter
-import dev.inmo.kslog.common.filter.filtered
-import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.withTypingAction
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
@@ -13,9 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
 import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.message.abstracts.BusinessContentMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.currentCoroutineContext
@@ -24,10 +19,7 @@ suspend fun activateResenderBot(
     token: String,
     print: (Any) -> Unit
 ) {
-    telegramBotWithBehaviourAndLongPolling(
+    telegramBotWithBehaviourAndLongPolling(token, scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
-        token,
-        scope = CoroutineScope(currentCoroutineContext() + SupervisorJob()),
-    ) {
         onContentMessage(
             subcontextUpdatesFilter = MessageFilterByChat,
             initialFilter = { it !is BusinessContentMessage<*> || !it.sentByBusinessConnectionOwner }
@@ -39,15 +31,15 @@ suspend fun activateResenderBot(
                     it.content.createResend(
                         chat.id,
                         messageThreadId = it.threadIdOrNull,
-                        replyParameters = it.replyInfo?.messageMeta?.let { meta ->
+                        replyParameters = it.replyInfo ?.messageMeta ?.let { meta ->
-                            val quote = it.withContentOrNull<TextContent>()?.content?.quote
+                            val quote = it.withContentOrNull<TextContent>() ?.content ?.quote
                             ReplyParameters(
                                 meta,
-                                entities = quote?.textSources ?: emptyList(),
+                                entities = quote ?.textSources ?: emptyList(),
-                                quotePosition = quote?.position
+                                quotePosition = quote ?.position
                             )
                         },
-                        effectId = it.possiblyWithEffectMessageOrNull()?.effectId
+                        effectId = it.possiblyWithEffectMessageOrNull() ?.effectId
                     )
                 ) {
                     it.forEach(print)
@@ -57,7 +49,7 @@ suspend fun activateResenderBot(
             println("Answer info: $answer")
         }
 
-        allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
         print(bot.getMe())

RightsChangerBot/build.gradle

@@ -18,5 +18,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
-    implementation 'io.ktor:ktor-client-logging-jvm:3.2.3'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.0.3'
 }

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

@@ -1,5 +1,5 @@
 import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandler
-import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
+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.get.getCustomEmojiStickerOrNull
@@ -55,7 +55,7 @@ suspend fun activateStickerInfoBot(
             withTypingAction(it.chat) {
                 it.content.textSources.mapNotNull {
                     if (it is CustomEmojiTextSource) {
-                        getCustomEmojiStickerOrNull(it.customEmojiId)?.stickerSetName
+                        getCustomEmojiStickerOrNull(it.customEmojiId) ?.stickerSetName
                     } else {
                         null
                     }
@@ -76,7 +76,7 @@ suspend fun activateStickerInfoBot(
             )
         }
 
-        allUpdatesFlow.subscribeLoggingDropExceptions(scope = this) {
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
     }.join()

WebApp/build.gradle

@@ -35,7 +35,6 @@ kotlin {
                 implementation kotlin('stdlib')
                 implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
                 implementation "dev.inmo:tgbotapi.core:$telegram_bot_api_version"
-                implementation compose.runtime
             }
         }
 
@@ -43,6 +42,7 @@ kotlin {
             dependencies {
                 implementation "dev.inmo:tgbotapi.webapps:$telegram_bot_api_version"
                 implementation compose.web.core
+                implementation compose.runtime
             }
         }
 
@@ -51,7 +51,6 @@ kotlin {
                 implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
                 implementation "dev.inmo:micro_utils.ktor.server:$micro_utils_version"
                 implementation "io.ktor:ktor-server-cio:$ktor_version"
-                implementation compose.desktop.currentOs
             }
         }
     }

WebApp/src/jsMain/kotlin/main.kt

@@ -1,5 +1,6 @@
 import androidx.compose.runtime.*
-import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
+import dev.inmo.tgbotapi.types.CustomEmojiId
 import dev.inmo.tgbotapi.types.userIdField
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.webapps.*
@@ -22,12 +23,10 @@ import kotlinx.dom.appendElement
 import kotlinx.dom.appendText
 import kotlinx.serialization.json.Json
 import org.jetbrains.compose.web.attributes.InputType
-import org.jetbrains.compose.web.attributes.placeholder
+import org.jetbrains.compose.web.css.DisplayStyle
-import org.jetbrains.compose.web.css.Style
-import org.jetbrains.compose.web.css.StyleSheet
 import org.jetbrains.compose.web.css.Color as ComposeColor
 import org.jetbrains.compose.web.css.backgroundColor
-import org.jetbrains.compose.web.css.color
+import org.jetbrains.compose.web.css.display
 import org.jetbrains.compose.web.dom.*
 import org.jetbrains.compose.web.dom.Text
 import org.jetbrains.compose.web.renderComposable
@@ -40,13 +39,6 @@ fun HTMLElement.log(text: String) {
     appendElement("p", {})
 }
 
-private object RootStyleSheet : StyleSheet() {
-    val rootClass by style {
-        color(ComposeColor("var(--tg-theme-text-color)"))
-        backgroundColor(ComposeColor("var(--tg-theme-bg-color)"))
-    }
-}
-
 @OptIn(ExperimentalUnsignedTypes::class)
 fun main() {
     console.log("Web app started")
@@ -54,14 +46,6 @@ fun main() {
     val baseUrl = window.location.origin.removeSuffix("/")
 
     renderComposable("root") {
-        Style(RootStyleSheet)
-        DisposableEffect(null) {
-            scopeElement.classList.add(RootStyleSheet.rootClass)
-
-            onDispose {
-                scopeElement.classList.remove(RootStyleSheet.rootClass)
-            }
-        }
         val scope = rememberCoroutineScope()
         val isSafeState = remember { mutableStateOf<Boolean?>(null) }
         val logsState = remember { mutableStateListOf<Any?>() }
@@ -103,7 +87,6 @@ fun main() {
         P()
         Text("Chat from WebAppInitData: ${webApp.initDataUnsafe.chat}")
 
-        H3 { Text("Emoji status management") }
         val emojiStatusAccessState = remember { mutableStateOf(false) }
         webApp.onEmojiStatusAccessRequested {
             emojiStatusAccessState.value = it.isAllowed
@@ -127,7 +110,7 @@ fun main() {
             userId ?.let { userId ->
                 Button({
                     onClick {
-                        scope.launchLoggingDropExceptions {
+                        scope.launchSafelyWithoutExceptions {
                             client.post("$baseUrl/setCustomEmoji") {
                                 parameter(userIdField, userId.long)
                                 setBody(
@@ -144,12 +127,10 @@ fun main() {
                 }
             }
         }
-        P()
 
-        H3 { Text("Call server method with webAppQueryIdField") }
         Button({
             onClick {
-                scope.launchLoggingDropExceptions {
+                scope.launchSafelyWithoutExceptions {
                     handleResult({ "Clicked" }) {
                         client.post("${window.location.origin.removeSuffix("/")}/inline") {
                             parameter(webAppQueryIdField, it)
@@ -163,40 +144,11 @@ fun main() {
             Text("Answer in chat button")
         }
 
-        H3 { Text("Hide keyboard") }
-        val hideCountdown = remember { mutableStateOf<Int?>(null) }
-        Button({
-            onClick {
-                hideCountdown.value = 5
-            }
-        }) {
-            if (hideCountdown.value == null) {
-                Text("Hide")
-            } else {
-                Text("Hide in ${hideCountdown.value} seconds")
-            }
-        }
-        LaunchedEffect(hideCountdown.value) {
-            val value = hideCountdown.value
-            when {
-                value == null -> return@LaunchedEffect
-                value > 0 -> {
-                    delay(1000)
-                    hideCountdown.value = hideCountdown.value ?.minus(1)
-                }
-                else -> {
-                    webApp.hideKeyboard()
-                    hideCountdown.value = null
-                }
-            }
-        }
-
         P()
-        H3 { Text("User info") }
         Text("Allow to write in private messages: ${webApp.initDataUnsafe.user ?.allowsWriteToPM ?: "User unavailable"}")
 
         P()
-        H3 { Text("Alerts") }
+        Text("Alerts:")
         Button({
             onClick {
                 webApp.showPopup(
@@ -234,22 +186,8 @@ fun main() {
         }) {
             Text("Alert")
         }
-        Button({
-            onClick {
-                webApp.showConfirm(
-                    "This is confirm message"
-                ) {
-                    logsState.add(
-                        "You have pressed \"${if (it) "Ok" else "Cancel"}\" in confirm"
-                    )
-                }
-            }
-        }) {
-            Text("Confirm")
-        }
 
         P()
-        H3 { Text("Write access callbacks") }
         Button({
             onClick {
                 webApp.requestWriteAccess()
@@ -268,7 +206,6 @@ fun main() {
         }
 
         P()
-        H3 { Text("Request contact") }
         Button({
             onClick {
                 webApp.requestContact()
@@ -283,9 +220,24 @@ fun main() {
         }) {
             Text("Request contact with callback")
         }
+        P()
+
+        Button({
+            onClick {
+                webApp.showConfirm(
+                    "This is confirm message"
+                ) {
+                    logsState.add(
+                        "You have pressed \"${if (it) "Ok" else "Cancel"}\" in confirm"
+                    )
+                }
+            }
+        }) {
+            Text("Confirm")
+        }
 
         P()
-        H3 { Text("Closing confirmation") }
+
         val isClosingConfirmationEnabledState = remember { mutableStateOf(webApp.isClosingConfirmationEnabled) }
         Button({
             onClick {
@@ -303,7 +255,7 @@ fun main() {
         }
 
         P()
-        H3 { Text("Colors") }
+
         val headerColor = remember { mutableStateOf<Color.Hex>(Color.Hex("#000000")) }
         fun updateHeaderColor() {
             val (r, g, b) = Random.nextUBytes(3)
@@ -328,6 +280,7 @@ fun main() {
         }
 
         P()
+
         val backgroundColor = remember { mutableStateOf<Color.Hex>(Color.Hex("#000000")) }
         fun updateBackgroundColor() {
             val (r, g, b) = Random.nextUBytes(3)
@@ -352,6 +305,7 @@ fun main() {
         }
 
         P()
+
         val bottomBarColor = remember { mutableStateOf<Color.Hex>(Color.Hex("#000000")) }
         fun updateBottomBarColor() {
             val (r, g, b) = Random.nextUBytes(3)
@@ -375,184 +329,8 @@ fun main() {
             }
         }
 
-        remember {
-            webApp.apply {
-
-                onThemeChanged {
-                    logsState.add("Theme changed: ${webApp.themeParams}")
-                }
-                onViewportChanged {
-                    logsState.add("Viewport changed: ${it}")
-                }
-                backButton.apply {
-                    onClick {
-                        logsState.add("Back button clicked")
-                        hapticFeedback.impactOccurred(
-                            HapticFeedbackStyle.Heavy
-                        )
-                    }
-                    show()
-                }
-                mainButton.apply {
-                    setText("Main button")
-                    onClick {
-                        logsState.add("Main button clicked")
-                        hapticFeedback.notificationOccurred(
-                            HapticFeedbackType.Success
-                        )
-                    }
-                    show()
-                }
-                secondaryButton.apply {
-                    setText("Secondary button")
-                    onClick {
-                        logsState.add("Secondary button clicked")
-                        hapticFeedback.notificationOccurred(
-                            HapticFeedbackType.Warning
-                        )
-                    }
-                    show()
-                }
-                onSettingsButtonClicked {
-                    logsState.add("Settings button clicked")
-                }
-                onWriteAccessRequested {
-                    logsState.add("Write access request result: $it")
-                }
-                onContactRequested {
-                    logsState.add("Contact request result: $it")
-                }
-            }
-        }
-
-        P()
-        let {
-            H3 { Text("Accelerometer") }
-            val enabledState = remember { mutableStateOf(webApp.accelerometer.isStarted) }
-            webApp.onAccelerometerStarted { enabledState.value = true }
-            webApp.onAccelerometerStopped { enabledState.value = false }
-            Button({
-                onClick {
-                    if (enabledState.value) {
-                        webApp.accelerometer.stop {  }
-                    } else {
-                        webApp.accelerometer.start(AccelerometerStartParams(200))
-                    }
-                }
-            }) {
-                Text("${if (enabledState.value) "Stop" else "Start"} accelerometer")
-            }
-            val xState = remember { mutableStateOf(webApp.accelerometer.x) }
-            val yState = remember { mutableStateOf(webApp.accelerometer.y) }
-            val zState = remember { mutableStateOf(webApp.accelerometer.z) }
-            fun updateValues() {
-                xState.value = webApp.accelerometer.x
-                yState.value = webApp.accelerometer.y
-                zState.value = webApp.accelerometer.z
-            }
-            remember {
-                updateValues()
-            }
-
-            webApp.onAccelerometerChanged {
-                updateValues()
-            }
-            if (enabledState.value) {
-                P()
-                Text("x: ${xState.value}")
-                P()
-                Text("y: ${yState.value}")
-                P()
-                Text("z: ${zState.value}")
-            }
-        }
         P()
 
-        let {
-            H3 { Text("Gyroscope") }
-            val enabledState = remember { mutableStateOf(webApp.gyroscope.isStarted) }
-            webApp.onGyroscopeStarted { enabledState.value = true }
-            webApp.onGyroscopeStopped { enabledState.value = false }
-            Button({
-                onClick {
-                    if (enabledState.value) {
-                        webApp.gyroscope.stop {  }
-                    } else {
-                        webApp.gyroscope.start(GyroscopeStartParams(200))
-                    }
-                }
-            }) {
-                Text("${if (enabledState.value) "Stop" else "Start"} gyroscope")
-            }
-            val xState = remember { mutableStateOf(webApp.gyroscope.x) }
-            val yState = remember { mutableStateOf(webApp.gyroscope.y) }
-            val zState = remember { mutableStateOf(webApp.gyroscope.z) }
-            fun updateValues() {
-                xState.value = webApp.gyroscope.x
-                yState.value = webApp.gyroscope.y
-                zState.value = webApp.gyroscope.z
-            }
-            remember {
-                updateValues()
-            }
-
-            webApp.onGyroscopeChanged {
-                updateValues()
-            }
-            if (enabledState.value) {
-                P()
-                Text("x: ${xState.value}")
-                P()
-                Text("y: ${yState.value}")
-                P()
-                Text("z: ${zState.value}")
-            }
-        }
-
-        P()
-        let {
-            H3 { Text("Device Orientation") }
-            val enabledState = remember { mutableStateOf(webApp.deviceOrientation.isStarted) }
-            webApp.onDeviceOrientationStarted { enabledState.value = true }
-            webApp.onDeviceOrientationStopped { enabledState.value = false }
-            Button({
-                onClick {
-                    if (enabledState.value) {
-                        webApp.deviceOrientation.stop {  }
-                    } else {
-                        webApp.deviceOrientation.start(DeviceOrientationStartParams(200))
-                    }
-                }
-            }) {
-                Text("${if (enabledState.value) "Stop" else "Start"} deviceOrientation")
-            }
-            val alphaState = remember { mutableStateOf(webApp.deviceOrientation.alpha) }
-            val betaState = remember { mutableStateOf(webApp.deviceOrientation.beta) }
-            val gammaState = remember { mutableStateOf(webApp.deviceOrientation.gamma) }
-            fun updateValues() {
-                alphaState.value = webApp.deviceOrientation.alpha
-                betaState.value = webApp.deviceOrientation.beta
-                gammaState.value = webApp.deviceOrientation.gamma
-            }
-            remember {
-                updateValues()
-            }
-
-            webApp.onDeviceOrientationChanged {
-                updateValues()
-            }
-            if (enabledState.value) {
-                P()
-                Text("alpha: ${alphaState.value}")
-                P()
-                Text("beta: ${betaState.value}")
-                P()
-                Text("gamma: ${gammaState.value}")
-            }
-        }
-
-        P()
-        H3 { Text("Cloud storage") }
         val storageTrigger = remember { mutableStateOf<List<Pair<CloudStorageKey, CloudStorageValue>>>(emptyList()) }
         fun updateCloudStorage() {
             webApp.cloudStorage.getAll {
@@ -605,126 +383,180 @@ fun main() {
             }
         }
 
-        P()
+        remember {
-        let { // DeviceStorage
+            webApp.apply {
-            H3 { Text("Device storage") }
-            val fieldKey = remember { mutableStateOf("") }
-            val fieldValue = remember { mutableStateOf("") }
-            val message = remember { mutableStateOf("") }
-            Div {
-                Text("Start type title of key. If value will be found in device storage, it will be shown in value input")
-            }
 
-            Input(InputType.Text) {
+                onThemeChanged {
-                placeholder("Key")
+                    logsState.add("Theme changed: ${webApp.themeParams}")
-                value(fieldKey.value)
-                onInput {
-                    fieldKey.value = it.value
-                    webApp.deviceStorage.getItem(it.value) { e, v ->
-                        fieldValue.value = v ?: ""
-                        if (v == null) {
-                            message.value = "Value for key \"${it.value}\" has not been found"
-                        } else {
-                            message.value = "Value for key \"${it.value}\" has been found: \"$v\""
                 }
+                onViewportChanged {
+                    logsState.add("Viewport changed: ${it}")
                 }
+                backButton.apply {
+                    onClick {
+                        logsState.add("Back button clicked")
+                        hapticFeedback.impactOccurred(
+                            HapticFeedbackStyle.Heavy
+                        )
                     }
+                    show()
                 }
-            Div {
+                mainButton.apply {
-                Text("If you want to change value if typed key - just put it here")
+                    setText("Main button")
+                    onClick {
+                        logsState.add("Main button clicked")
+                        hapticFeedback.notificationOccurred(
+                            HapticFeedbackType.Success
+                        )
                     }
-            Input(InputType.Text) {
+                    show()
-                placeholder("Value")
-                value(fieldValue.value)
-                onInput {
-                    fieldValue.value = it.value
-                    webApp.deviceStorage.setItem(fieldKey.value, it.value) { e, v ->
-                        if (v == true) {
-                            fieldValue.value = it.value
-                            message.value = "Value \"${it.value}\" has been saved"
                 }
+                secondaryButton.apply {
+                    setText("Secondary button")
+                    onClick {
+                        logsState.add("Secondary button clicked")
+                        hapticFeedback.notificationOccurred(
+                            HapticFeedbackType.Warning
+                        )
                     }
+                    show()
                 }
+                onSettingsButtonClicked {
+                    logsState.add("Settings button clicked")
+                }
+                onWriteAccessRequested {
+                    logsState.add("Write access request result: $it")
+                }
+                onContactRequested {
+                    logsState.add("Contact request result: $it")
                 }
-
-            if (message.value.isNotEmpty()) {
-                Div { Text(message.value) }
             }
         }
         P()
 
-        let { // DeviceStorage
+        let { // Accelerometer
-            H3 { Text("Secure storage") }
+            val enabledState = remember { mutableStateOf(webApp.accelerometer.isStarted) }
-            val fieldKey = remember { mutableStateOf("") }
+            webApp.onAccelerometerStarted { enabledState.value = true }
-            val fieldValue = remember { mutableStateOf("") }
+            webApp.onAccelerometerStopped { enabledState.value = false }
-            val message = remember { mutableStateOf("") }
-            val restorableState = remember { mutableStateOf(false) }
-            Div {
-                Text("Start type title of key. If value will be found in device storage, it will be shown in value input")
-            }
-
-            Input(InputType.Text) {
-                placeholder("Key")
-                value(fieldKey.value)
-                onInput {
-                    fieldKey.value = it.value
-                    webApp.secureStorage.getItem(it.value) { e, v, restorable ->
-                        fieldValue.value = v ?: ""
-                        restorableState.value = restorable == true
-                        if (v == null) {
-                            if (restorable == true) {
-                                message.value = "Value for key \"${it.value}\" has not been found, but can be restored"
-                            } else {
-                                message.value = "Value for key \"${it.value}\" has not been found. Error: $e"
-                            }
-                        } else {
-                            message.value = "Value for key \"${it.value}\" has been found: \"$v\""
-                        }
-                    }
-                }
-            }
-            if (restorableState.value) {
             Button({
                 onClick {
-                        webApp.secureStorage.restoreItem(fieldKey.value) { e, v ->
+                    if (enabledState.value) {
-                            fieldValue.value = v ?: ""
+                        webApp.accelerometer.stop {  }
-                            if (v == null) {
-                                message.value = "Value for key \"${fieldKey.value}\" has not been restored. Error: $e"
                     } else {
-                                message.value = "Value for key \"${fieldKey.value}\" has been restored: \"$v\""
+                        webApp.accelerometer.start(AccelerometerStartParams(200))
-                            }
                     }
                 }
             }) {
-                    Text("Restore")
+                Text("${if (enabledState.value) "Stop" else "Start"} accelerometer")
-                }
-            }
-            Div {
-                Text("If you want to change value if typed key - just put it here")
-            }
-            Input(InputType.Text) {
-                placeholder("Value")
-                value(fieldValue.value)
-                onInput {
-                    fieldValue.value = it.value
-                    webApp.secureStorage.setItem(fieldKey.value, it.value) { e, v ->
-                        if (v) {
-                            fieldValue.value = it.value
-                            message.value = "Value \"${it.value}\" has been saved"
-                        } else {
-                            message.value = "Value \"${it.value}\" has not been saved. Error: $e"
-                        }
             }
+            val xState = remember { mutableStateOf(webApp.accelerometer.x) }
+            val yState = remember { mutableStateOf(webApp.accelerometer.y) }
+            val zState = remember { mutableStateOf(webApp.accelerometer.z) }
+            fun updateValues() {
+                xState.value = webApp.accelerometer.x
+                yState.value = webApp.accelerometer.y
+                zState.value = webApp.accelerometer.z
             }
+            remember {
+                updateValues()
             }
 
-            if (message.value.isNotEmpty()) {
+            webApp.onAccelerometerChanged {
-                Div { Text(message.value) }
+                updateValues()
+            }
+            if (enabledState.value) {
+                P()
+                Text("x: ${xState.value}")
+                P()
+                Text("y: ${yState.value}")
+                P()
+                Text("z: ${zState.value}")
+            }
+        }
+        P()
+
+        let { // Gyroscope
+            val enabledState = remember { mutableStateOf(webApp.gyroscope.isStarted) }
+            webApp.onGyroscopeStarted { enabledState.value = true }
+            webApp.onGyroscopeStopped { enabledState.value = false }
+            Button({
+                onClick {
+                    if (enabledState.value) {
+                        webApp.gyroscope.stop {  }
+                    } else {
+                        webApp.gyroscope.start(GyroscopeStartParams(200))
+                    }
+                }
+            }) {
+                Text("${if (enabledState.value) "Stop" else "Start"} gyroscope")
+            }
+            val xState = remember { mutableStateOf(webApp.gyroscope.x) }
+            val yState = remember { mutableStateOf(webApp.gyroscope.y) }
+            val zState = remember { mutableStateOf(webApp.gyroscope.z) }
+            fun updateValues() {
+                xState.value = webApp.gyroscope.x
+                yState.value = webApp.gyroscope.y
+                zState.value = webApp.gyroscope.z
+            }
+            remember {
+                updateValues()
+            }
+
+            webApp.onGyroscopeChanged {
+                updateValues()
+            }
+            if (enabledState.value) {
+                P()
+                Text("x: ${xState.value}")
+                P()
+                Text("y: ${yState.value}")
+                P()
+                Text("z: ${zState.value}")
+            }
+        }
+        P()
+
+        let { // DeviceOrientation
+            val enabledState = remember { mutableStateOf(webApp.deviceOrientation.isStarted) }
+            webApp.onDeviceOrientationStarted { enabledState.value = true }
+            webApp.onDeviceOrientationStopped { enabledState.value = false }
+            Button({
+                onClick {
+                    if (enabledState.value) {
+                        webApp.deviceOrientation.stop {  }
+                    } else {
+                        webApp.deviceOrientation.start(DeviceOrientationStartParams(200))
+                    }
+                }
+            }) {
+                Text("${if (enabledState.value) "Stop" else "Start"} deviceOrientation")
+            }
+            val alphaState = remember { mutableStateOf(webApp.deviceOrientation.alpha) }
+            val betaState = remember { mutableStateOf(webApp.deviceOrientation.beta) }
+            val gammaState = remember { mutableStateOf(webApp.deviceOrientation.gamma) }
+            fun updateValues() {
+                alphaState.value = webApp.deviceOrientation.alpha
+                betaState.value = webApp.deviceOrientation.beta
+                gammaState.value = webApp.deviceOrientation.gamma
+            }
+            remember {
+                updateValues()
+            }
+
+            webApp.onDeviceOrientationChanged {
+                updateValues()
+            }
+            if (enabledState.value) {
+                P()
+                Text("alpha: ${alphaState.value}")
+                P()
+                Text("beta: ${betaState.value}")
+                P()
+                Text("gamma: ${gammaState.value}")
             }
         }
         P()
 
-        H3 { Text("Events") }
         EventType.values().forEach { eventType ->
             when (eventType) {
                 EventType.AccelerometerChanged -> webApp.onAccelerometerChanged { /*logsState.add("AccelerometerChanged") /* see accelerometer block */ */ }

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -1,5 +1,4 @@
 import dev.inmo.kslog.common.*
-import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.tgbotapi.extensions.api.answers.answerInlineQuery
@@ -196,7 +195,7 @@ suspend fun main(vararg args: String) {
             BotCommand("reply_markup", "Use to get reply markup keyboard with web app trigger"),
             BotCommand("inline", "Use to get inline keyboard with web app trigger"),
         )
-        allUpdatesFlow.subscribeLoggingDropExceptions(this) {
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
         println(getMe())

build.gradle

@@ -14,8 +14,8 @@ allprojects {
         nativePartTemplate = "${rootProject.projectDir.absolutePath}/native_template.gradle"
     }
     repositories {
+        mavenLocal()
         mavenCentral()
-        google()
         if (project.hasProperty("GITHUB_USER") && project.hasProperty("GITHUB_TOKEN")) {
             maven {
                 url "https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"
@@ -26,8 +26,7 @@ allprojects {
             }
         }
 
-        maven { url "https://proxy.nexus.inmo.dev/repository/maven-releases/" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
-        mavenLocal()
     }
 }
 

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
 kotlin.daemon.jvmargs=-Xmx3g -Xms500m
 
 
-kotlin_version=2.2.0
+kotlin_version=2.1.20
-telegram_bot_api_version=27.1.2
+telegram_bot_api_version=24.0.2
-micro_utils_version=0.26.1
+micro_utils_version=0.25.3
-serialization_version=1.9.0
+serialization_version=1.8.0
-ktor_version=3.2.3
+ktor_version=3.1.1
-compose_version=1.8.2
+compose_version=1.7.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip

gradlew

@@ -1,129 +1,78 @@
-#!/bin/sh
+#!/usr/bin/env sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
+APP_NAME="Gradle"
-# shellcheck disable=SC2034
+APP_BASE_NAME=`basename "$0"`
-APP_BASE_NAME=${0##*/}
+
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,120 +81,92 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-        # shellcheck disable=SC2039,SC3045
+            MAX_FD="$MAX_FD_LIMIT"
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        # Roll the args list around exactly as many times as the number of
+        ulimit -n $MAX_FD
-        # args, so each arg winds up back in the position where it started, but
+        if [ $? -ne 0 ] ; then
-        # possibly modified.
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        #
+        fi
-        # NB: a `for` loop captures its iteration list before it begins, so
+    else
-        # changing the positional parameters here affects neither the number of
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-        # iterations, nor the values presented in `arg`.
+    fi
-        shift                   # remove old arg
+fi
-        set -- "$@" "$arg"      # push replacement arg
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# Collect all arguments for the java command:
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-#     and any embedded shellness will be escaped.
+  cd "$(dirname "$0")"
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,22 +1,4 @@
-@rem
+@if "%DEBUG%" == "" @echo off
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,29 +9,25 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -57,36 +35,48 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+exit /b 1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal