Auto expand accounts that may have been suspended as collapsed when disclosing a feed. Issue #1440

iOS/MasterFeed/MasterFeedViewController.swift

@@ -548,35 +548,51 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		}
 	}
 	
-	func discloseFeed(_ feed: WebFeed, animated: Bool, completion: (() -> Void)? = nil) {
+	func discloseFeed(_ webFeed: WebFeed, animated: Bool, completion: (() -> Void)? = nil) {
 		
-		guard let node = coordinator.rootNode.descendantNodeRepresentingObject(feed as AnyObject) else {
+		func discloseFeedInAccount() {
-			completion?()
+			guard let node = coordinator.rootNode.descendantNodeRepresentingObject(webFeed as AnyObject) else {
-			return
-		}
-		
-		if let indexPath = dataSource.indexPath(for: node) {
-			coordinator.selectFeed(indexPath, animated: animated) {
 				completion?()
+				return
 			}
-			return
-		}
 			
-		// It wasn't already visable, so expand its folder and try again
+			if let indexPath = dataSource.indexPath(for: node) {
-		guard let parent = node.parent else {
+				coordinator.selectFeed(indexPath, animated: animated) {
-			completion?()
-			return
-		}
-		
-		coordinator.expand(parent)
-		reloadNode(parent)
-
-		self.applyChanges(animated: true, adjustScroll: true) { [weak self] in
-			if let indexPath = self?.dataSource.indexPath(for: node) {
-				self?.coordinator.selectFeed(indexPath, animated: animated) {
 					completion?()
 				}
+				return
 			}
+		
+			// It wasn't already visable, so expand its folder and try again
+			guard let parent = node.parent else {
+				completion?()
+				return
+			}
+			
+			coordinator.expand(parent)
+			reloadNode(parent)
+
+			applyChanges(animated: true, adjustScroll: true) { [weak self] in
+				if let indexPath = self?.dataSource.indexPath(for: node) {
+					self?.coordinator.selectFeed(indexPath, animated: animated) {
+						completion?()
+					}
+				}
+			}
+		}
+		
+		// If the account for the feed is collapsed, expand it
+		if let account = webFeed.account,
+			let accountNode = coordinator.rootNode.childNodeRepresentingObject(account as AnyObject),
+			!coordinator.isExpanded(accountNode) {
+			
+				coordinator.expand(accountNode)
+				applyChanges(animated: false) {
+					discloseFeedInAccount()
+				}
+			
+		} else {
+			discloseFeedInAccount()
 		}
 		
 	}