FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace raw with repaired links. Fixes #3103

This commit is contained in:
Duncan Babbage 2021-09-30 16:46:11 +13:00
parent cc855f3832
commit f6552e110d
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/MainWindow/MainWindowController.swift
View File

@ -318,7 +318,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
}
@IBAction func copyExternalURL(_ sender: Any?) {
if let link = oneSelectedArticle?.rawExternalLink {
if let link = oneSelectedArticle?.externalLink {
URLPasteboardWriter.write(urlString: link, to: .general)
}
}
@ -1077,7 +1077,7 @@ private extension MainWindowController {
}
func canCopyExternalURL() -> Bool {
return oneSelectedArticle?.rawExternalLink != nil && oneSelectedArticle?.rawExternalLink != currentLink
return oneSelectedArticle?.externalLink != nil && oneSelectedArticle?.externalLink != currentLink
}
func canGoToNextUnread(wrappingToTop wrapping: Bool = false) -> Bool {

6
Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
View File

@ -87,11 +87,11 @@ private extension ArticlePasteboardWriter {
s += "\(convertedHTML)\n\n"
}
if let rawLink = article.rawLink {
if let link = article.link {
s += "URL: \(rawLink)\n\n"
}
if let rawExternalLink = article.rawExternalLink {
s += "external URL: \(rawExternalLink)\n\n"
if let externalLink = article.externalLink {
s += "external URL: \(externalLink)\n\n"
}
s += "Date: \(article.logicalDatePublished)\n\n"

2
Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift
View File

@ -178,7 +178,7 @@ private extension TimelineViewController {
menu.addSeparatorIfNeeded()
menu.addItem(copyArticleURLMenuItem(link))
if let externalLink = articles.first?.rawExternalLink, externalLink != link {
if let externalLink = articles.first?.externalLink, externalLink != link {
menu.addItem(copyExternalURLMenuItem(externalLink))
}
}

8
Mac/Scriptability/Article+Scriptability.swift
View File

@ -57,17 +57,17 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
@objc(url)
var url:String? {
return article.rawLink ?? article.rawExternalLink
return article.preferredLink
}
@objc(permalink)
var permalink:String? {
return article.rawLink
return article.link
}
@objc(externalUrl)
var externalUrl:String? {
return article.rawExternalLink
return article.externalLink
}
@objc(title)
@ -132,7 +132,7 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
@objc(imageURL)
var imageURL:String {
return article.rawImageLink ?? ""
return article.imageLink ?? ""
}
@objc(authors)

4
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -209,7 +209,7 @@ private extension ArticleRenderer {
d["title"] = title
d["preferred_link"] = article.preferredLink ?? ""
if let externalLink = article.rawExternalLink, externalLink != article.preferredLink {
if let externalLink = article.externalLink, externalLink != article.preferredLink {
d["external_link_label"] = NSLocalizedString("Link:", comment: "Link")
d["external_link_stripped"] = externalLink.strippingHTTPOrHTTPSScheme
d["external_link"] = externalLink
@ -331,7 +331,7 @@ private extension ArticleRenderer {
private extension Article {
var baseURL: URL? {
var s = rawLink
var s = link
if s == nil {
s = webFeed?.homePageURL
}

2
Shared/ExtensionPoints/SendToMarsEditCommand.swift
View File

@ -75,7 +75,7 @@ private extension SendToMarsEditCommand {
let body = article.contentHTML ?? article.contentText ?? article.summary
let authorName = article.authors?.first?.name
let sender = SendToBlogEditorApp(targetDescriptor: targetDescriptor, title: article.title, body: body, summary: article.summary, link: article.rawExternalLink, permalink: article.rawLink, subject: nil, creator: authorName, commentsURL: nil, guid: article.uniqueID, sourceName: article.webFeed?.nameForDisplay, sourceHomeURL: article.webFeed?.homePageURL, sourceFeedURL: article.webFeed?.url)
let sender = SendToBlogEditorApp(targetDescriptor: targetDescriptor, title: article.title, body: body, summary: article.summary, link: article.externalLink, permalink: article.link, subject: nil, creator: authorName, commentsURL: nil, guid: article.uniqueID, sourceName: article.webFeed?.nameForDisplay, sourceHomeURL: article.webFeed?.homePageURL, sourceFeedURL: article.webFeed?.url)
let _ = sender.send()
}

4
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -739,7 +739,7 @@ private extension MasterTimelineViewController {
}
func featuredImageFor(_ article: Article) -> UIImage? {
if let url = article.rawImageLink, let data = appDelegate.imageDownloader.image(for: url) {
if let link = article.imageLink, let data = appDelegate.imageDownloader.image(for: link) {
return RSImage(data: data)
}
return nil
@ -924,7 +924,7 @@ private extension MasterTimelineViewController {
}
func copyExternalURLAction(_ article: Article) -> UIAction? {
guard let externalLink = article.rawExternalLink, externalLink != article.preferredLink, let url = URL(string: externalLink) else { return nil }
guard let externalLink = article.externalLink, externalLink != article.preferredLink, let url = URL(string: externalLink) else { return nil }
let title = NSLocalizedString("Copy External URL", comment: "Copy External URL")
let action = UIAction(title: title, image: AppAssets.copyImage) { action in
UIPasteboard.general.url = url