Feed cache

Model/Applications/InvidiousAPI.swift

@@ -9,7 +9,6 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     static let basePath = "/api/v1"
 
     @Published var account: Account!
-    @Published var validInstance = true
 
     static func withAnonymousAccountForInstanceURL(_ url: URL) -> InvidiousAPI {
         .init(account: Instance(app: .invidious, apiURLString: url.absoluteString).anonymousAccount)
@@ -35,8 +34,6 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     func setAccount(_ account: Account) {
         self.account = account
 
-        validInstance = account.anonymous
-
         configure()
 
         if !account.anonymous {
@@ -45,31 +42,15 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
     }
 
     func validate() {
-        validateInstance()
         validateSID()
     }
 
-    func validateInstance() {
-        guard !validInstance else {
-            return
-        }
-
-        home?
-            .load()
-            .onSuccess { _ in
-                self.validInstance = true
-            }
-            .onFailure { _ in
-                self.validInstance = false
-            }
-    }
-
     func validateSID() {
         guard signedIn, !(account.token?.isEmpty ?? true) else {
             return
         }
 
-        feed?
+        notifications?
             .load()
             .onFailure { _ in
                 self.updateToken(force: true)
@@ -273,8 +254,17 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
         resource(baseURL: account.url, path: "/feed/subscriptions")
     }
 
-    var feed: Resource? {
+    func feed(_ page: Int?) -> Resource? {
         resource(baseURL: account.url, path: "\(Self.basePath)/auth/feed")
+            .withParam("page", String(page ?? 1))
+    }
+
+    var feed: Resource? {
+        resource(baseURL: account.url, path: basePathAppending("auth/feed"))
+    }
+
+    var notifications: Resource? {
+        resource(baseURL: account.url, path: basePathAppending("auth/notifications"))
     }
 
     var subscriptions: Resource? {

Model/Applications/PeerTubeAPI.swift

@@ -70,7 +70,7 @@ final class PeerTubeAPI: Service, ObservableObject, VideosAPI {
             return
         }
 
-        feed?
+        feed(1)?
             .load()
             .onFailure { _ in
                 self.updateToken(force: true)
@@ -262,8 +262,9 @@ final class PeerTubeAPI: Service, ObservableObject, VideosAPI {
         resource(baseURL: account.url, path: "/feed/subscriptions")
     }
 
-    var feed: Resource? {
+    func feed(_ page: Int?) -> Resource? {
         resource(baseURL: account.url, path: "\(Self.basePath)/auth/feed")
+            .withParam("page", String(page ?? 1))
     }
 
     var subscriptions: Resource? {

Model/Applications/PipedAPI.swift

@@ -220,7 +220,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
         resource(baseURL: account.instance.apiURL, path: "subscriptions")
     }
 
-    var feed: Resource? {
+    func feed(_: Int?) -> Resource? {
         resource(baseURL: account.instance.apiURL, path: "feed")
             .withParam("authToken", account.token)
     }

Model/Applications/VideosAPI.swift

@@ -18,8 +18,8 @@ protocol VideosAPI {
 
     func video(_ id: Video.ID) -> Resource
 
+    func feed(_ page: Int?) -> Resource?
     var subscriptions: Resource? { get }
-    var feed: Resource? { get }
     var home: Resource? { get }
     var popular: Resource? { get }
     var playlists: Resource? { get }

Model/Applications/VideosApp.swift

@@ -30,6 +30,10 @@ enum VideosApp: String, CaseIterable {
         supportsAccounts
     }
 
+    var paginatesSubscriptions: Bool {
+        self == .invidious
+    }
+
     var supportsTrendingCategories: Bool {
         self == .invidious
     }