InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-11-22 08:13:47 +00:00
Code Releases Activity

potential fix of incorrect parsing in 'RawMessageEntity'

Browse Source
This commit is contained in:
InsanusMokrassar 2023-08-31 19:20:42 +06:00
parent 4cd7fdb436
commit 64244a60fe
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## 9.1.1
* `Core`:
* Potential fix of incorrect parsing in `RawMessageEntity`
## 9.1.0
**This update contains adding of [Telegram Bot API 6.8](https://core.telegram.org/bots/api-changelog#august-18-2023) support**

28
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessageEntity.kt
View File

@ -18,6 +18,29 @@ internal data class RawMessageEntity(
internal val range by lazy {
offset until (offset + length)
}
val weight by lazy {
when (type) {
"mention" -> 2
"hashtag" -> 2
"cashtag" -> 2
"bot_command" -> 1
"url" -> 1
"email" -> 2
"phone_number" -> 2
"bold" -> 2
"italic" -> 2
"code" -> 1
"pre" -> 1
"text_link" -> 1
"text_mention" -> 2
"underline" -> 2
"strikethrough" -> 2
"spoiler" -> 2
"custom_emoji" -> 2
else -> 1
}
}
}
internal fun RawMessageEntity.asTextSource(
@ -85,7 +108,10 @@ private fun createTextSources(
originalFullString: String,
entities: RawMessageEntities
): List<Pair<Int, TextSource>> {
val mutableEntities = entities.toMutableList().apply { sortBy { it.offset } }
val mutableEntities = entities.toMutableList().apply {
sortByDescending { it.weight }
sortBy { it.offset }
}
val resultList = mutableListOf<Pair<Int, TextSource>>()
while (mutableEntities.isNotEmpty()) {