Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed #839

This commit is contained in:
Mariotaku Lee 2017-05-17 14:56:41 +08:00
parent 278c9f6a4b
commit ec46ad3926
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/StatusExtensions.kt
View File

@ -105,7 +105,8 @@ fun Status.applyTo(accountKey: UserKey, result: ParcelableStatus) {
result.is_possibly_sensitive = status.isSensitive result.is_possibly_sensitive = status.isSensitive
result.mentions = status.mentions?.mapToArray { it.toParcelable(accountKey) } result.mentions = status.mentions?.mapToArray { it.toParcelable(accountKey) }
extras.display_text_range = calculateDisplayTextRange(result.spans, result.media) extras.display_text_range = calculateDisplayTextRange(result.text_unescaped, result.spans,
result.media)
// Try to complete mastodon `in_reply_to` info // Try to complete mastodon `in_reply_to` info
val inReplyToMention = result.mentions?.firstOrNull { val inReplyToMention = result.mentions?.firstOrNull {
@ -122,9 +123,10 @@ fun Status.applyTo(accountKey: UserKey, result: ParcelableStatus) {
result.extras = extras result.extras = extras
} }
private fun calculateDisplayTextRange(spans: Array<SpanItem>?, media: Array<ParcelableMedia>?): IntArray? { private fun calculateDisplayTextRange(text: String, spans: Array<SpanItem>?, media: Array<ParcelableMedia>?): IntArray? {
if (spans == null || media == null) return null if (spans == null || media == null) return null
val lastMatch = spans.lastOrNull { span -> media.any { span.link == it.page_url } } ?: return null val lastMatch = spans.lastOrNull { span -> media.any { span.link == it.page_url } } ?: return null
if (lastMatch.end < text.length) return null
return intArrayOf(0, lastMatch.start) return intArrayOf(0, lastMatch.start)
} }