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

Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire into main

This commit is contained in:
Brent Simmons 2020-12-18 18:39:46 -08:00
parent 3ef86c01df 110d68e4b2
commit 478b836968
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -547,15 +547,14 @@ private extension CloudKitAccountDelegate {
case .success:
self.refreshProgress.completeTask()
self.combinedRefresh(account, webFeeds) { result in
switch result {
case .success:
self.sendArticleStatus(for: account, showProgress: true) { _ in
self.refreshProgress.clear()
account.metadata.lastArticleFetchEndTime = Date()
}
case .failure(let error):
self.sendArticleStatus(for: account, showProgress: true) { _ in
self.refreshProgress.clear()
fail(error)
if case .failure(let error) = result {
fail(error)
} else {
account.metadata.lastArticleFetchEndTime = Date()
completion(.success(()))
}
}
}
case .failure(let error):

10
Account/Sources/Account/FeedProvider/Reddit/RedditFeedProvider.swift
View File

@ -16,15 +16,15 @@ import RSWeb
public enum RedditFeedProviderError: LocalizedError {
case rateLimitExceeded
case accessFailure
case accessFailure(Error)
case unknown
public var errorDescription: String? {
switch self {
case .rateLimitExceeded:
return NSLocalizedString("Reddit API rate limit has been exceeded. Please wait a short time and try again.", comment: "Rate Limit")
case .accessFailure:
return NSLocalizedString("An attempt to access your Reddit feed(s) failed. Please deactivate and reactivate the Reddit extension to fix this problem.", comment: "Token Renew")
case .accessFailure(let error):
return NSLocalizedString("An attempt to access your Reddit feed(s) failed.\n\nIf this problem persists, please deactivate and reactivate the Reddit extension to fix this problem.\n\n\(error.localizedDescription)", comment: "Reddit Access")
case .unknown:
return NSLocalizedString("A Reddit Feed Provider error has occurred.", comment: "Unknown error")
}
@ -366,8 +366,8 @@ private extension RedditFeedProvider {
case .failure(let oathError):
self.handleFailure(error: oathError) { error in
if let _ = error {
completion(.failure(RedditFeedProviderError.accessFailure))
if let error = error {
completion(.failure(RedditFeedProviderError.accessFailure(error)))
} else {
self.fetch(api: api, parameters: parameters, resultType: resultType, completion: completion)
}