FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix emoji unicode adjustment bug and made emoji detection more efficient

Browse Source
This commit is contained in:
Maurice Parker 2020-04-21 01:26:58 -05:00
parent 77fa966a23
commit 0369bc5a45
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Frameworks/Account/FeedProvider/Twitter/TwitterStatus.swift
View File

@ -78,21 +78,21 @@ private extension TwitterStatus {
var html = String()
var prevIndex = displayStartIndex
var emojiOffset = 0
for entity in entities {
// The twitter indices are messed up by emoji with more than one scalar, we are trying to adjust for that here.
var offset = 0
// The twitter indices are messed up by emoji with more than one scalar, we are going to adjust for that here.
let emojiEndIndex = text.index(text.startIndex, offsetBy: entity.endIndex, limitedBy: text.endIndex) ?? text.endIndex
if text.startIndex < prevIndex {
let emojis = String(text[text.startIndex..<emojiEndIndex]).emojis
if prevIndex < emojiEndIndex {
let emojis = String(text[prevIndex..<emojiEndIndex]).emojis
for emoji in emojis {
offset += emoji.unicodeScalars.count - 1
emojiOffset += emoji.unicodeScalars.count - 1
}
}
let offsetStartIndex = entity.startIndex - offset
let offsetEndIndex = entity.endIndex - offset
let offsetStartIndex = entity.startIndex - emojiOffset
let offsetEndIndex = entity.endIndex - emojiOffset
let entityStartIndex = text.index(text.startIndex, offsetBy: offsetStartIndex, limitedBy: text.endIndex) ?? text.startIndex
let entityEndIndex = text.index(text.startIndex, offsetBy: offsetEndIndex, limitedBy: text.endIndex) ?? text.endIndex