Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
Justin Mazzocchi 2020-10-03 13:55:07 -07:00
parent 758c375547
commit 9507343511
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DB/Sources/DB/Content/ContentDatabase.swift
View File

@ -218,17 +218,12 @@ public extension ContentDatabase {
.eraseToAnyPublisher()
}
func accountObservation(id: String) -> AnyPublisher<Account?, Error> {
func accountObservation(id: String) -> AnyPublisher<Account, Error> {
ValueObservation.tracking(AccountInfo.request(AccountRecord.filter(AccountRecord.Columns.id == id)).fetchOne)
.removeDuplicates()
.map {
if let info = $0 {
return Account(info: info)
} else {
return nil
}
}
.publisher(in: databaseWriter)
.compactMap { $0 }
.map(Account.init(info:))
.eraseToAnyPublisher()
}

2
ServiceLayer/Sources/ServiceLayer/Services/ProfileService.swift
View File

@ -35,8 +35,6 @@ public struct ProfileService {
self.contentDatabase = contentDatabase
var accountPublisher = contentDatabase.accountObservation(id: accountID)
.compactMap { $0 }
.eraseToAnyPublisher()
if let account = account {
accountPublisher = accountPublisher