Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-06 10:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling feed

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-14 17:23:04 +01:00
parent 2812ea0301
commit b55c6f8619
4 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Model/Applications/InvidiousAPI.swift
View File

@@ -34,30 +34,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
func setAccount(_ account: Account) {
self.account = account
wipeResources()
configure()
if !account.anonymous {
validate()
}
}
func validate() {
validateSID()
}
func validateSID() {
guard signedIn, !(account.token?.isEmpty ?? true) else {
return
}
feed?
.load()
.onFailure { _ in
self.updateToken(force: true)
}
wipeResources()
}
func configure() {
@@ -162,7 +139,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
return CommentsPage(comments: comments, nextPage: nextPage, disabled: disabled)
}
updateToken()
if account.token.isNil || account.token!.isEmpty {
updateToken()
} else {
FeedModel.shared.onAccountChange()
}
}
func updateToken(force: Bool = false) {

5
Model/Applications/PipedAPI.swift
View File

@@ -26,7 +26,6 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
func setAccount(_ account: Account) {
self.account = account
wipeResources()
configure()
}
@@ -108,8 +107,10 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
content.json.arrayValue.compactMap { self.extractUserPlaylist(from: $0) }
}
if account.token.isNil {
if account.token.isNil || account.token!.isEmpty {
updateToken()
} else {
FeedModel.shared.loadResources(force: true)
}
}