Update CHANGELOG.md

4.2.2

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']
+custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472', 'https://boosty.to/insanusmokrassar']

.github/workflows/packages_publishing.yml

@@ -16,7 +16,12 @@ jobs:
           mv gradle.properties.tmp gradle.properties
       - name: Build
         run: ./gradlew build
-      - name: Publish
+      - name: Publish to Gitea
+        continue-on-error: true
+        run: ./gradlew publishAllPublicationsToGiteaRepository
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+      - name: Publish to GithubPackages
         continue-on-error: true
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
         env:

CHANGELOG.md

@@ -1,5 +1,55 @@
 # TelegramBotAPI changelog
 
+## 4.2.3
+
+* `Versions`:
+  * `MicroUtils`: `0.16.2` -> `0.16.4`
+* `Core`:
+    * Simplify default `RequestsLimiter` (`ExceptionsOnlyLimiter`) (thanks to [@y9san9](https://github.com/y9san9) for help)
+
+## 4.2.2
+
+* `Versions`:
+    * `MicroUtils`: `0.16.0` -> `0.16.2`
+* `Core`:
+    * Fix of [#694](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/694): add opportunity to create `ChatId` and `ChatIdWithThreadId` from `IdChatIdentifier`
+
+## 4.2.1
+
+* `Versions`:
+    * `MicroUtils`: `0.15.0` -> `0.16.0`
+    * `Ktor`: `2.1.3` -> `2.2.1`
+* `Utils`:
+    * Improve support of `makeLinkToMessage` extensions
+
+## 4.2.0
+
+* `Versions`:
+    * `Kotlin`: `1.7.21` -> `1.7.22`
+    * `MicroUtils`: `0.14.4` -> `0.15.0`
+
+## 4.1.3
+
+* `Versions`:
+    * `MicroUtils`: `0.14.2` -> `0.14.4`
+* `Core`:
+    * `ContentMessage`, `CommonMessage`, `PossiblyMediaGroupMessage` and `PossiblySentViaBotCommonMessage` got `out`
+      variance
+    * `UserId` now is `ChatId` instead of `IdChatIdentififer`
+
+## 4.1.2
+
+* `Versions`:
+    * `MicroUtils`: `0.14.1` -> `0.14.2`
+* `BehaviourBuilder`:
+    * Fixes in `CallbackQuery` waiters
+
+## 4.1.1
+
+* `Core`:
+  * Add opportunity to create `IdChatIdentifier` with optional `threadId`
+  * New serializer `FullChatIdentifierSerializer` with serialization of `ChatIdWithThreadId`
+
 ## 4.1.0
 
 * `Versions`:

build.gradle

@@ -20,6 +20,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=4.1.0
+library_version=4.2.3

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-kotlin = "1.7.21"
+kotlin = "1.7.22"
 kotlin-serialization = "1.4.1"
 kotlin-coroutines = "1.6.4"
 
@@ -8,12 +8,12 @@ javax-activation = "1.1.1"
 
 korlibs = "3.4.0"
 uuid = "0.6.0"
-ktor = "2.1.3"
+ktor = "2.2.1"
 
-ksp = "1.7.21-1.0.8"
+ksp = "1.7.22-1.0.8"
 kotlin-poet = "1.12.0"
 
-microutils = "0.14.1"
+microutils = "0.16.4"
 
 github-release-plugin = "2.4.1"
 dokka = "1.7.20"

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

publish.gradle

@@ -42,20 +42,40 @@ publishing {
                 maven {
                     name = "GithubPackages"
                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+            
                     credentials {
                         username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
                         password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                     }
+            
+                }
+            }
+            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                maven {
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+            
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
+                    }
+            
                 }
             }
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                 maven {
                     name = "sonatype"
                     url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            
                     credentials {
                         username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
                         password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                     }
+            
                 }
             }
         }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt

