From 2a86cfc652a9fd0d6129c67c3daed7776d1e1e65 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 22 Jan 2025 22:01:57 -0800
Subject: [PATCH] Fix lint issues.
---
.../NewsBlurAccountDelegate+Internal.swift | 29 +++++++++----------
.../NewsBlur/Models/NewsBlurFeedChange.swift | 6 ++--
.../Models/NewsBlurFolderChange.swift | 6 ++--
.../Account/NewsBlur/NewsBlurAPICaller.swift | 28 +++++++++---------
4 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/Modules/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift b/Modules/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
index 893b0ba72..ec3e20c35 100644
--- a/Modules/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
+++ b/Modules/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
@@ -17,7 +17,7 @@ import SyncDatabase
import os.log
extension NewsBlurAccountDelegate {
-
+
func refreshFeeds(for account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
os_log(.debug, log: log, "Refreshing feeds...")
@@ -111,8 +111,7 @@ extension NewsBlurAccountDelegate {
feed.homePageURL = feed.homePageURL
feed.externalID = String(feed.feedID)
feed.faviconURL = feed.faviconURL
- }
- else {
+ } else {
feedsToAdd.insert(feed)
}
}
@@ -178,7 +177,7 @@ extension NewsBlurAccountDelegate {
}
}
}
-
+
// Handle the account level feeds. If there isn't the special folder, that means all the feeds are
// in folders and we need to remove them all from the account level.
if let folderRelationships = newsBlurFolderDict[" "] {
@@ -193,7 +192,7 @@ extension NewsBlurAccountDelegate {
account.removeFeed(feed)
}
}
-
+
}
func clearFolderRelationship(for feed: Feed, withFolderName folderName: String) {
@@ -297,12 +296,12 @@ extension NewsBlurAccountDelegate {
apiCall(storyHashGroup) { result in
switch result {
case .success:
- self.database.deleteSelectedForProcessing(storyHashGroup.map { String($0) } )
+ self.database.deleteSelectedForProcessing(storyHashGroup.map { String($0) })
group.leave()
case .failure(let error):
errorOccurred = true
os_log(.error, log: self.log, "Story status sync call failed: %@.", error.localizedDescription)
- self.database.resetSelectedForProcessing(storyHashGroup.map { String($0) } )
+ self.database.resetSelectedForProcessing(storyHashGroup.map { String($0) })
group.leave()
}
}
@@ -323,10 +322,10 @@ extension NewsBlurAccountDelegate {
return
}
- database.selectPendingReadStatusArticleIDs() { result in
+ database.selectPendingReadStatusArticleIDs { result in
func process(_ pendingStoryHashes: Set<String>) {
- let newsBlurUnreadStoryHashes = Set(hashes.map { $0.hash } )
+ let newsBlurUnreadStoryHashes = Set(hashes.map { $0.hash })
let updatableNewsBlurUnreadStoryHashes = newsBlurUnreadStoryHashes.subtracting(pendingStoryHashes)
account.fetchUnreadArticleIDs { articleIDsResult in
@@ -335,7 +334,7 @@ extension NewsBlurAccountDelegate {
}
let group = DispatchGroup()
-
+
// Mark articles as unread
let deltaUnreadArticleIDs = updatableNewsBlurUnreadStoryHashes.subtracting(currentUnreadArticleIDs)
group.enter()
@@ -349,7 +348,7 @@ extension NewsBlurAccountDelegate {
account.markAsRead(deltaReadArticleIDs) { _ in
group.leave()
}
-
+
group.notify(queue: DispatchQueue.main) {
completion()
}
@@ -371,10 +370,10 @@ extension NewsBlurAccountDelegate {
return
}
- database.selectPendingStarredStatusArticleIDs() { result in
+ database.selectPendingStarredStatusArticleIDs { result in
func process(_ pendingStoryHashes: Set<String>) {
- let newsBlurStarredStoryHashes = Set(hashes.map { $0.hash } )
+ let newsBlurStarredStoryHashes = Set(hashes.map { $0.hash })
let updatableNewsBlurUnreadStoryHashes = newsBlurStarredStoryHashes.subtracting(pendingStoryHashes)
account.fetchStarredArticleIDs { articleIDsResult in
@@ -383,7 +382,7 @@ extension NewsBlurAccountDelegate {
}
let group = DispatchGroup()
-
+
// Mark articles as starred
let deltaStarredArticleIDs = updatableNewsBlurUnreadStoryHashes.subtracting(currentStarredArticleIDs)
group.enter()
@@ -475,7 +474,7 @@ extension NewsBlurAccountDelegate {
completion(.success(()))
return
}
-
+
self.downloadFeed(account: account, feed: feed, page: page + 1, completion: completion)
}
diff --git a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift
index 62ae641d5..c452ce5dc 100644
--- a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift
+++ b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFeedChange.swift
@@ -28,18 +28,18 @@ extension NewsBlurFeedChange: NewsBlurDataConvertible {
case .rename(let feedID, let newName):
return [
URLQueryItem(name: "feed_id", value: feedID),
- URLQueryItem(name: "feed_title", value: newName),
+ URLQueryItem(name: "feed_title", value: newName)
]
case .delete(let feedID, let folder):
return [
URLQueryItem(name: "feed_id", value: feedID),
- folder != nil ? URLQueryItem(name: "in_folder", value: folder) : nil,
+ folder != nil ? URLQueryItem(name: "in_folder", value: folder) : nil
].compactMap { $0 }
case .move(let feedID, let from, let to):
return [
URLQueryItem(name: "feed_id", value: feedID),
URLQueryItem(name: "in_folder", value: from ?? ""),
- URLQueryItem(name: "to_folder", value: to ?? ""),
+ URLQueryItem(name: "to_folder", value: to ?? "")
]
}
}()
diff --git a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift
index 88fe53b34..5711bb74f 100644
--- a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift
+++ b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurFolderChange.swift
@@ -22,18 +22,18 @@ extension NewsBlurFolderChange: NewsBlurDataConvertible {
case .add(let name):
return [
URLQueryItem(name: "folder", value: name),
- URLQueryItem(name: "parent_folder", value: ""), // root folder
+ URLQueryItem(name: "parent_folder", value: "") // root folder
]
case .rename(let from, let to):
return [
URLQueryItem(name: "folder_to_rename", value: from),
URLQueryItem(name: "new_folder_name", value: to),
- URLQueryItem(name: "in_folder", value: ""), // root folder
+ URLQueryItem(name: "in_folder", value: "") // root folder
]
case .delete(let name, let feedIDs):
var queryItems = [
URLQueryItem(name: "folder_to_delete", value: name),
- URLQueryItem(name: "in_folder", value: ""), // root folder
+ URLQueryItem(name: "in_folder", value: "") // root folder
]
queryItems.append(contentsOf: feedIDs.map { id in
URLQueryItem(name: "feed_id", value: id)
diff --git a/Modules/Account/Sources/Account/NewsBlur/NewsBlurAPICaller.swift b/Modules/Account/Sources/Account/NewsBlur/NewsBlurAPICaller.swift
index 77e4521e1..8bf245bcb 100644
--- a/Modules/Account/Sources/Account/NewsBlur/NewsBlurAPICaller.swift
+++ b/Modules/Account/Sources/Account/NewsBlur/NewsBlurAPICaller.swift
@@ -77,7 +77,7 @@ final class NewsBlurAPICaller: NSObject {
.appendingPathComponent("reader/feeds")
.appendingQueryItems([
URLQueryItem(name: "flat", value: "true"),
- URLQueryItem(name: "update_counts", value: "false"),
+ URLQueryItem(name: "update_counts", value: "false")
])
requestData(callURL: url, resultType: NewsBlurFeedsResponse.self) { result in
@@ -94,7 +94,7 @@ final class NewsBlurAPICaller: NSObject {
let url = baseURL
.appendingPathComponent(endpoint)
.appendingQueryItems([
- URLQueryItem(name: "include_timestamps", value: "true"),
+ URLQueryItem(name: "include_timestamps", value: "true")
])
requestData(
@@ -114,14 +114,14 @@ final class NewsBlurAPICaller: NSObject {
func retrieveUnreadStoryHashes(completion: @escaping (Result<[NewsBlurStoryHash]?, Error>) -> Void) {
retrieveStoryHashes(
- endpoint: "reader/unread_story_hashes",
+ endpoint: "reader/unread_story_hashes",
completion: completion
)
}
func retrieveStarredStoryHashes(completion: @escaping (Result<[NewsBlurStoryHash]?, Error>) -> Void) {
retrieveStoryHashes(
- endpoint: "reader/starred_story_hashes",
+ endpoint: "reader/starred_story_hashes",
completion: completion
)
}
@@ -134,7 +134,7 @@ final class NewsBlurAPICaller: NSObject {
URLQueryItem(name: "order", value: "newest"),
URLQueryItem(name: "read_filter", value: "all"),
URLQueryItem(name: "include_hidden", value: "false"),
- URLQueryItem(name: "include_story_content", value: "true"),
+ URLQueryItem(name: "include_story_content", value: "true")
])
requestData(callURL: url, resultType: NewsBlurStoriesResponse.self) { result in
@@ -167,7 +167,7 @@ final class NewsBlurAPICaller: NSObject {
func markAsUnread(hashes: [String], completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/mark_story_hash_as_unread",
+ endpoint: "reader/mark_story_hash_as_unread",
payload: NewsBlurStoryStatusChange(hashes: hashes),
completion: completion
)
@@ -175,7 +175,7 @@ final class NewsBlurAPICaller: NSObject {
func markAsRead(hashes: [String], completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/mark_story_hashes_as_read",
+ endpoint: "reader/mark_story_hashes_as_read",
payload: NewsBlurStoryStatusChange(hashes: hashes),
completion: completion
)
@@ -183,7 +183,7 @@ final class NewsBlurAPICaller: NSObject {
func star(hashes: [String], completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/mark_story_hash_as_starred",
+ endpoint: "reader/mark_story_hash_as_starred",
payload: NewsBlurStoryStatusChange(hashes: hashes),
completion: completion
)
@@ -191,7 +191,7 @@ final class NewsBlurAPICaller: NSObject {
func unstar(hashes: [String], completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/mark_story_hash_as_unstarred",
+ endpoint: "reader/mark_story_hash_as_unstarred",
payload: NewsBlurStoryStatusChange(hashes: hashes),
completion: completion
)
@@ -199,7 +199,7 @@ final class NewsBlurAPICaller: NSObject {
func addFolder(named name: String, completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/add_folder",
+ endpoint: "reader/add_folder",
payload: NewsBlurFolderChange.add(name),
completion: completion
)
@@ -207,7 +207,7 @@ final class NewsBlurAPICaller: NSObject {
func renameFolder(with folder: String, to name: String, completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/rename_folder",
+ endpoint: "reader/rename_folder",
payload: NewsBlurFolderChange.rename(folder, name),
completion: completion
)
@@ -215,7 +215,7 @@ final class NewsBlurAPICaller: NSObject {
func removeFolder(named name: String, feedIDs: [String], completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/delete_folder",
+ endpoint: "reader/delete_folder",
payload: NewsBlurFolderChange.delete(name, feedIDs),
completion: completion
)
@@ -223,7 +223,7 @@ final class NewsBlurAPICaller: NSObject {
func addURL(_ url: String, folder: String?, completion: @escaping (Result<NewsBlurFeed?, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/add_url",
+ endpoint: "reader/add_url",
payload: NewsBlurFeedChange.add(url, folder),
resultType: NewsBlurAddURLResponse.self
) { result in
@@ -238,7 +238,7 @@ final class NewsBlurAPICaller: NSObject {
func renameFeed(feedID: String, newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
sendUpdates(
- endpoint: "reader/rename_feed",
+ endpoint: "reader/rename_feed",
payload: NewsBlurFeedChange.rename(feedID, newName)
) { result in
switch result {