mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-05 16:59:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

This is a more conservative fix for #328 (#462) close #328

Browse source 
Having checked the markdown -> attributedtext conversion, lots of things I was escaping before are actually ingored.

This change only escapes things that are definitely rendered and as far as I can tell doesn't break anything now.

Test post to look at with maximal Markdown: https://mas.to/@elbrux/109743775703438333
This commit is contained in:
Gareth Simpson 2023-01-28 08:01:37 +00:00 committed by GitHub
parent 525321cfa4
commit 1983ae0f48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Packages/Models/Sources/Models/Alias/HTMLString.swift
View file

@ -4,7 +4,7 @@ import SwiftSoup
import SwiftUI
public struct HTMLString: Decodable, Equatable, Hashable {
public let htmlValue: String
public var htmlValue: String
public let asMarkdown: String
public let asRawText: String
public let statusesURLs: [URL]
@ -18,6 +18,15 @@ public struct HTMLString: Decodable, Equatable, Hashable {
htmlValue = ""
}
// https://daringfireball.net/projects/markdown/syntax
// HTML2Markdown only auto escapes * on the way out
// so we pre-escape \ ` _ and [ as these are the only
// other characters the markdown parser used picks up
// when it renders to attributed text
if let regex = try? NSRegularExpression(pattern: "([\\_\\`\\[\\\\])", options: .caseInsensitive) {
htmlValue = regex.stringByReplacingMatches(in: htmlValue, options: [], range: NSRange(location: 0, length: htmlValue.count), withTemplate: "\\\\$1")
}
do {
asMarkdown = try HTMLParser().parse(html: htmlValue)
.toMarkdown()