renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow for multiple FreshRSS accounts with the same username — since a given username might be reused across instances. Fix #4377.

Browse Source
This commit is contained in:
Brent Simmons
2024-10-27 11:57:29 -07:00
parent 4bdbe23e69
commit 77910eb9a4
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/Account/Sources/Account/AccountManager.swift
View File

@@ -165,15 +165,33 @@ import Core
NotificationCenter.default.post(name: .UserDidDeleteAccount, object: self, userInfo: userInfo)
}
public func duplicateServiceAccount(type: AccountType, username: String?) -> Bool {
public func duplicateServiceAccount(type: AccountType, username: String?, apiURL: String? = nil) -> Bool {
guard type != .onMyMac else {
return false
}
for account in accounts {
if account.accountType == type && username == account.username {
return true
if type == .freshRSS {
guard let apiURL, let endpointURL = URL(string: apiURL) else {
return false
}
for account in accounts {
// A person might use the same username with different instances of FreshRSS,
// so it’s necessary to check the endpointURL.
// https://github.com/Ranchero-Software/NetNewsWire/issues/4377
if account.accountType == type && username == account.username && account.endpointURL == endpointURL {
return true
}
}
}
else {
for account in accounts {
if account.accountType == type && username == account.username {
return true
}
}
}
return false
}