From 7c4808f16348f3d6cf020dcdc157bfa2e7a58765 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 9 Jul 2022 22:37:58 +0600 Subject: [PATCH 1/5] start 2.1.3 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3adb3df99..e67ccc6b06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 2.1.3 + ## 2.1.2 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 790b2f75cf..073afa5cca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=2.1.2 +library_version=2.1.3 From c2487c5adca26b81477fd7c893b6cb860ea5385e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 9 Jul 2022 22:43:19 +0600 Subject: [PATCH 2/5] fixes in links --- CHANGELOG.md | 3 +++ .../dev/inmo/tgbotapi/types/ChatIdentifier.kt | 23 +++++++++++++++---- .../utils/formatting/LinksFormatting.kt | 4 +--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e67ccc6b06..54770ac159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 2.1.3 +* `Utils`: + * Rename `UserId` extension `link` to `userLink` + ## 2.1.2 * `Versions`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt index b7ea893b3c..967e81d54a 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt @@ -11,6 +11,8 @@ import kotlinx.serialization.encoding.Encoder import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.longOrNull +const val internalLinkBeginning = "https://t.me" + @Serializable(ChatIdentifierSerializer::class) sealed class ChatIdentifier @@ -26,16 +28,29 @@ data class ChatId( * https://core.telegram.org/bots/api#formatting-options */ @Warning("This API have restrictions in Telegram System") -val Identifier.link: String +val Identifier.userLink: String get() = "tg://user?id=$this" /** * https://core.telegram.org/bots/api#formatting-options */ @Warning("This API have restrictions in Telegram System") -val UserId.link: String - get() = chatId.link +val UserId.userLink: String + get() = chatId.userLink val User.link: String - get() = id.link + get() = id.userLink + +/** + * https://core.telegram.org/bots/api#formatting-options + */ +@Deprecated("Renamed", ReplaceWith("userLink", "dev.inmo.tgbotapi.types.userLink")) +val Identifier.link: String + get() = "$internalLinkBeginning/tg://user?id=$this" +/** + * https://core.telegram.org/bots/api#formatting-options + */ +@Deprecated("Renamed", ReplaceWith("userLink", "dev.inmo.tgbotapi.types.userLink")) +val ChatId.link: String + get() = chatId.link typealias UserId = ChatId diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt index 289d5cafe8..284900af4e 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt @@ -5,8 +5,6 @@ import dev.inmo.tgbotapi.types.message.textsources.link import dev.inmo.tgbotapi.types.chat.* import dev.inmo.tgbotapi.types.message.abstracts.Message -private const val internalLinkBeginning = "https://t.me" - fun makeUsernameLink(username: String) = "$internalLinkBeginning/$username" fun makeUsernameDeepLinkPrefix(username: String) = "${makeUsernameLink(username)}?start=" inline val Username.link @@ -73,7 +71,7 @@ val Message.link: String? val Chat.link: String? get() { if (this is UsernameChat) { - username ?.username ?.let { return it } + username ?.link } if (this is ExtendedPublicChat) { inviteLink ?.let { return it } From c7dc69d09f0917ab8534d3cd92522988b471aec1 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 9 Jul 2022 23:09:52 +0600 Subject: [PATCH 3/5] ChatJoinRequest#inviteLink fix --- CHANGELOG.md | 2 ++ .../kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt | 2 +- .../tgbotapi/extensions/utils/extensions/raw/ChatJoinRequest.kt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54770ac159..525f18441c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * `Utils`: * Rename `UserId` extension `link` to `userLink` +* `Core` + * `ChatJoinRequest#inviteLink` is nullable due to the fact that join requests without link do not require invite link ## 2.1.2 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt index 25af5c9e36..738e95adc6 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt @@ -18,7 +18,7 @@ data class ChatJoinRequest( @SerialName(dateField) val date: TelegramDate, @SerialName(inviteLinkField) - val inviteLink: ChatInviteLink, + val inviteLink: ChatInviteLink? = null, @SerialName(bioField) val bio: String? = null ) : FromUser { diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/ChatJoinRequest.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/ChatJoinRequest.kt index 0a30d062d3..3ddb0f9da1 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/ChatJoinRequest.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/ChatJoinRequest.kt @@ -5,5 +5,5 @@ import dev.inmo.tgbotapi.types.chat.ChatJoinRequest import dev.inmo.tgbotapi.utils.RiskFeature @RiskFeature(RawFieldsUsageWarning) -val ChatJoinRequest.invite_link: ChatInviteLink +val ChatJoinRequest.invite_link: ChatInviteLink? get() = inviteLink From e7340a483a5e5d7e9f5aae371e0d4ec60c476468 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 9 Jul 2022 23:45:24 +0600 Subject: [PATCH 4/5] fixes --- .../commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt | 2 +- .../kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt index 967e81d54a..69044c875b 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt @@ -44,7 +44,7 @@ val User.link: String */ @Deprecated("Renamed", ReplaceWith("userLink", "dev.inmo.tgbotapi.types.userLink")) val Identifier.link: String - get() = "$internalLinkBeginning/tg://user?id=$this" + get() = "tg://user?id=$this" /** * https://core.telegram.org/bots/api#formatting-options */ diff --git a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt index a90efac2c1..004de4dc0f 100644 --- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt +++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/ChatIdentifierTests.kt @@ -28,7 +28,7 @@ class ChatIdentifierTests { @Test fun `Creating_link_from_ChatId_is_correct`() { val chatId = chatIdentifierChatId.toChatId() - assertEquals(chatIdentifierLink, chatId.link) + assertEquals(chatIdentifierLink, chatId.userLink) } @Test From ade236eaa34ae61fac8804593fa7bb0b43f77089 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 9 Jul 2022 23:52:16 +0600 Subject: [PATCH 5/5] update microutils --- CHANGELOG.md | 8 +++++--- gradle/libs.versions.toml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 525f18441c..25d5ad3bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 2.1.3 +* `Versions`: + * `MicroUtils`: `0.11.9` -> `0.11.12` * `Utils`: * Rename `UserId` extension `link` to `userLink` * `Core` @@ -10,9 +12,9 @@ ## 2.1.2 * `Versions`: - * `Coroutines`: `1.6.1` -> `1.6.3` - * `Ktor`: `2.0.2` -> `2.0.3` - * `MicroUtils`: `0.11.6` -> `0.11.9` + * `Coroutines`: `1.6.1` -> `1.6.3` + * `Ktor`: `2.0.2` -> `2.0.3` + * `MicroUtils`: `0.11.6` -> `0.11.9` ## 2.1.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 055ce188e3..9db6193ec4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ korlibs = "2.7.0" uuid = "0.4.1" ktor = "2.0.3" -microutils = "0.11.9" +microutils = "0.11.12" github-release-plugin = "2.4.1"