Made Sidebar Combine correct

This commit is contained in:
Maurice Parker 2020-07-18 17:10:45 -05:00
parent d36870028a
commit 9732ca10f3

View File

@ -86,19 +86,19 @@ private extension SidebarModel {
} }
func subscribeToSelectedFeedChanges() { func subscribeToSelectedFeedChanges() {
// TODO: This should be rewritten to use Combine correctly $selectedFeedIdentifiers.map { [weak self] feedIDs in
$selectedFeedIdentifiers.sink { [weak self] feedIDs in feedIDs.compactMap { self?.findFeed($0) }
guard let self = self else { return } }
self.selectedFeeds = feedIDs.compactMap { self.findFeed($0) } .assign(to: $selectedFeeds)
}.store(in: &cancellables)
// TODO: This should be rewritten to use Combine correctly $selectedFeedIdentifier.map { [weak self] feedID in
$selectedFeedIdentifier.sink { [weak self] feedID in if let feedID = feedID, let feed = self?.findFeed(feedID) {
guard let self = self else { return } return [feed]
if let feedID = feedID, let feed = self.findFeed(feedID) { } else {
self.selectedFeeds = [feed] return [Feed]()
} }
}.store(in: &cancellables) }
.assign(to: $selectedFeeds)
} }
func subscribeToReadFilterChanges() { func subscribeToReadFilterChanges() {