mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2025-02-18 06:55:13 +00:00
Code Issues Projects Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
Justin Mazzocchi 2020-08-14 17:14:21 -07:00
parent 888604497c
commit c64fa26b09
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Shared/Services/IdentityService.swift
View file

@ -85,6 +85,11 @@ extension IdentityService {
func updatePreferences(_ preferences: Identity.Preferences) -> AnyPublisher<Void, Error> { func updatePreferences(_ preferences: Identity.Preferences) -> AnyPublisher<Void, Error> {
identityDatabase.updatePreferences(preferences, forIdentityID: identity.id) identityDatabase.updatePreferences(preferences, forIdentityID: identity.id)
.zip(Just(self).first().setFailureType(to: Error.self))
.filter { $1.identity.preferences.useServerPostingReadingPreferences }
.map { _ in () }
.flatMap(refreshServerPreferences)
.eraseToAnyPublisher()
} }
func createPushSubscription(deviceToken: String, alerts: PushSubscription.Alerts) -> AnyPublisher<Void, Error> { func createPushSubscription(deviceToken: String, alerts: PushSubscription.Alerts) -> AnyPublisher<Void, Error> {

22
Shared/View Models/PostingReadingPreferencesViewModel.swift
View file

@ -4,19 +4,8 @@ import Foundation
import Combine import Combine
class PostingReadingPreferencesViewModel: ObservableObject { class PostingReadingPreferencesViewModel: ObservableObject {
@Published var preferences: Identity.Preferences { @Published var preferences: Identity.Preferences
didSet {
if preferences.useServerPostingReadingPreferences {
identityService.refreshServerPreferences()
.assignErrorsToAlertItem(to: \.alertItem, on: self)
.sink(receiveValue: {})
.store(in: &cancellables)
}
}
}
@Published var alertItem: AlertItem? @Published var alertItem: AlertItem?
let handle: String
private let identityService: IdentityService private let identityService: IdentityService
private var cancellables = Set<AnyCancellable>() private var cancellables = Set<AnyCancellable>()
@ -24,17 +13,18 @@ class PostingReadingPreferencesViewModel: ObservableObject {
init(identityService: IdentityService) { init(identityService: IdentityService) {
self.identityService = identityService self.identityService = identityService
preferences = identityService.identity.preferences preferences = identityService.identity.preferences
handle = identityService.identity.handle
identityService.$identity.map(\.preferences) identityService.$identity
.map(\.preferences)
.dropFirst() .dropFirst()
.removeDuplicates() .removeDuplicates()
.assign(to: &$preferences) .assign(to: &$preferences)
$preferences.dropFirst() $preferences
.dropFirst()
.flatMap(identityService.updatePreferences) .flatMap(identityService.updatePreferences)
.assignErrorsToAlertItem(to: \.alertItem, on: self) .assignErrorsToAlertItem(to: \.alertItem, on: self)
.sink(receiveValue: {}) .sink {}
.store(in: &cancellables) .store(in: &cancellables)
} }
} }