[Test] Channels feed

playlet-lib/src/components/Screens/SettingsScreen/HomeScreenEditor/HomeScreenEditor.xml

@@ -19,7 +19,7 @@
             <CheckList
                 id="checkList"
                 vertFocusAnimationStyle="floatingFocus"
-                translation="[164,70]">
+                translation="[164,36]">
 
                 <ContentNode role="content" />
             </CheckList>

playlet-lib/src/components/Services/Invidious/InvidiousService.bs

@@ -470,6 +470,37 @@ namespace Invidious
             }
         end function
 
+        function AuthChannelsHandler(context as object) as object
+            response = context.response
+            authToken = context.authToken
+
+            m.DeleteExpiredToken(response, authToken)
+
+            if response.StatusCode() <> 200
+                return invalid
+            end if
+
+            json = response.Json()
+            if json = invalid
+                return invalid
+            end if
+
+            channels = []
+            for each item in json
+                channels.push({
+                    "type": "channel"
+                    "author": item.author
+                    "authorId": item.authorId
+                })
+            end for
+
+            channels.SortBy("author")
+
+            return {
+                items: channels
+            }
+        end function
+
         function WatchHistoryHandler(context as object) as object
             response = context.response
             authToken = context.authToken

playlet-lib/src/components/Services/Invidious/InvidiousToContentNode.bs

@@ -261,7 +261,7 @@ namespace InvidiousContent
 
     function GetChannelThumbnail(authorThumbnails as object) as string
         if authorThumbnails = invalid or authorThumbnails.Count() = 0
-            return ""
+            return "pkg:/images/icons/user-200.png"
         end if
         url = authorThumbnails[authorThumbnails.Count() - 1].url
         if url.startsWith("//")

playlet-lib/src/components/Services/Preferences/Preferences.bs

@@ -93,28 +93,53 @@ function MigrateExistingPreferences(userPrefs as object) as boolean
     isDirty = false
 
     ' v0 -> v1
-    instances = RegistryUtils.Read(RegistryUtils.INVIDIOUS_INSTANCES)
-    if instances <> invalid
-        currentInstance = userPrefs["invidious.instance"]
-        if currentInstance = invalid or currentInstance = ""
-            instances = ParseJson(instances)
-            if instances.Count() > 0
-                instance = instances[0]
-                if instance <> invalid and instance <> ""
-                    userPrefs["invidious.instance"] = instance
-                    isDirty = true
+    if not userPrefs.DoesExist("__version")
+        instances = RegistryUtils.Read(RegistryUtils.INVIDIOUS_INSTANCES)
+        if instances <> invalid
+            currentInstance = userPrefs["invidious.instance"]
+            if currentInstance = invalid or currentInstance = ""
+                instances = ParseJson(instances)
+                if instances.Count() > 0
+                    instance = instances[0]
+                    if instance <> invalid and instance <> ""
+                        userPrefs["invidious.instance"] = instance
+                    end if
                 end if
             end if
+            RegistryUtils.Delete(RegistryUtils.INVIDIOUS_INSTANCES)
         end if
-        RegistryUtils.Delete(RegistryUtils.INVIDIOUS_INSTANCES)
     end if
 
-    ' v1 -> v2 goes here (if needed)
-    ' if userPrefs.__version = 1
-    '   'do stuff
-    ' end if
+    '  v1 -> v2
+    if ValidInt(userPrefs.__version) = 1
+        if userPrefs.DoesExist("misc.home_screen_layout")
+            homeScreenLayout = userPrefs["misc.home_screen_layout"]
+            if IsArray(homeScreenLayout)
+                containsChannels = false
+                for each item in homeScreenLayout
+                    if item.id = "channels"
+                        containsChannels = true
+                        exit for
+                    end if
+                end for
+                if not containsChannels
+                    ' channels was added in v2, and should be the last item in the array
+                    homeScreenLayout.push({
+                        id: "channels"
+                        enabled: false
+                    })
+                    userPrefs["misc.home_screen_layout"] = homeScreenLayout
+                end if
+            end if
+        end if
+        userPrefs.__version = 2
+    end if
+
+    if ValidInt(userPrefs.__version) <> m.top.__version
+        isDirty = true
+    end if
 
-    ' TODO:PX handle case where saved preferences version is higher than current version (e.g. user downgraded)
+    ' TODO:P2 handle case where saved preferences version is higher than current version (e.g. user downgraded)
     return isDirty
 end function
 

playlet-lib/src/components/Services/Preferences/Preferences.xml

@@ -5,7 +5,7 @@
             user prefs saved need to be migrated. If the version is less than the
             current version, a migration is needed.
          -->
-        <field id="__version" type="integer" value="1" />
+        <field id="__version" type="integer" value="2" />
         <field id="prefsModel" type="array" />
         <field id="preferenceFields" type="assocarray" />
         <function name="GetUserPreferences" />

playlet-lib/src/config/default_home_layout.yaml

@@ -67,3 +67,11 @@
       title: Watch history
       apiType: Invidious
       endpoint: watch_history
+
+- title: Channels
+  id: channels
+  feedSources:
+    - id: inv_auth_channels
+      title: Channels
+      apiType: Invidious
+      endpoint: auth_channels

playlet-lib/src/config/invidious_video_api.yaml

@@ -86,6 +86,12 @@ auth_playlists:
   url: /api/v1/auth/playlists
   authenticated: true
 
+auth_channels:
+  title: Channels
+  url: /api/v1/auth/subscriptions
+  authenticated: true
+  responseHandler: AuthChannelsHandler
+
 playlist:
   title: Playlist
   url: /api/v1/playlists/{plid}

playlet-lib/src/config/preferences.json5

@@ -168,6 +168,12 @@
             id: "watch_history",
             enabled: true,
           },
+          {
+            // Channels currently disabled because we don't have any channel info
+            // except the id and name, so it doesn't look nice.
+            id: "channels",
+            enabled: false,
+          },
         ],
         visibility: "tv",
         rokuComponent: "EditHomeScreenControl",