From aae5b1dc483f4374edcaec35d26a2c05fb7011b5 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sun, 1 Dec 2019 17:54:34 -0600
Subject: [PATCH] Remove filtering of Accounts and Smartfeeds.  Issue #1377 &
 #1376

---
 .../Tree/WebFeedTreeControllerDelegate.swift  | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/Shared/Tree/WebFeedTreeControllerDelegate.swift b/Shared/Tree/WebFeedTreeControllerDelegate.swift
index 34a0373e1..cd1da83ef 100644
--- a/Shared/Tree/WebFeedTreeControllerDelegate.swift
+++ b/Shared/Tree/WebFeedTreeControllerDelegate.swift
@@ -44,13 +44,10 @@ private extension WebFeedTreeControllerDelegate {
 	func childNodesForRootNode(_ rootNode: Node) -> [Node]? {
 		var topLevelNodes = [Node]()
 
-		// Check to see if we should show the SmartFeeds top level by checking the unreadFeed
-		if !(isReadFiltered && SmartFeedsController.shared.unreadFeed.unreadCount == 0) {
-			let smartFeedsNode = rootNode.existingOrNewChildNode(with: SmartFeedsController.shared)
-			smartFeedsNode.canHaveChildNodes = true
-			smartFeedsNode.isGroupItem = true
-			topLevelNodes.append(smartFeedsNode)
-		}
+		let smartFeedsNode = rootNode.existingOrNewChildNode(with: SmartFeedsController.shared)
+		smartFeedsNode.canHaveChildNodes = true
+		smartFeedsNode.isGroupItem = true
+		topLevelNodes.append(smartFeedsNode)
 
 		topLevelNodes.append(contentsOf: sortedAccountNodes(rootNode))
 		
@@ -138,21 +135,7 @@ private extension WebFeedTreeControllerDelegate {
 	}
 
 	func sortedAccountNodes(_ parent: Node) -> [Node] {
-		
-		var accountFilterException: String? = nil
-		switch filterExceptions.first {
-		case .folder(let accountID, _), .webFeed(let accountID, _):
-			accountFilterException = accountID
-		default:
-			break
-		}
-		
 		let nodes = AccountManager.shared.sortedActiveAccounts.compactMap { (account) -> Node? in
-			
-			if isReadFiltered && account.accountID != accountFilterException && account.unreadCount == 0 {
-				return nil
-			}
-			
 			let accountNode = parent.existingOrNewChildNode(with: account)
 			accountNode.canHaveChildNodes = true
 			accountNode.isGroupItem = true