FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 12:06:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove instance of no-longer-needed feed uniquing.

Browse Source
This commit is contained in:
Brent Simmons 2018-09-16 13:11:54 -07:00
parent 6b6d393b3d
commit f88c58a130
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Commands/DeleteFromSidebarCommand.swift
View File

@ -161,9 +161,7 @@ private struct SidebarItemSpecifier {
guard let account = account, let feed = feed else { guard let account = account, let feed = feed else {
return return
} }
account.addFeed(feed, to: resolvedFolder())
let feedToUse = uniquedFeed(feed)
account.addFeed(feedToUse, to: resolvedFolder())
} }
private func restoreFolder() { private func restoreFolder() {
@ -174,16 +172,6 @@ private struct SidebarItemSpecifier {
account.addFolder(folder, to: nil) account.addFolder(folder, to: nil)
} }
private func uniquedFeed(_ feed: Feed) -> Feed {
// A Feed may appear in multiple places in a given account,
// but it’s best if they’re the same Feed instance.
// Usually this will return the same Feed that was passed-in,
// but not necessarily always.
return account?.existingFeed(with: feed.feedID) ?? feed
}
private func resolvedFolder() -> Folder? { private func resolvedFolder() -> Folder? {
return path.resolveContainer() as? Folder return path.resolveContainer() as? Folder