From b3afee02527ec281aa41fafada22863b536d7b8e Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 16 Apr 2020 11:25:39 -0500 Subject: [PATCH] Change Feed Provider interface to make it work better with refreshing WebFeeds. --- Frameworks/Account/FeedProvider/FeedProvider.swift | 8 ++++---- .../FeedProvider/Twitter/TwitterFeedProvider.swift | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Frameworks/Account/FeedProvider/FeedProvider.swift b/Frameworks/Account/FeedProvider/FeedProvider.swift index 231019379..47ab5d468 100644 --- a/Frameworks/Account/FeedProvider/FeedProvider.swift +++ b/Frameworks/Account/FeedProvider/FeedProvider.swift @@ -19,15 +19,15 @@ public enum FeedProviderAbility { public protocol FeedProvider { /// Informs the caller of the ability for this feed provider to service the given URL - func ability(_ url: URLComponents, forUsername: String?) -> FeedProviderAbility + func ability(_ urlComponents: URLComponents, forUsername: String?) -> FeedProviderAbility /// Provide the iconURL of the given URL - func iconURL(_ url: URLComponents, completion: @escaping (Result) -> Void) + func iconURL(_ urlComponents: URLComponents, completion: @escaping (Result) -> Void) /// Construct a ParsedFeed that can be used to create and store a new Feed - func provide(_ url: URLComponents, completion: @escaping (Result) -> Void) + func provide(_ urlComponents: URLComponents, completion: @escaping (Result) -> Void) /// Refresh all the article entries (ParsedItems) - func refresh(_ url: URLComponents, completion: @escaping (Result, Error>) -> Void) + func refresh(_ webFeed: WebFeed, completion: @escaping (Result, Error>) -> Void) } diff --git a/Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift b/Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift index f71d43f87..19db50fdd 100644 --- a/Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift +++ b/Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift @@ -84,16 +84,16 @@ public struct TwitterFeedProvider: FeedProvider { return .available } - public func iconURL(_ url: URLComponents, completion: @escaping (Result) -> Void) { - let screenName = extractScreenName(url) + public func iconURL(_ urlComponents: URLComponents, completion: @escaping (Result) -> Void) { + let screenName = extractScreenName(urlComponents) fetchIconURL(screenName: screenName, completion: completion) } - public func provide(_ url: URLComponents, completion: @escaping (Result) -> Void) { + public func provide(_ urlComponents: URLComponents, completion: @escaping (Result) -> Void) { // TODO: Finish implementation } - public func refresh(_ url: URLComponents, completion: @escaping (Result, Error>) -> Void) { + public func refresh(_ webFeed: WebFeed, completion: @escaping (Result, Error>) -> Void) { // TODO: Finish implementation }