FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make feedID and accountID the things that determine hashing and equality for a Feed.

This commit is contained in:
Brent Simmons 2018-09-14 22:15:22 -07:00
parent 47cf018143
commit fb9590de98
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Frameworks/Account/Feed.swift
View File

@ -124,12 +124,14 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
}
private let settingsTable: ODBRawValueTable
private let accountID: String // Used for hashing and equality; account may turn nil
// MARK: - Init
public init(account: Account, url: String, feedID: String) {
self.account = account
self.accountID = account.accountID
self.url = url
self.feedID = feedID
self.settingsTable = account.settingsTableForFeed(feedID: feedID)!
@ -197,13 +199,14 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
public func hash(into hasher: inout Hasher) {
hasher.combine(feedID)
hasher.combine(accountID)
}
// MARK: - Equatable
public class func ==(lhs: Feed, rhs: Feed) -> Bool {
return lhs === rhs
return lhs.feedID == rhs.feedID && lhs.accountID == rhs.accountID
}
}