InsanusMokrassar
/
tgbotapi
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git
1
0
Fork 0
Code Releases Activity

small refactoring

This commit is contained in:
InsanusMokrassar 2023-08-31 19:35:01 +06:00
parent 64244a60fe
commit 21f5808b12
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,25 +19,26 @@ internal data class RawMessageEntity(
offset until (offset + length) offset until (offset + length)
} }
val weight by lazy { val priority by lazy {
when (type) { when (type) {
"mention" -> 2 // Types with potential subsources should have priority
"hashtag" -> 2 "mention" -> 0
"cashtag" -> 2 "hashtag" -> 0
"cashtag" -> 0
"email" -> 0
"phone_number" -> 0
"bold" -> 0
"italic" -> 0
"text_mention" -> 0
"strikethrough" -> 0
"underline" -> 0
"spoiler" -> 0
"custom_emoji" -> 0
"bot_command" -> 1 "bot_command" -> 1
"url" -> 1 "url" -> 1
"email" -> 2
"phone_number" -> 2
"bold" -> 2
"italic" -> 2
"code" -> 1 "code" -> 1
"pre" -> 1 "pre" -> 1
"text_link" -> 1 "text_link" -> 1
"text_mention" -> 2
"underline" -> 2
"strikethrough" -> 2
"spoiler" -> 2
"custom_emoji" -> 2
else -> 1 else -> 1
} }
} }
@ -109,7 +110,7 @@ private fun createTextSources(
entities: RawMessageEntities entities: RawMessageEntities
): List<Pair<Int, TextSource>> { ): List<Pair<Int, TextSource>> {
val mutableEntities = entities.toMutableList().apply { val mutableEntities = entities.toMutableList().apply {
sortByDescending { it.weight } sortBy { it.priority } // sorting to fix potential issues in source sorting of entities
sortBy { it.offset } sortBy { it.offset }
} }
val resultList = mutableListOf<Pair<Int, TextSource>>() val resultList = mutableListOf<Pair<Int, TextSource>>()