Update CHANGELOG.md

4.1.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,28 @@
 # TelegramBotAPI changelog
 
+## 4.1.3
+
+* `Versions`:
+    * `Kotlin`: `1.7.21` -> `1.7.22`
+    * `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`:

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.1.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"
 
@@ -13,7 +13,7 @@ ktor = "2.1.3"
 ksp = "1.7.21-1.0.8"
 kotlin-poet = "1.12.0"
 
-microutils = "0.14.1"
+microutils = "0.14.4"
 
 github-release-plugin = "2.4.1"
 dokka = "1.7.20"

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/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)
     }
 }
 
@@ -66,9 +69,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 +97,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 +116,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/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)