From d84ed6068f45fe9642a4a995444b061418495167 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Fri, 10 Apr 2020 16:02:49 -0500 Subject: [PATCH] Add a convenience initializer for attributed strings from an html string --- .../Timeline/Cell/NSAttributedString+NetNewsWire.swift | 5 +++++ Shared/Extensions/ArticleStringFormatter.swift | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift index 6c57c2e83..28a5d89df 100644 --- a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift +++ b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift @@ -81,4 +81,9 @@ extension NSAttributedString { return mutable.copy() as! NSAttributedString } + convenience init(html: String) { + let data = html.data(using: .utf8)! + self.init(html: data, options: [.characterEncoding: String.Encoding.utf8.rawValue], documentAttributes: nil)! + } + } diff --git a/Shared/Extensions/ArticleStringFormatter.swift b/Shared/Extensions/ArticleStringFormatter.swift index 731db43f2..dac926b34 100644 --- a/Shared/Extensions/ArticleStringFormatter.swift +++ b/Shared/Extensions/ArticleStringFormatter.swift @@ -85,8 +85,7 @@ struct ArticleStringFormatter { static func attributedTruncatedTitle(_ article: Article) -> NSAttributedString { let title = truncatedTitle(article, forHTML: true) - let data = title.data(using: .utf8)! - let attributed = NSAttributedString(html: data, options: [.characterEncoding: String.Encoding.utf8.rawValue], documentAttributes: nil)! + let attributed = NSAttributedString(html: title) return attributed }