mirror of
https://github.com/Ranchero-Software/NetNewsWire.git
synced 2025-01-31 19:24:55 +01:00
Use percent-encoding — via URLComponents — on the articleID in the nnwImageIcon URL scheme.
This commit is contained in:
parent
f1e01e06fc
commit
cac67f8ac4
@ -140,7 +140,16 @@ private extension ArticleRenderer {
|
|||||||
d["title"] = title
|
d["title"] = title
|
||||||
|
|
||||||
d["body"] = body
|
d["body"] = body
|
||||||
d["avatars"] = "<td class=\"header rightAlign avatar\"><img id=\"nnwImageIcon\" src=\"\(ArticleRenderer.imageIconScheme)://\(article.articleID)\" height=48 width=48 /></td>";
|
|
||||||
|
var components = URLComponents()
|
||||||
|
components.scheme = Self.imageIconScheme
|
||||||
|
components.path = article.articleID
|
||||||
|
if let imageIconURLString = components.string {
|
||||||
|
d["avatars"] = "<td class=\"header rightAlign avatar\"><img id=\"nnwImageIcon\" src=\"\(imageIconURLString)\" height=48 width=48 /></td>"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
d["avatars"] = ""
|
||||||
|
}
|
||||||
|
|
||||||
var feedLink = ""
|
var feedLink = ""
|
||||||
if let feedTitle = article.webFeed?.nameForDisplay {
|
if let feedTitle = article.webFeed?.nameForDisplay {
|
||||||
|
@ -25,8 +25,10 @@ class ArticleIconSchemeHandler: NSObject, WKURLSchemeHandler {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let articleID = url.absoluteString.stripping(prefix: "\(ArticleRenderer.imageIconScheme)://")
|
guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let articleID = components.path
|
||||||
guard let iconImage = coordinator.articleFor(articleID)?.iconImage() else {
|
guard let iconImage = coordinator.articleFor(articleID)?.iconImage() else {
|
||||||
urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
|
urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user