@@ -20,7 +20,7 @@ suspend inline fun <reified O> BehaviourContext.waitCallbackQueries(
     initRequest,
     errorFactory
 ) {
-    (it.callbackQueryUpdateOrNull() ?.data as O).let(::listOfNotNull)
+    (it.callbackQueryUpdateOrNull() ?.data as? O).let(::listOfNotNull)
 }
 
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutor.kt

@@ -30,7 +30,7 @@ class KtorRequestsExecutor(
     client: HttpClient = HttpClient(),
     callsFactories: List<KtorCallFactory> = emptyList(),
     excludeDefaultFactories: Boolean = false,
-    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter(),
+    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter,
     private val jsonFormatter: Json = nonstrictJsonFormat,
     private val pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
@@ -51,7 +51,7 @@ class KtorRequestsExecutor(
     override suspend fun <T : Any> execute(request: Request<T>): T {
         return runCatchingSafely {
             pipelineStepsHolder.onBeforeSearchCallFactory(request, callsFactories)
-            requestsLimiter.limit {
+            requestsLimiter.limit(request) {
                 var result: T? = null
                 lateinit var factoryHandledRequest: KtorCallFactory
                 for (potentialFactory in callsFactories) {
@@ -111,7 +111,7 @@ class KtorRequestsExecutorBuilder(
     var client: HttpClient = HttpClient()
     var callsFactories: List<KtorCallFactory> = emptyList()
     var excludeDefaultFactories: Boolean = false
-    var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter()
+    var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter
     var jsonFormatter: Json = nonstrictJsonFormat
 
     fun build() = KtorRequestsExecutor(telegramAPIUrlsKeeper, client, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt

@@ -1,66 +1,18 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
-import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.exceptions.TooMuchRequestsException
-import dev.inmo.tgbotapi.types.MilliSeconds
-import dev.inmo.tgbotapi.types.RetryAfterError
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.first
 
 /**
- * This limiter will limit requests only after getting a [RetryAfterError] or [ClientRequestException] with
- * [HttpStatusCode.TooManyRequests] status code. Important thing is that in case if some of block has been blocked, all
- * the others will wait until it will be possible to be called
- *
- * @param defaultTooManyRequestsDelay This parameter will be used in case of getting [ClientRequestException] with
- * [HttpStatusCode.TooManyRequests] as a parameter for delay like it would be [TooMuchRequestsException]. The reason of
- * it is that in [ClientRequestException] there is no information about required delay between requests
+ * Simple limiter which will lock any request when [TooMuchRequestsExceptions] is thrown and rerun request after lock time
  */
-class ExceptionsOnlyLimiter(
-    private val defaultTooManyRequestsDelay: MilliSeconds = 1000L
-) : RequestLimiter {
-    private val lockState = MutableStateFlow(false)
-    private suspend fun lock(timeMillis: MilliSeconds) {
-        try {
-            safely {
-                lockState.emit(true)
-                delay(timeMillis)
-            }
-        } finally {
-            lockState.emit(false)
-        }
-    }
-
+object ExceptionsOnlyLimiter : RequestLimiter {
     override suspend fun <T> limit(block: suspend () -> T): T {
-        while (true) {
-            lockState.first { !it }
-            var throwable: Throwable? = null
-            val result = safely({
-                throwable = when (it) {
-                    is TooMuchRequestsException -> {
-                        lock(it.retryAfter.leftToRetry)
-                        it
-                    }
-                    is ClientRequestException -> {
-                        if (it.response.status == HttpStatusCode.TooManyRequests) {
-                            lock(defaultTooManyRequestsDelay)
-                        } else {
-                            throw it
-                        }
-                        it
-                    }
-                    else -> throw it
-                }
-                null
-            }) {
-                block()
-            }
-            if (throwable == null) {
-                return result!!
-            }
+        return try {
+            block()
+        } catch (e: TooMuchRequestsException) {
+            delay(e.retryAfter.leftToRetry)
+            limit(block)
         }
     }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/NoLimitsLimiter.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.bot.settings.limiters
+
+object NoLimitsLimiter : RequestLimiter {
+    override suspend fun <T> limit(block: suspend () -> T): T = block()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/RequestLimiter.kt

@@ -1,8 +1,12 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
+import dev.inmo.tgbotapi.requests.abstracts.Request
+
 interface RequestLimiter {
     /**
      * Use limit for working of block (like delay between or after, for example)
      */
     suspend fun <T> limit(block: suspend () -> T): T
+
+    suspend fun <T : Any> limit(request: Request<T>, block: suspend () -> T) = limit(block)
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt

@@ -30,6 +30,9 @@ sealed interface IdChatIdentifier : ChatIdentifier {
 
     companion object {
         operator fun invoke(chatId: Identifier) = ChatId(chatId)
+        operator fun invoke(chatId: Identifier, threadId: MessageThreadId?) = threadId ?.let {
+            ChatIdWithThreadId(chatId, threadId)
+        } ?: ChatId(chatId)
     }
 }
 
@@ -51,6 +54,13 @@ value class ChatIdWithThreadId(val chatIdWithThreadId: Pair<Identifier, MessageT
 val ChatIdentifier.threadId: MessageThreadId?
     get() = (this as? IdChatIdentifier) ?.threadId
 
+fun IdChatIdentifier.toChatId() = when (this) {
+    is ChatId -> this
+    is ChatIdWithThreadId -> ChatId(chatId)
+}
+
+fun IdChatIdentifier.toChatWithThreadId(threadId: MessageThreadId) = IdChatIdentifier(chatId, threadId)
+
 /**
  * https://core.telegram.org/bots/api#formatting-options
  */
@@ -66,9 +76,9 @@ val UserId.userLink: String
 val User.link: String
     get() = id.userLink
 
-typealias UserId = IdChatIdentifier
+typealias UserId = ChatId
 
-fun Identifier.toChatId(): IdChatIdentifier = ChatId(this)
+fun Identifier.toChatId(): ChatId = ChatId(this)
 fun Int.toChatId(): IdChatIdentifier = toLong().toChatId()
 fun Byte.toChatId(): IdChatIdentifier = toLong().toChatId()
 
@@ -94,6 +104,7 @@ object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
     override val descriptor: SerialDescriptor = internalSerializer.descriptor
     override fun deserialize(decoder: Decoder): ChatIdentifier {
         val id = internalSerializer.deserialize(decoder)
+
         return id.longOrNull ?.let {
             ChatId(it)
         } ?: id.content.let {
@@ -112,3 +123,41 @@ object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
         }
     }
 }
+
+@RiskFeature
+object FullChatIdentifierSerializer : KSerializer<ChatIdentifier> {
+    private val internalSerializer = JsonPrimitive.serializer()
+    override val descriptor: SerialDescriptor = internalSerializer.descriptor
+    override fun deserialize(decoder: Decoder): ChatIdentifier {
+        val id = internalSerializer.deserialize(decoder)
+
+        return id.longOrNull ?.let {
+            ChatId(it)
+        } ?:let {
+            val splitted = id.content.split("/")
+            if (splitted.size == 2) {
+                val (chatId, threadId) = splitted
+                ChatIdWithThreadId(
+                    chatId.toLongOrNull() ?: return@let null,
+                    threadId.toLongOrNull() ?: return@let null
+                )
+            } else {
+                null
+            }
+        } ?: id.content.let {
+            if (!it.startsWith("@")) {
+                Username("@$it")
+            } else {
+                Username(it)
+            }
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: ChatIdentifier) {
+        when (value) {
+            is ChatId -> encoder.encodeLong(value.chatId)
+            is ChatIdWithThreadId -> encoder.encodeString("${value.chatId}/${value.threadId}")
+            is Username -> encoder.encodeString(value.username)
+        }
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Extended.kt

@@ -52,7 +52,7 @@ data class ExtendedGroupChatImpl(
 @Serializable
 data class ExtendedPrivateChatImpl(
     @SerialName(idField)
-    override val id: IdChatIdentifier,
+    override val id: UserId,
     @SerialName(photoField)
     override val chatPhoto: ChatPhoto? = null,
     @SerialName(usernameField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt

@@ -18,7 +18,7 @@ data class GroupChatImpl(
 @Serializable
 data class PrivateChatImpl(
     @SerialName(idField)
-    override val id: IdChatIdentifier,
+    override val id: UserId,
     @SerialName(usernameField)
     override val username: Username? = null,
     @SerialName(firstNameField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt

@@ -42,6 +42,7 @@ sealed interface Sticker : TelegramMediaFile, SizedMediaFile, ThumbedMediaFile {
         get() = false
 }
 
+@OptIn(RiskFeature::class)
 object StickerSerializer : KSerializer<Sticker> {
     override val descriptor: SerialDescriptor = StickerSurrogate.serializer().descriptor
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/CommonMessage.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
-sealed interface CommonMessage<T: MessageContent> : Message,
+sealed interface CommonMessage<out T: MessageContent> : Message,
     PossiblyForwardedMessage,
     PossiblyEditedMessage,
     PossiblyReplyMessage,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ContentMessage.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
-interface ContentMessage<T: MessageContent>: Message {
+interface ContentMessage<out T: MessageContent>: Message {
     val hasProtectedContent: Boolean
     val content: T
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblyMediaGroupMessage.kt

@@ -3,6 +3,6 @@ package dev.inmo.tgbotapi.types.message.abstracts
 import dev.inmo.tgbotapi.types.MediaGroupIdentifier
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
-interface PossiblyMediaGroupMessage<T : MessageContent> : ContentMessage<T> {
+interface PossiblyMediaGroupMessage<out T : MessageContent> : ContentMessage<T> {
     val mediaGroupId: MediaGroupIdentifier?
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotCommonMessage.kt

@@ -2,4 +2,4 @@ package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
-sealed interface PossiblySentViaBotCommonMessage<T: MessageContent> : CommonMessage<T>, PossiblySentViaBot
+sealed interface PossiblySentViaBotCommonMessage<out T: MessageContent> : CommonMessage<T>, PossiblySentViaBot

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt

@@ -7,39 +7,61 @@ import dev.inmo.tgbotapi.types.message.textsources.link
 import io.ktor.http.encodeURLQueryComponent
 
 
-fun makeUsernameLink(username: String) = "$internalLinkBeginning/$username"
+fun makeUsernameLink(username: String, threadId: MessageThreadId? = null) = "$internalLinkBeginning/$username${threadId ?.let { "/$it" } ?: ""}"
+fun makeChatLink(identifier: Identifier, threadId: MessageThreadId? = null) = identifier.toString().replace(
+    linkIdRedundantPartRegex,
+    ""
+).let { bareId ->
+    "$internalLinkBeginning/c/$bareId${threadId ?.let { "/$it" } ?: ""}"
+}
 fun makeUsernameDeepLinkPrefix(username: String) = "${makeUsernameLink(username)}?start="
 fun makeUsernameStartattachPrefix(username: String) = "$internalLinkBeginning/$username?startattach"
 fun makeUsernameStartattachLink(username: String, data: String? = null) = "${makeUsernameStartattachPrefix(username)}${data?.let { "=$it" } ?: ""}"
 inline val Username.link
     get() = makeUsernameLink(usernameWithoutAt)
+val IdChatIdentifier.link: String
+    get() = makeChatLink(chatId, threadId)
+fun ChatId.link(threadId: MessageThreadId?) = makeChatLink(chatId, threadId)
+inline fun Username.link(threadId: MessageThreadId?) = makeUsernameLink(usernameWithoutAt, threadId)
 inline val Username.deepLinkPrefix
     get() = makeUsernameDeepLinkPrefix(usernameWithoutAt)
 inline val Username.startattachPrefix
     get() = makeUsernameStartattachPrefix(usernameWithoutAt)
-inline fun makeLink(username: Username) = username.link
+inline fun makeLink(username: Username, threadId: MessageThreadId? = null) = username.link(threadId)
 inline fun makeTelegramDeepLink(username: String, startParameter: String) = "${makeUsernameDeepLinkPrefix(username)}$startParameter".encodeURLQueryComponent()
 inline fun makeTelegramStartattach(username: String, data: String? = null) = makeUsernameStartattachLink(username, data)
 inline fun makeDeepLink(username: Username, startParameter: String) = makeTelegramDeepLink(username.usernameWithoutAt, startParameter)
 inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
 inline fun makeTelegramStartattach(username: Username, data: String? = null) = makeTelegramStartattach(username.usernameWithoutAt, data)
 
-fun makeLinkToMessage(
-    username: String,
-    messageId: MessageId
-): String = "$internalLinkBeginning/$username/$messageId"
-fun makeLinkToMessage(
-    username: Username,
-    messageId: MessageId
-): String = makeLinkToMessage(username.username, messageId)
-fun makeLinkToMessage(
-    chat: UsernameChat,
-    messageId: MessageId
-): String? = chat.username ?.let { makeLinkToMessage(it, messageId) }
-
 private val linkIdRedundantPartRegex = Regex("^-100")
 private val usernameBeginSymbolRegex = Regex("^@")
 
+fun makeLinkToMessage(
+    username: String,
+    messageId: MessageId,
+    threadId: MessageThreadId? = null
+): String = "${makeUsernameLink(username, threadId)}/$messageId"
+fun makeLinkToMessage(
+    username: Username,
+    messageId: MessageId,
+    threadId: MessageThreadId? = null
+): String = makeLinkToMessage(username.username, messageId, threadId)
+fun makeLinkToMessage(
+    chatId: Identifier,
+    messageId: MessageId,
+    threadId: MessageThreadId? = null
+): String = chatId.toString().replace(
+    linkIdRedundantPartRegex,
+    ""
+).let { bareId ->
+    "$internalLinkBeginning/c/$bareId/${threadId ?.let { "$it/" } ?: ""}$messageId"
+}
+fun makeLinkToMessage(
+    chatId: IdChatIdentifier,
+    messageId: MessageId,
+): String = makeLinkToMessage(chatId.chatId, messageId, chatId.threadId)
+
 /**
  * Link which can be used as by any user to get access to [Message]. Returns null in case when there are no
  * known way to build link (for [PrivateChat]s, for example)
@@ -49,16 +71,10 @@ fun makeLinkToMessage(
     messageId: MessageId
 ): String? {
     return when {
-        chat is UsernameChat && chat.username != null -> {
-            "$internalLinkBeginning/${chat.username ?.username ?.replace(
-                usernameBeginSymbolRegex, "")}/$messageId"
-        }
-        chat !is PrivateChat -> chat.id.chatId.toString().replace(
-            linkIdRedundantPartRegex,
-            ""
-        ).let { bareId ->
-            "$internalLinkBeginning/c/$bareId/$messageId"
-        }
+        chat is UsernameChat && chat.username != null -> chat.username ?.let {
+            makeLinkToMessage(it, messageId, chat.id.threadId)
+        } ?: makeLinkToMessage(chat.id, messageId)
+        chat !is PrivateChat -> makeLinkToMessage(chat.id, messageId)
         else -> return null
     }
 }
@@ -79,7 +95,7 @@ val Message.link: String?
 val Chat.link: String?
     get() {
         if (this is UsernameChat) {
-            username ?.link
+            username ?.link ?: id.link
         }
         if (this is ExtendedPublicChat) {
             inviteLink ?.let { return it }

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/StringFormatting.kt

@@ -200,7 +200,7 @@ infix fun String.mention(parseMode: ParseMode): String = when (parseMode) {
     is MarkdownV2 -> mentionMarkdownV2()
 }
 
-infix fun Pair<String, IdChatIdentifier>.mention(parseMode: ParseMode): String = when (parseMode) {
+infix fun Pair<String, UserId>.mention(parseMode: ParseMode): String = when (parseMode) {
     is HTML -> first.textMentionHTML(second)
     is Markdown -> first.textMentionMarkdown(second)
     is MarkdownV2 -> first.textMentionMarkdownV2(second)