Compare commits

..

18 Commits

Author SHA1 Message Date
f7ba9892c8 update ktgbotapi up to 24.0.0 and add work with message.threadCreatingInfo 2025-02-20 11:53:32 +06:00
f87a9c5c66 Merge pull request #316 from InsanusMokrassar/renovate/kotlin-monorepo
Update kotlin monorepo to v2.1.10
2025-02-15 16:46:54 +06:00
a7b54e4b63 Merge pull request #320 from InsanusMokrassar/renovate/micro_utils_version
Update dependency dev.inmo:micro_utils.ktor.server to v0.24.6
2025-02-15 16:45:39 +06:00
renovate[bot]
436213492d Update kotlin monorepo to v2.1.10 2025-02-15 10:45:34 +00:00
renovate[bot]
0c2110a71d Update dependency dev.inmo:micro_utils.ktor.server to v0.24.6 2025-02-15 10:45:29 +00:00
949fa1a429 Merge pull request #319 from InsanusMokrassar/renovate/ktor-monorepo
Update ktor monorepo to v3.1.0
2025-02-15 16:45:04 +06:00
97cdd5a95f Merge pull request #321 from InsanusMokrassar/renovate/telegram_bot_api_version
Update telegram_bot_api_version to v23.2.0
2025-02-15 16:44:49 +06:00
renovate[bot]
0cb116acef Update telegram_bot_api_version to v23.2.0 2025-02-15 10:32:03 +00:00
renovate[bot]
a0332c4efd Update ktor monorepo to v3.1.0 2025-02-11 19:14:32 +00:00
f6bce640da update dependencies 2025-02-01 09:26:06 +06:00
d22a99da19 Merge pull request #315 from InsanusMokrassar/23.1.1
23.1.1
2025-01-29 09:09:14 +06:00
467a3a1710 Update gradle.properties 2025-01-27 10:57:07 +06:00
5810bc5930 migration onto 23.1.1 2025-01-27 09:20:08 +06:00
2cf2c4264e Merge pull request #310 from InsanusMokrassar/renovate/ktor-monorepo
Update ktor monorepo to v3.0.3
2025-01-03 14:17:33 +06:00
renovate[bot]
3d5c2ee4b8 Update ktor monorepo to v3.0.3 2025-01-03 08:17:24 +00:00
360c6b4364 Merge pull request #312 from InsanusMokrassar/renovate/compose_version
Update plugin org.jetbrains.compose to v1.7.3
2025-01-03 14:16:48 +06:00
renovate[bot]
bb6a0a125a Update plugin org.jetbrains.compose to v1.7.3 2024-12-20 01:19:28 +00:00
6a61da2eb7 Merge pull request #311 from InsanusMokrassar/22.0.0
22.0.0
2024-12-09 08:54:48 +06:00
6 changed files with 25 additions and 14 deletions

View File

@@ -7,11 +7,13 @@ 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
@@ -56,8 +58,17 @@ suspend fun main(vararg args: String) {
reply(message, answer, MarkdownV2)
return@onContentMessage
}
"Oh, hi, " + when (chat) {
is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
"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 {
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.0.1'
implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
}

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.0.1'
implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
}

View File

@@ -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.regular
import dev.inmo.tgbotapi.types.message.textsources.regularTextSource
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() + regular("\n")
it.buildInfo() + regularTextSource("\n")
}.separateForText().map { entities ->
reply(it, entities)
}

View File

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

View File

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
kotlin.daemon.jvmargs=-Xmx3g -Xms500m
kotlin_version=2.1.0
telegram_bot_api_version=22.0.0
micro_utils_version=0.23.2
serialization_version=1.7.3
ktor_version=3.0.2
compose_version=1.7.1
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
compose_version=1.7.3