Add checks for if a channel has been removed and when a channel has n…

…o videos
FreeTubeApp · Sep 12, 2020 · 0525766 · 0525766
1 parent 75f42ab
commit 0525766
Show file tree

Hide file tree

Showing 3 changed files with 431 additions and 637 deletions.
diff --git a/app/helper.js b/app/helper.js
@@ -32,9 +32,17 @@ class YoutubeGrabberHelper {
     const channelName = channelMetaData.title
     const channelVideoData = response.data[1].response.contents.twoColumnBrowseResultsRenderer.tabs[1].tabRenderer.content.sectionListRenderer.contents[0].itemSectionRenderer.contents[0].gridRenderer
 
+    if (typeof (channelVideoData) === 'undefined') {
+      // Channel has no videos
+      return {
+        items: [],
+        continuation: null
+      }
+    }
+
     let continuation = null
 
-    if (typeof (channelVideoData.continuations) !== 'undefined') {
+    if (typeof channelVideoData.continuations !== 'undefined') {
       continuation = channelVideoData.continuations[0].nextContinuationData.continuation
     }
 

diff --git a/app/youtube-grabber.js b/app/youtube-grabber.js
@@ -26,6 +26,11 @@ class YoutubeGrabber {
       }
     }
 
+    if (typeof (channelPageResponse.data[1].response.alerts) !== 'undefined') {
+      const alert = channelPageResponse.data[1].response.alerts[0].alertRenderer.text.simpleText
+      return Promise.reject(alert)
+    }
+
     const channelMetaData = channelPageResponse.data[1].response.metadata.channelMetadataRenderer
     const channelHeaderData = channelPageResponse.data[1].response.header.c4TabbedHeaderRenderer
     const channelContentsData = channelPageResponse.data[1].response.contents.twoColumnBrowseResultsRenderer