From 10c52c695c4bf58d5270b1049b0f948d9ee3ae6b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Feb 2022 22:54:41 +0600 Subject: [PATCH 1/5] start 0.38.6 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a9dec1e68..e3e97c743f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 0.38.6 + ## 0.38.5 * `Common`: diff --git a/gradle.properties b/gradle.properties index 3e281dc024..d9edf72bca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,6 @@ javax_activation_version=1.1.1 dokka_version=1.6.10 library_group=dev.inmo -library_version=0.38.5 +library_version=0.38.6 github_release_plugin_version=2.2.12 From 4f0de376abb214ec21053e6c1f6aad781fecced6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Feb 2022 23:02:58 +0600 Subject: [PATCH 2/5] MentionTextSource#username --- CHANGELOG.md | 3 +++ .../types/MessageEntity/textsources/MentionTextSource.kt | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3e97c743f..49be0747ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.38.6 +* `Core`: + * New member of `MentionTextSource` - `username` + ## 0.38.5 * `Common`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt index 471c316a28..b0a5d8db3f 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt @@ -1,5 +1,6 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources +import dev.inmo.tgbotapi.types.Username import dev.inmo.tgbotapi.utils.RiskFeature import dev.inmo.tgbotapi.utils.extensions.makeString import dev.inmo.tgbotapi.utils.internal.* @@ -23,6 +24,7 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo override val markdown: String by lazy { source.mentionMarkdown() } override val markdownV2: String by lazy { mentionMarkdownV2() } override val html: String by lazy { mentionHTML() } + val username: Username = Username(source) init { if (!source.startsWith("@")) { @@ -42,3 +44,6 @@ inline fun mention(vararg parts: TextSource) = mention(parts.toList()) @Suppress("NOTHING_TO_INLINE") inline fun mention(whoToMention: String) = mention(regular(whoToMention)) +@Suppress("NOTHING_TO_INLINE") +inline fun mention(whoToMention: Username) = mention(whoToMention.username.dropWhile { it == '@' }) + From 70e6dc8fc9bb321a6c9d8fcfadb009f07da450db Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Feb 2022 23:07:30 +0600 Subject: [PATCH 3/5] update dependencies --- CHANGELOG.md | 4 ++++ gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49be0747ed..28feffeebf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.38.6 +* `Common`: + * `Version`: + * `MicroUtils`: `0.9.6` -> `0.9.8` + * `Klock`: `2.4.13` -> `2.5.1` * `Core`: * New member of `MentionTextSource` - `username` diff --git a/gradle.properties b/gradle.properties index d9edf72bca..6c96cd5f11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,11 +8,11 @@ kotlin.incremental.js=true kotlin_version=1.6.10 kotlin_coroutines_version=1.6.0 kotlin_serialisation_runtime_version=1.3.2 -klock_version=2.4.13 +klock_version=2.5.1 uuid_version=0.4.0 ktor_version=1.6.7 -micro_utils_version=0.9.6 +micro_utils_version=0.9.8 javax_activation_version=1.1.1 From 35b20d102c5087d1ef6699e8eb54450d509b417b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 26 Feb 2022 22:01:41 +0600 Subject: [PATCH 4/5] Update gradle.properties --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6c96cd5f11..00382e11b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,11 +8,11 @@ kotlin.incremental.js=true kotlin_version=1.6.10 kotlin_coroutines_version=1.6.0 kotlin_serialisation_runtime_version=1.3.2 -klock_version=2.5.1 +klock_version=2.5.2 uuid_version=0.4.0 ktor_version=1.6.7 -micro_utils_version=0.9.8 +micro_utils_version=0.9.9 javax_activation_version=1.1.1 From 3c1f8421c9e660c99149251349b390a8c1624c30 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 27 Feb 2022 10:04:28 +0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28feffeebf..c5f2afa8cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ * `Common`: * `Version`: - * `MicroUtils`: `0.9.6` -> `0.9.8` - * `Klock`: `2.4.13` -> `2.5.1` + * `MicroUtils`: `0.9.6` -> `0.9.9` + * `Klock`: `2.4.13` -> `2.5.2` * `Core`: * New member of `MentionTextSource` - `username`