renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continue renaming webFeed to feed.

Browse Source
This commit is contained in:
Brent Simmons
2024-11-01 21:58:47 -07:00
parent acabaf8f94
commit fac4eded60
32 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Shared/Extensions/AddWebFeedDefaultContainer.swift → Shared/Extensions/AddFeedDefaultContainer.swift
View File

@@ -9,12 +9,12 @@
import Foundation
import Account
struct AddWebFeedDefaultContainer {
struct AddFeedDefaultContainer {
static var defaultContainer: Container? {
if let accountID = AppDefaults.shared.addWebFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) {
if let accountID = AppDefaults.shared.addFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) {
return folder
} else {
return substituteContainerIfNeeded(account: account)
@@ -28,11 +28,11 @@ struct AddWebFeedDefaultContainer {
}
static func saveDefaultContainer(_ container: Container) {
AppDefaults.shared.addWebFeedAccountID = container.account?.accountID
AppDefaults.shared.addFeedAccountID = container.account?.accountID
if let folder = container as? Folder {
AppDefaults.shared.addWebFeedFolderName = folder.nameForDisplay
AppDefaults.shared.addFeedFolderName = folder.nameForDisplay
} else {
AppDefaults.shared.addWebFeedFolderName = nil
AppDefaults.shared.addFeedFolderName = nil
}
}

8
Shared/Extensions/ArticleUtilities.swift
View File

@@ -42,7 +42,7 @@ private func accountAndArticlesDictionary(_ articles: Set<Article>) -> [String:
extension Article {
var webFeed: Feed? {
var feed: Feed? {
return account?.existingWebFeed(withWebFeedID: webFeedID)
}
@@ -139,7 +139,7 @@ extension Article {
}
func byline() -> String {
guard let authors = authors ?? webFeed?.authors, !authors.isEmpty else {
guard let authors = authors ?? feed?.authors, !authors.isEmpty else {
return ""
}
@@ -147,7 +147,7 @@ extension Article {
// This code assumes that multiple authors would never match the feed name so that
// if there feed owner has an article co-author all authors are given the byline.
if authors.count == 1, let author = authors.first {
if author.name == webFeed?.nameForDisplay {
if author.name == feed?.nameForDisplay {
return ""
}
}
@@ -215,7 +215,7 @@ extension Article {
extension Article: SortableArticle {
var sortableName: String {
return webFeed?.name ?? ""
return feed?.name ?? ""
}
var sortableDate: Date {