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

Cleanup

This commit is contained in:
Justin Mazzocchi 2020-09-09 21:26:13 -07:00
parent c3ca23d736
commit b0d0792014
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,6 @@ public struct IdentityService {
}
public extension IdentityService {
var isAuthorized: Bool { mastodonAPIClient.accessToken != nil }
func updateLastUse() -> AnyPublisher<Never, Error> {
identityDatabase.updateLastUsedAt(identityID: identityID)
}

10
ViewModels/Sources/ViewModels/NavigationViewModel.swift
View File

@ -18,8 +18,8 @@ public final class NavigationViewModel: ObservableObject {
public init(identification: Identification) {
self.identification = identification
timeline = identification.service.isAuthorized ? .home : .local
timelinesAndLists = identification.service.isAuthorized
timeline = identification.identity.authenticated ? .home : .local
timelinesAndLists = identification.identity.authenticated
? Timeline.authenticatedDefaults
: Timeline.unauthenticatedDefaults
@ -31,7 +31,7 @@ public final class NavigationViewModel: ObservableObject {
.assignErrorsToAlertItem(to: \.alertItem, on: self)
.assign(to: &$recentIdentities)
if identification.service.isAuthorized {
if identification.identity.authenticated {
identification.service.listsObservation()
.map { Timeline.authenticatedDefaults + $0 }
.assignErrorsToAlertItem(to: \.alertItem, on: self)
@ -42,7 +42,7 @@ public final class NavigationViewModel: ObservableObject {
public extension NavigationViewModel {
var tabs: [Tab] {
if identification.service.isAuthorized {
if identification.identity.authenticated {
return Tab.allCases
} else {
return [.timelines, .explore]
@ -59,7 +59,7 @@ public extension NavigationViewModel {
}
func refreshIdentity() {
if identification.service.isAuthorized {
if identification.identity.authenticated {
identification.service.verifyCredentials()
.assignErrorsToAlertItem(to: \.alertItem, on: self)
.sink { _ in }