Compare commits

..

2 Commits

Author SHA1 Message Date
renovate[bot]
b8046a1e71 Merge 972d964fe0 into f6bce640da 2025-02-12 06:45:59 +00:00
renovate[bot]
972d964fe0 Update dependency dev.inmo:micro_utils.ktor.server to v0.24.6-branch_0.24.6-build1355 2025-02-12 06:45:54 +00:00
4 changed files with 8 additions and 19 deletions

View File

@@ -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 {

View File

@@ -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'
}

View File

@@ -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'
}

View File

@@ -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
kotlin_version=2.1.0
telegram_bot_api_version=23.1.2
micro_utils_version=0.24.6-branch_0.24.6-build1355
serialization_version=1.8.0
ktor_version=3.1.0
ktor_version=3.0.3
compose_version=1.7.3