Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/status-parser' into release/0.6.1

This commit is contained in:
CMK 2021-06-15 17:39:44 +08:00
parent c6514dcdbb d7bfe5fb81
commit e70c1a6586
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mastodon/Helper/MastodonStatusContent.swift
View File

@ -17,7 +17,6 @@ enum MastodonStatusContent {
static func parse(content: String, emojiDict: EmojiDict) throws -> MastodonStatusContent.ParseResult { static func parse(content: String, emojiDict: EmojiDict) throws -> MastodonStatusContent.ParseResult {
let document: String = { let document: String = {
var content = content var content = content
content = content.replacingOccurrences(of: "<br/>", with: "\n")
for (shortcode, url) in emojiDict { for (shortcode, url) in emojiDict {
let emojiNode = "<span class=\"emoji\" href=\"\(url.absoluteString)\">\(shortcode)</span>" let emojiNode = "<span class=\"emoji\" href=\"\(url.absoluteString)\">\(shortcode)</span>"
let pattern = ":\(shortcode):" let pattern = ":\(shortcode):"
@ -189,6 +188,14 @@ extension MastodonStatusContent {
static func parse(document: String) throws -> MastodonStatusContent.Node { static func parse(document: String) throws -> MastodonStatusContent.Node {
let html = try HTML(html: document, encoding: .utf8) let html = try HTML(html: document, encoding: .utf8)
// add `\r\n` explicit due to Kanna text missing it after convert to text
// ref: https://github.com/tid-kijyun/Kanna/issues/150
let brNodes = html.css("br").makeIterator()
while let brNode = brNodes.next() {
brNode.addNextSibling(try! HTML(html: "<span>\r\n</span>", encoding: .utf8).body!)
}
let body = html.body ?? nil let body = html.body ?? nil
let text = body?.text ?? "" let text = body?.text ?? ""
let level = 0 let level = 0