diff options
| author | Fuwn <[email protected]> | 2026-02-23 08:20:28 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2026-02-23 08:21:50 -0800 |
| commit | 13762193cf21624e6bab5e8f3c12ace320e39661 (patch) | |
| tree | b99599caa5062c2bf2f363168262e41ebc26b788 /Sora/Data/Settings | |
| parent | chore: deduplicate project build settings in xcodegen spec (diff) | |
| download | sora-testing-13762193cf21624e6bab5e8f3c12ace320e39661.tar.xz sora-testing-13762193cf21624e6bab5e8f3c12ace320e39661.zip | |
fix: use Danbooru login/api_key query auth
Diffstat (limited to 'Sora/Data/Settings')
| -rw-r--r-- | Sora/Data/Settings/SettingsManager.swift | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Sora/Data/Settings/SettingsManager.swift b/Sora/Data/Settings/SettingsManager.swift index d7bfc44..ddeb1e4 100644 --- a/Sora/Data/Settings/SettingsManager.swift +++ b/Sora/Data/Settings/SettingsManager.swift @@ -289,7 +289,12 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l let existingCredentials: [BooruProviderCredentials] = Self.decode([BooruProviderCredentials].self, from: providerCredentialsData) ?? [] let rawCredentials = newValue.map { credentials in - (provider: credentials.provider, apiKey: credentials.apiKey, userID: credentials.userID) + ( + provider: credentials.provider, + apiKey: credentials.apiKey, + userID: credentials.userID, + login: credentials.login + ) } let mergedCredentials = BooruProviderCredentials.from( rawCredentials, existingCredentials: existingCredentials @@ -335,6 +340,13 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l ) } + var providerLogins: [BooruProvider: String] { + mergedCredentialValues( + extract: { $0.login }, + isDefault: { $0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty } + ) + } + // MARK: - Initialisation init() { syncObservation = NotificationCenter.default.addObserver( @@ -456,7 +468,12 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l let existingCredentials: [BooruProviderCredentials] = Self.decode([BooruProviderCredentials].self, from: providerCredentialsData) ?? [] let rawCredentials = newValue.map { credentials in - (provider: credentials.provider, apiKey: credentials.apiKey, userID: credentials.userID) + ( + provider: credentials.provider, + apiKey: credentials.apiKey, + userID: credentials.userID, + login: credentials.login + ) } let mergedCredentials = BooruProviderCredentials.from( rawCredentials, existingCredentials: existingCredentials |