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

Fix custom emoji with underscores (#687)

Browse source 
* Potential fix

* explainer :)
This commit is contained in:
Gareth Simpson 2023-02-07 06:06:30 +00:00 committed by GitHub
parent 6aa01e295b
commit 7ef4b8eda7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,8 +13,8 @@ public struct HTMLString: Codable, Equatable, Hashable {
public var statusesURLs = [URL]() public var statusesURLs = [URL]()
public var asSafeMarkdownAttributedString: AttributedString = .init() public var asSafeMarkdownAttributedString: AttributedString = .init()
private var regex: NSRegularExpression? private var main_regex: NSRegularExpression?
private var underscore_regex: NSRegularExpression?
public init(from decoder: Decoder) { public init(from decoder: Decoder) {
var alreadyDecoded: Bool = false var alreadyDecoded: Bool = false
do { do {
@ -38,7 +38,9 @@ public struct HTMLString: Codable, Equatable, Hashable {
// Pre-escape \ ` _ * and [ as these are the only // Pre-escape \ ` _ * and [ as these are the only
// characters the markdown parser used picks up // characters the markdown parser used picks up
// when it renders to attributed text // when it renders to attributed text
regex = try? NSRegularExpression(pattern: "([\\_\\*\\`\\[\\\\])", options: .caseInsensitive) main_regex = try? NSRegularExpression(pattern: "([\\*\\`\\[\\\\])", options: .caseInsensitive)
// don't escape underscores that are between colons, they are most likely custom emoji
underscore_regex = try? NSRegularExpression(pattern: "(?!\\B:[^:]*)(_)(?![^:]*:\\B)", options: .caseInsensitive)
asMarkdown = "" asMarkdown = ""
do { do {
@ -150,9 +152,10 @@ public struct HTMLString: Codable, Equatable, Hashable {
} else if node.nodeName() == "#text" { } else if node.nodeName() == "#text" {
var txt = node.description var txt = node.description
if let regex { if let underscore_regex, let main_regex {
// This is the markdown escaper // This is the markdown escaper
txt = regex.stringByReplacingMatches(in: txt, options: [], range: NSRange(location: 0, length: txt.count), withTemplate: "\\\\$1") txt = main_regex.stringByReplacingMatches(in: txt, options: [], range: NSRange(location: 0, length: txt.count), withTemplate: "\\\\$1")
txt = underscore_regex.stringByReplacingMatches(in: txt, options: [], range: NSRange(location: 0, length: txt.count), withTemplate: "\\\\$1")
} }
asMarkdown += txt asMarkdown += txt