mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2024-11-26 03:58:44 +00:00
improve makeLinkToMessage
This commit is contained in:
parent
5fe8cf948a
commit
f71ac51461
@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
## 4.2.1
|
## 4.2.1
|
||||||
|
|
||||||
|
* `Utils`:
|
||||||
|
* Improve support of `makeLinkToMessage` extensions
|
||||||
|
|
||||||
## 4.2.0
|
## 4.2.0
|
||||||
|
|
||||||
* `Versions`:
|
* `Versions`:
|
||||||
|
@ -24,22 +24,34 @@ inline fun makeDeepLink(username: Username, startParameter: String) = makeTelegr
|
|||||||
inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
|
inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
|
||||||
inline fun makeTelegramStartattach(username: Username, data: String? = null) = makeTelegramStartattach(username.usernameWithoutAt, data)
|
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 linkIdRedundantPartRegex = Regex("^-100")
|
||||||
private val usernameBeginSymbolRegex = Regex("^@")
|
private val usernameBeginSymbolRegex = Regex("^@")
|
||||||
|
|
||||||
|
fun makeLinkToMessage(
|
||||||
|
username: String,
|
||||||
|
messageId: MessageId,
|
||||||
|
threadId: MessageThreadId? = null
|
||||||
|
): String = "$internalLinkBeginning/${username.replace(usernameBeginSymbolRegex, "")}/${threadId ?.let { "$it/" } ?: ""}$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
|
* 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)
|
* known way to build link (for [PrivateChat]s, for example)
|
||||||
@ -49,16 +61,10 @@ fun makeLinkToMessage(
|
|||||||
messageId: MessageId
|
messageId: MessageId
|
||||||
): String? {
|
): String? {
|
||||||
return when {
|
return when {
|
||||||
chat is UsernameChat && chat.username != null -> {
|
chat is UsernameChat && chat.username != null -> chat.username ?.let {
|
||||||
"$internalLinkBeginning/${chat.username ?.username ?.replace(
|
makeLinkToMessage(it, messageId, chat.id.threadId)
|
||||||
usernameBeginSymbolRegex, "")}/$messageId"
|
} ?: makeLinkToMessage(chat.id, messageId)
|
||||||
}
|
chat !is PrivateChat -> makeLinkToMessage(chat.id, messageId)
|
||||||
chat !is PrivateChat -> chat.id.chatId.toString().replace(
|
|
||||||
linkIdRedundantPartRegex,
|
|
||||||
""
|
|
||||||
).let { bareId ->
|
|
||||||
"$internalLinkBeginning/c/$bareId/$messageId"
|
|
||||||
}
|
|
||||||
else -> return null
|
else -> return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user