From 2afdd26c9d520470bc8fa3c54869ee02e99a22c3 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 29 Mar 2020 12:00:02 -0500 Subject: [PATCH] Change function names using the find suffix to use the existing suffix to match precedent. --- Frameworks/Account/Account.swift | 2 +- Frameworks/Account/AccountManager.swift | 2 +- Mac/MainWindow/Timeline/TimelineViewController.swift | 2 +- Shared/Data/AddWebFeedDefaultContainer.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 103140166..4ecc12369 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -516,7 +516,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, return ensureFolder(with: folderName) } - public func findFolder(withDisplayName displayName: String) -> Folder? { + public func existingFolder(withDisplayName displayName: String) -> Folder? { return folders?.first(where: { $0.nameForDisplay == displayName }) } diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift index 321e8fb5f..bcaace17f 100644 --- a/Frameworks/Account/AccountManager.swift +++ b/Frameworks/Account/AccountManager.swift @@ -72,7 +72,7 @@ public final class AccountManager: UnreadCountProvider { return lastArticleFetchEndTime } - public func findActiveAccount(forDisplayName displayName: String) -> Account? { + public func existingActiveAccount(forDisplayName displayName: String) -> Account? { return AccountManager.shared.activeAccounts.first(where: { $0.nameForDisplay == displayName }) } diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index 2400d555c..7b2ca80b4 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -476,7 +476,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr if isReadFiltered ?? false { if let accountName = userInfo[ArticlePathKey.accountName] as? String, - let account = AccountManager.shared.findActiveAccount(forDisplayName: accountName) { + let account = AccountManager.shared.existingActiveAccount(forDisplayName: accountName) { exceptionArticleFetcher = SingleArticleFetcher(account: account, articleID: articleID) fetchAndReplaceArticlesSync() } diff --git a/Shared/Data/AddWebFeedDefaultContainer.swift b/Shared/Data/AddWebFeedDefaultContainer.swift index 41e158ce9..0275f6159 100644 --- a/Shared/Data/AddWebFeedDefaultContainer.swift +++ b/Shared/Data/AddWebFeedDefaultContainer.swift @@ -14,7 +14,7 @@ struct AddWebFeedDefaultContainer { static var defaultContainer: Container? { if let accountID = AppDefaults.addWebFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) { - if let folderName = AppDefaults.addWebFeedFolderName, let folder = account.findFolder(withDisplayName: folderName) { + if let folderName = AppDefaults.addWebFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) { return folder } else { return substituteContainerIfNeeded(account: account)