Merge pull request #4910 from wikimedia/hmtl-bugs

Update HtmlUtils to handle apostrophes and ampersands regression bugs
wikimedia · Aug 1, 2024 · 6ec97db · 6ec97db
2 parents 8dda5f1 + 276a415
commit 6ec97db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Components/Sources/Components/Utility/HTMLUtils.swift b/Components/Sources/Components/Utility/HTMLUtils.swift
@@ -402,11 +402,15 @@ public struct HtmlUtils {
         }
     }
 
-
     public static func stringFromHTML(_ string: String) throws -> String {
         let regex = try htmlTagRegex()
         let cleanString = regex.stringByReplacingMatches(in: string, options: [], range: string.fullNSRange, withTemplate: "")
-        return cleanString
+        let entityReplaceData = try entityReplaceData(html: cleanString)
+            let mutableCleanString = NSMutableString(string: cleanString)
+            for data in entityReplaceData {
+                mutableCleanString.replaceCharacters(in: data.range, with: data.replaceText)
+            }
+            return mutableCleanString as String
     }
 
     // MARK: - Shared - Private
@@ -644,7 +648,7 @@ public struct HtmlUtils {
                 replaceText = ">"
             case "&lt;":
                 replaceText = "<"
-            case "&apos;":
+            case "&apos;", "&#039;":
                 replaceText = "'"
             case "&quot;":
                 replaceText = "\""

diff --git a/Widgets/Widgets/FeaturedArticleWidget.swift b/Widgets/Widgets/FeaturedArticleWidget.swift
@@ -40,9 +40,9 @@ struct FeaturedArticleEntry: TimelineEntry {
 		return content?.languageCode
 	}
 
-	var title: String {
-		return (content?.displayTitle as NSString?)?.wmf_stringByRemovingHTML() ?? ""
-	}
+    var title: String {
+        return content?.displayTitle.removingHTML ?? ""
+    }
 
 	var description: String {
 		return content?.description ?? ""