Change to no longer filter currently selected Feed. Issue #1728
This commit is contained in:
parent
b53cbfcf2c
commit
76aa603874
@ -1251,11 +1251,31 @@ private extension SceneCoordinator {
|
|||||||
|
|
||||||
func rebuildBackingStores(initialLoad: Bool = false, updateExpandedNodes: (() -> Void)? = nil) {
|
func rebuildBackingStores(initialLoad: Bool = false, updateExpandedNodes: (() -> Void)? = nil) {
|
||||||
if !animatingChanges && !BatchUpdate.shared.isPerforming {
|
if !animatingChanges && !BatchUpdate.shared.isPerforming {
|
||||||
|
|
||||||
|
addCurrentFeedToFilterExeptionsIfNecessary()
|
||||||
treeController.rebuild()
|
treeController.rebuild()
|
||||||
|
treeControllerDelegate.resetFilterExceptions()
|
||||||
|
|
||||||
updateExpandedNodes?()
|
updateExpandedNodes?()
|
||||||
rebuildShadowTable()
|
rebuildShadowTable()
|
||||||
masterFeedViewController.reloadFeeds(initialLoad: initialLoad)
|
masterFeedViewController.reloadFeeds(initialLoad: initialLoad)
|
||||||
clearTimelineIfNoLongerAvailable()
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func addCurrentFeedToFilterExeptionsIfNecessary() {
|
||||||
|
if isReadFeedsFiltered, let feedID = timelineFeed?.feedID {
|
||||||
|
if timelineFeed is SmartFeed {
|
||||||
|
treeControllerDelegate.addFilterException(feedID)
|
||||||
|
} else if let folderFeed = timelineFeed as? Folder {
|
||||||
|
if folderFeed.account?.existingFolder(withID: folderFeed.folderID) != nil {
|
||||||
|
treeControllerDelegate.addFilterException(feedID)
|
||||||
|
}
|
||||||
|
} else if let webFeed = timelineFeed as? WebFeed {
|
||||||
|
if webFeed.account?.existingWebFeed(withWebFeedID: webFeed.webFeedID) != nil {
|
||||||
|
treeControllerDelegate.addFilterException(feedID)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user