Adjust parsing of channel page continuation (#115)

* Fix title assignment * Map `channelId` and `channeName` when metadata is not present * Linted
FreeTubeApp · Nov 2, 2022 · 25681ca · 25681ca
1 parent b23e6b9
commit 25681ca
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/app/helper.js b/app/helper.js
@@ -189,7 +189,7 @@ class YoutubeGrabberHelper {
     if (typeof (obj.richItemRenderer) !== 'undefined') {
       video = obj.richItemRenderer.content.videoRenderer
       video.lengthSeconds = video.lengthText.simpleText.split(':').reduce((acc, time) => (60 * acc) + +time)
-      video.title.simpleText = video.title.runs.at(0)
+      video.title.simpleText = video.title.runs.at(0).text
     } else if (typeof (obj.reelItemRenderer) !== 'undefined') {
       video = obj.reelItemRenderer
       video.title = video.headline

diff --git a/app/youtube-grabber.js b/app/youtube-grabber.js
@@ -247,13 +247,24 @@ class YoutubeGrabber {
       nextContinuation = continuationItem[0].continuationItemRenderer.continuationEndpoint.continuationCommand.token
     }
 
-    const channelMetaData = channelPageResponse.data.metadata.channelMetadataRenderer
-    const channelName = channelMetaData.title
-    const channelId = channelMetaData.externalId
+    const channelMetaData = channelPageResponse.data?.metadata?.channelMetadataRenderer
+    let channelInfo = {}
+    if (channelMetaData) {
+      const channelName = channelMetaData.title
+      const channelId = channelMetaData.externalId
+
+      channelInfo = {
+        channelId,
+        channelName
+      }
+    } else {
+      const firstVideoTitle = continuationData[0].richItemRenderer.content.videoRenderer.title
+      const firstPublishTimeText = continuationData[0].richItemRenderer.content.videoRenderer.publishedTimeText
 
-    const channelInfo = {
-      channelId: channelId,
-      channelName: channelName
+      channelInfo = {
+        channelId: channelPageResponse.data.responseContext.serviceTrackingParams.find((service) => service.service === 'GOOGLE_HELP').params[0].value,
+        channelName: new RegExp(`${firstVideoTitle.runs[0].text} by (.*?) ${firstPublishTimeText.simpleText}`, 'g').exec(firstVideoTitle.accessibility.accessibilityData.label)[1]
+      }
     }
 
     const nextVideos = continuationData.filter((item) => {