Resolve escaped characters in a status (#2071)

* Resolve escaped characters in a status Escaped characters are now returned to their original form for HTMLString.asRawText. * Unescape the markdown version too The HTMLString.asMarkdown string is now also unescaped, & and similar are resolved. * Fix a internal fallback If one of the unescape(...) commands fails, the original, unescaped text is used instead of an empty string.
Dimillian · May 13, 2024 · 7caf00d · 7caf00d
1 parent 6ed760a
commit 7caf00d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Packages/Models/Sources/Models/Alias/HTMLString.swift b/Packages/Models/Sources/Models/Alias/HTMLString.swift
@@ -61,7 +61,7 @@ public struct HTMLString: Codable, Equatable, Hashable, @unchecked Sendable {
           _ = text.removeLast()
           _ = text.removeLast()
         }
-        asRawText = text
+        asRawText = (try? Entities.unescape(text)) ?? text
 
         if asMarkdown.hasPrefix("\n") {
           _ = asMarkdown.removeFirst()
@@ -175,7 +175,9 @@ public struct HTMLString: Codable, Equatable, Hashable, @unchecked Sendable {
         return
       } else if node.nodeName() == "#text" {
         var txt = node.description
-
+
+        txt = (try? Entities.unescape(txt)) ?? txt
+
         if let underscore_regex, let main_regex {
           //  This is the markdown escaper
           txt = main_regex.stringByReplacingMatches(in: txt, options: [], range: NSRange(location: 0, length: txt.count), withTemplate: "\\\\$1")