From a66759a065760fe6fa6559870d3c84001472771c Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jonathan@jbennett.me>
Date: Thu, 14 Jan 2021 10:36:11 -0500
Subject: [PATCH] DRY up feed id code

only the filter really changes
---
 .../FeedWrangler/FeedWranglerAPICaller.swift  | 52 ++++---------------
 .../FeedWranglerAccountDelegate.swift         |  4 +-
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/Account/Sources/Account/FeedWrangler/FeedWranglerAPICaller.swift b/Account/Sources/Account/FeedWrangler/FeedWranglerAPICaller.swift
index 73d4f7418..06e880298 100644
--- a/Account/Sources/Account/FeedWrangler/FeedWranglerAPICaller.swift
+++ b/Account/Sources/Account/FeedWrangler/FeedWranglerAPICaller.swift
@@ -189,32 +189,21 @@ final class FeedWranglerAPICaller: NSObject {
 			}
 		}
 	}
-    
-    func retrieveUnreadFeedItemIds(page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
-        let url = FeedWranglerConfig.clientURL
-            .appendingPathComponent("feed_items/list_ids")
-            .appendingQueryItems([
-                URLQueryItem(name: "read", value: "false"),
-                URLQueryItem(name: "offset", value: String(page * FeedWranglerConfig.idsPageSize)),
-            ])
         
-        standardSend(url: url, resultType: FeedWranglerFeedItemIdsRequest.self) { result in
-            switch result {
-            case .success(let (_, results)):
-                completion(.success(results?.feedItems ?? []))
-
-            case .failure(let error):
-                completion(.failure(error))
-            }
-        }
+    func retrieveUnreadFeedItemIds(completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
+        retrieveAllFeedItemIds(filters: [URLQueryItem(name: "read", value: "false")], completion: completion)
     }
     
-    func retrieveAllUnreadFeedItemIds(foundItems: [FeedWranglerFeedItemId] = [], page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
-        retrieveUnreadFeedItemIds(page: page) { result in
+    func retrieveStarredFeedItemIds(completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
+        retrieveAllFeedItemIds(filters: [URLQueryItem(name: "starred", value: "true")], completion: completion)
+    }
+    
+    private func retrieveAllFeedItemIds(filters: [URLQueryItem] = [], foundItems: [FeedWranglerFeedItemId] = [], page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
+        retrieveFeedItemIds(filters: filters, page: page) { result in
             switch result {
             case .success(let newItems):
                 if newItems.count > 0 {
-                    self.retrieveAllUnreadFeedItemIds(foundItems: foundItems + newItems, page: (page + 1), completion: completion)
+                    self.retrieveAllFeedItemIds(filters: filters, foundItems: foundItems + newItems, page: (page + 1), completion: completion)
                 } else {
                     completion(.success(foundItems + newItems))
                 }
@@ -225,13 +214,10 @@ final class FeedWranglerAPICaller: NSObject {
         }
     }
     
-    func retrieveStarredFeedItemIds(page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
+    private func retrieveFeedItemIds(filters: [URLQueryItem] = [], page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
         let url = FeedWranglerConfig.clientURL
             .appendingPathComponent("feed_items/list_ids")
-            .appendingQueryItems([
-                URLQueryItem(name: "starred", value: "true"),
-                URLQueryItem(name: "offset", value: String(page * FeedWranglerConfig.idsPageSize)),
-            ])
+            .appendingQueryItems(filters + [URLQueryItem(name: "offset", value: String(page * FeedWranglerConfig.idsPageSize))])
         
         standardSend(url: url, resultType: FeedWranglerFeedItemIdsRequest.self) { result in
             switch result {
@@ -243,22 +229,6 @@ final class FeedWranglerAPICaller: NSObject {
             }
         }
     }
-    
-    func retrieveAllStarredFeedItemIds(foundItems: [FeedWranglerFeedItemId] = [], page: Int = 0, completion: @escaping (Result<[FeedWranglerFeedItemId], Error>) -> Void) {
-        retrieveStarredFeedItemIds(page: page) { result in
-            switch result {
-            case .success(let newItems):
-                if newItems.count > 0 {
-                    self.retrieveAllStarredFeedItemIds(foundItems: foundItems + newItems, page: (page + 1), completion: completion)
-                } else {
-                    completion(.success(foundItems + newItems))
-                }
-                
-            case .failure(let error):
-                completion(.failure(error))
-            }
-        }
-    }
 	
 	func updateArticleStatus(_ articleID: String, _ statuses: [SyncStatus], completion: @escaping () -> Void) {
 		
diff --git a/Account/Sources/Account/FeedWrangler/FeedWranglerAccountDelegate.swift b/Account/Sources/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
index a0afd2b42..ecaafa2c1 100644
--- a/Account/Sources/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
+++ b/Account/Sources/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
@@ -249,7 +249,7 @@ final class FeedWranglerAccountDelegate: AccountDelegate {
 		let group = DispatchGroup()
 		
 		group.enter()
-		caller.retrieveAllUnreadFeedItemIds { result in
+		caller.retrieveUnreadFeedItemIds { result in
 			switch result {
 			case .success(let items):
 				self.syncArticleReadState(account, items)
@@ -263,7 +263,7 @@ final class FeedWranglerAccountDelegate: AccountDelegate {
 		
 		// starred
 		group.enter()
-		caller.retrieveAllStarredFeedItemIds { result in
+		caller.retrieveStarredFeedItemIds { result in
 			switch result {
 			case .success(let items):
 				self.syncArticleStarredState(account, items)