Merge pull request #532 from InsanusMokrassar/0.38.5

0.38.5

CHANGELOG.md

@@ -1,5 +1,18 @@
 # TelegramBotAPI changelog
 
+## 0.38.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.5` -> `0.9.6`
+* `Core`:
+    * `Username` got new property `usernameWithoutAt` which will return `username` without leading `@`
+* `Utils`:
+    * Several new functions for working with deep links:
+        * `makeUsernameDeepLinkPrefix`
+        * `makeTelegramDeepLink`
+        * `makeDeepLink`
+
 ## 0.38.4
 
 __This update contains including of [Telegram Bot API 5.7](https://core.telegram.org/bots/api-changelog#january-31-2022)__

gradle.properties

@@ -12,7 +12,7 @@ klock_version=2.4.13
 uuid_version=0.4.0
 ktor_version=1.6.7
 
-micro_utils_version=0.9.5
+micro_utils_version=0.9.6
 
 javax_activation_version=1.1.1
 
@@ -20,6 +20,6 @@ javax_activation_version=1.1.1
 dokka_version=1.6.10
 
 library_group=dev.inmo
-library_version=0.38.4
+library_version=0.38.5
 
 github_release_plugin_version=2.2.12

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

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

@@ -46,6 +46,9 @@ fun Byte.toChatId(): ChatId = toLong().toChatId()
 data class Username(
     val username: String
 ) : ChatIdentifier() {
+    val usernameWithoutAt
+        get() = username.dropWhile { it == '@' }
+
     init {
         if (!username.startsWith("@")) {
             throw IllegalArgumentException("Username must starts with `@`")

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

@@ -9,9 +9,15 @@ 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
-    get() = makeUsernameLink(username)
+    get() = makeUsernameLink(usernameWithoutAt)
+inline val Username.deepLinkPrefix
+    get() = makeUsernameDeepLinkPrefix(usernameWithoutAt)
 inline fun makeLink(username: Username) = username.link
+inline fun makeTelegramDeepLink(username: String, startParameter: String) = "${makeUsernameDeepLinkPrefix(username)}$startParameter"
+inline fun makeDeepLink(username: Username, startParameter: String) = "${username.deepLinkPrefix}$startParameter"
+inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
 
 fun makeLinkToMessage(
     username: String,