Fixed home menu videos extraction.

Author: b5i

Sources/YouTubeKit/BaseStructs/YTVideo.swift

@@ -77,6 +77,30 @@ public struct YTVideo: YTSearchResult, YouTubeVideo, Codable, Sendable {
         return video
     }
 
+    /// Give a `lockupViewModel` to decode.
+    public static func decodeLockupJSON(json: JSON) -> YTVideo? {
+        guard let videoId = json["contentId"].string, json["contentType"] == "LOCKUP_CONTENT_TYPE_VIDEO" else { return nil }
+        
+        var video = YTVideo(videoId: videoId)
+        
+        video.title = json["metadata"]["lockupMetadataViewModel"]["title"]["content"].string
+                      
+        if let channelJSON = json["metadata"]["lockupMetadataViewModel"]["metadata"]["contentMetadataViewModel"]["metadataRows"].array?.first(where: { $0["metadataParts"].array?.first?["text"]["commandRuns"].array?.first?["onTap"]["innertubeCommand"]["commandMetadata"]["webCommandMetadata"]["webPageType"].string == "WEB_PAGE_TYPE_CHANNEL" }), let channelId = channelJSON["metadataParts"].array?.first?["text"]["commandRuns"].array?.first?["onTap"]["innertubeCommand"]["browseEndpoint"]["browseId"].string {
+            video.channel = YTLittleChannelInfos(channelId: channelId, name: channelJSON["metadataParts"].array?.first?["text"]["content"].string)
+        }
+            
+        let viewCountAndDateJSON = json["metadata"]["lockupMetadataViewModel"]["metadata"]["contentMetadataViewModel"]["metadataRows"].array?.first(where: { $0["metadataParts"].array?.first?["text"]["commandRuns"].array?.first?["onTap"]["innertubeCommand"]["commandMetadata"]["webCommandMetadata"]["webPageType"].string != "WEB_PAGE_TYPE_CHANNEL" })
+        
+        video.viewCount = viewCountAndDateJSON?["metadataParts"].array?.first?["text"]["content"].string
+        video.timePosted = viewCountAndDateJSON?["metadataParts"].array?.last?["text"]["content"].string
+        
+        YTThumbnail.appendThumbnails(json: json["contentImage"]["thumbnailViewModel"], thumbnailList: &video.thumbnails)
+        
+        video.timeLength = json["contentImage"]["thumbnailViewModel"]["overlays"].array?.first?["thumbnailOverlayBadgeViewModel"]["thumbnailBadges"].array?.first?["thumbnailBadgeViewModel"]["text"].string
+        
+        return video
+    }
+    
     public static let type: YTSearchResultType = .video
 
     public var id: Int?

Sources/YouTubeKit/YouTubeResponseTypes/Home/HomeScreenResponse.swift

@@ -37,6 +37,8 @@ public struct HomeScreenResponse: ContinuableResponse {
             for video in videosArray {
                 if video["richItemRenderer"]["content"]["videoRenderer"]["videoId"].string != nil, let decodedVideo = YTVideo.decodeJSON(json: video["richItemRenderer"]["content"]["videoRenderer"]) {
                     toReturn.results.append(decodedVideo)
+                } else if video["richItemRenderer"]["content"]["lockupViewModel"].exists(), let video = YTVideo.decodeLockupJSON(json: video["richItemRenderer"]["content"]["lockupViewModel"]) {
+                    toReturn.results.append(video)
                 } else if let continuationToken = video["continuationItemRenderer"]["continuationEndpoint"]["continuationCommand"]["token"].string {
                     toReturn.continuationToken = continuationToken
                 }
@@ -71,6 +73,8 @@ public struct HomeScreenResponse: ContinuableResponse {
                 for video in continuationItemsArray {
                     if video["richItemRenderer"]["content"]["videoRenderer"]["videoId"].string != nil, let decodedVideo = YTVideo.decodeJSON(json: video["richItemRenderer"]["content"]["videoRenderer"]) {
                         toReturn.results.append(decodedVideo)
+                    } else if video["richItemRenderer"]["content"]["lockupViewModel"].exists(), let video = YTVideo.decodeLockupJSON(json: video["richItemRenderer"]["content"]["lockupViewModel"]) {
+                        toReturn.results.append(video)
                     } else if let continuationToken = video["continuationItemRenderer"]["continuationEndpoint"]["continuationCommand"]["token"].string {
                         toReturn.continuationToken = continuationToken
                     }

Tests/YouTubeKitTests/YouTubeKitTests.swift

@@ -797,9 +797,10 @@ final class YouTubeKitTests: XCTestCase {
     }
 
     func testHomeResponse() async throws {
+        YTM.cookies = self.cookies
         let TEST_NAME = "Test: testHomeResponse() -> "
 
-        var homeMenuResult = try await HomeScreenResponse.sendThrowingRequest(youtubeModel: YTM, data: [:])
+        var homeMenuResult = try await HomeScreenResponse.sendThrowingRequest(youtubeModel: YTM, data: [:], useCookies: true)
         guard homeMenuResult.continuationToken != nil else {
             // Could fail because sometimes YouTube gives an empty page telling you to start browsing. We check this case here.
             if !(homeMenuResult.results.count == 0 && homeMenuResult.visitorData != nil) {
@@ -810,7 +811,7 @@ final class YouTubeKitTests: XCTestCase {
 
         XCTAssertNotNil(homeMenuResult.visitorData, TEST_NAME + "Checking if homeMenuResult.visitorData is defined.")
 
-        let homeMenuContinuationResult = try await homeMenuResult.fetchContinuationThrowing(youtubeModel: YTM)
+        let homeMenuContinuationResult = try await homeMenuResult.fetchContinuationThrowing(youtubeModel: YTM, useCookies: true)
 
         guard homeMenuContinuationResult.continuationToken != nil else { XCTFail(TEST_NAME + "Checking if homeMenuContinuationResult.continuationToken is defined."); return }