From a78afd1b4638b7dbfbcb6ac3dec9a20ba11e72dc Mon Sep 17 00:00:00 2001 From: PrestonN Date: Fri, 19 Oct 2018 10:45:31 -0400 Subject: [PATCH] Hide videos if behind paywall --- src/js/events.js | 7 ++++--- src/js/videos.js | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/js/events.js b/src/js/events.js index 53490d948..8f3c9d0ee 100644 --- a/src/js/events.js +++ b/src/js/events.js @@ -256,7 +256,7 @@ $(document).on('click', 'a[href^="http"]', (event) => { shell.openExternal(el.href); } else{ - window.open(el.href,"_self") + window.open(el.href,"_self"); } }); @@ -265,9 +265,10 @@ $(document).on('auxclick', 'a[href^="http"]', (event) => { let el = event.currentTarget; if (!el.href.includes('freetube')) { event.preventDefault(); - shell.openExternal(el.href); } else{ - window.open(el.href,"_self") + event.preventDefault(); + let url = el.href.replace('freetube://', ''); + shell.openExternal(el.href); } }); diff --git a/src/js/videos.js b/src/js/videos.js index af14c4b5e..6d01a94cb 100644 --- a/src/js/videos.js +++ b/src/js/videos.js @@ -55,13 +55,17 @@ function search(page = 1) { data.forEach((video) => { switch (video.type) { case 'video': - displayVideo(video, 'search'); + if (!video.paid) { + displayVideo(video, 'search'); + } break; case 'channel': displayChannel(video); break; case 'playlist': - displayPlaylist(video); + if (video.videoCount > 0) { + displayPlaylist(video); + } break; default: }