Merge 9f630345fb into 2cf2c4264e

HelloBot/src/main/kotlin/HelloBot.kt

@@ -7,13 +7,11 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onConten
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMentionWithAnyContent
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.text
-import dev.inmo.tgbotapi.extensions.utils.formatting.chatLink
 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.types.chat.*
 import dev.inmo.tgbotapi.types.message.MarkdownV2
-import dev.inmo.tgbotapi.types.message.abstracts.ForumContentMessage
 import dev.inmo.tgbotapi.utils.PreviewFeature
 import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
 import kotlinx.coroutines.CoroutineScope
@@ -58,17 +56,8 @@ suspend fun main(vararg args: String) {
                         reply(message, answer, MarkdownV2)
                         return@onContentMessage
                     }
-                    "Oh, hi, " + when {
-                        chat is ForumChat && message is ForumContentMessage<*> -> {
-                            val baseTitle = (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
-                                chat.title.linkMarkdownV2(it)
-                            } ?: chat.title
-                            val additionalTitle = message.threadCreatingInfo ?.let {
-                                it.name.linkMarkdownV2(message.chat.id.chatLink)
-                            } ?: "Main topic"
-                            "$baseTitle \\($additionalTitle\\)"
-                        }
-                        chat is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
+                    "Oh, hi, " + when (chat) {
+                        is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
                             chat.title.linkMarkdownV2(it)
                         } ?: chat.title
                         else -> bot.getChat(chat).inviteLink ?.let {

InlineQueriesBot/build.gradle

@@ -33,6 +33,6 @@ kotlin {
 }
 
 dependencies {
-    implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.0.3'
 }
 

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.1.0'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.0.3'
 }

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

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onSticke
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onText
 import dev.inmo.tgbotapi.types.StickerType
 import dev.inmo.tgbotapi.types.message.textsources.CustomEmojiTextSource
-import dev.inmo.tgbotapi.types.message.textsources.regularTextSource
+import dev.inmo.tgbotapi.types.message.textsources.regular
 import dev.inmo.tgbotapi.types.message.textsources.separateForText
 import dev.inmo.tgbotapi.types.stickers.StickerSet
 import dev.inmo.tgbotapi.utils.bold
@@ -62,7 +62,7 @@ suspend fun activateStickerInfoBot(
                 }.distinct().map {
                     getStickerSet(it)
                 }.distinct().flatMap {
-                    it.buildInfo() + regularTextSource("\n")
+                    it.buildInfo() + regular("\n")
                 }.separateForText().map { entities ->
                     reply(it, entities)
                 }

UserChatShared/src/main/kotlin/UserChatShared.kt

@@ -15,8 +15,8 @@ import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.chat.PrivateChat
 import dev.inmo.tgbotapi.types.keyboardButtonRequestUserLimit
+import dev.inmo.tgbotapi.types.message.textsources.mention
 import dev.inmo.tgbotapi.types.request.RequestId
-import dev.inmo.tgbotapi.utils.mention
 import dev.inmo.tgbotapi.utils.row
 
 suspend fun main(args: Array<String>) {
@@ -287,7 +287,7 @@ suspend fun main(args: Array<String>) {
                     it,
                 ) {
                     +"You have shared "
-                    mention(
+                    +mention(
                         when (it.chatEvent.requestId) {
                             requestIdUserOrBot -> "user or bot"
                             requestIdUserNonPremium -> "non premium user"

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
 kotlin.daemon.jvmargs=-Xmx3g -Xms500m
 
 
-kotlin_version=2.1.10
-telegram_bot_api_version=24.0.0
-micro_utils_version=0.24.6
-serialization_version=1.8.0
-ktor_version=3.1.0
+kotlin_version=2.1.0
+telegram_bot_api_version=22.0.0
+micro_utils_version=0.24.5-branch_0.24.5-build1340
+serialization_version=1.7.3
+ktor_version=3.0.3
 compose_version=1.7.3