From 15efac520eee51db6be278e8ebc72d515b70c6c8 Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Wed, 23 Jan 2019 18:23:31 -0600 Subject: [PATCH] Stop trying to pull comments after 10 timeouts --- src/invidious/views/watch.ecr | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr index 832d13d1..db7dcb7b 100644 --- a/src/invidious/views/watch.ecr +++ b/src/invidious/views/watch.ecr @@ -268,8 +268,15 @@ function unsubscribe() { } <% if plid %> -function get_playlist() { +function get_playlist(timeouts = 0) { playlist = document.getElementById("playlist"); + + if (timeouts > 10) { + console.log("Failed to pull playlist"); + playlist.innerHTML = ""; + return; + } + playlist.innerHTML = ' \

\
' @@ -323,15 +330,22 @@ function get_playlist() { comments = document.getElementById("playlist"); comments.innerHTML = '


'; - get_playlist(); + get_playlist(timeouts + 1); }; } get_playlist(); <% end %> -function get_reddit_comments() { +function get_reddit_comments(timeouts = 0) { comments = document.getElementById("comments"); + + if (timeouts > 10) { + console.log("Failed to pull comments"); + comments.innerHTML = ""; + return; + } + var fallback = comments.innerHTML; comments.innerHTML = '

'; @@ -382,12 +396,19 @@ function get_reddit_comments() { xhr.ontimeout = function() { console.log("Pulling comments timed out."); - get_reddit_comments(); + get_reddit_comments(timeouts + 1); }; } -function get_youtube_comments() { +function get_youtube_comments(timeouts = 0) { comments = document.getElementById("comments"); + + if (timeouts > 10) { + console.log("Failed to pull comments"); + comments.innerHTML = ""; + return; + } + var fallback = comments.innerHTML; comments.innerHTML = '

'; @@ -438,7 +459,7 @@ function get_youtube_comments() { comments.innerHTML = '

'; - get_youtube_comments(); + get_youtube_comments(timeouts + 1); }; }