Refactor embed.js

1 files changed, 7 insertions, 72 deletions

diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr
index eb2b55eb..380a3806 100644
--- a/src/invidious/views/embed.ecr
+++ b/src/invidious/views/embed.ecr
@@ -26,79 +26,14 @@
 <%= rendered "components/player" %>
 
 <script>
-<% if plid %>
-function get_playlist(plid, timeouts = 0) {
-    if (timeouts > 10) {
-        console.log('Failed to pull playlist');
-        return;
-    }
-
-    if (plid.startsWith('RD')) {
-        var plid_url = '/api/v1/mixes/' + plid +
-            '?continuation=<%= video.id %>' +
-            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
-    } else {
-        var plid_url = '/api/v1/playlists/' + plid +
-            '?continuation=<%= video.id %>' +
-            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
-    }
-
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = 'json';
-    xhr.timeout = 20000;
-    xhr.open('GET', plid_url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-                if (xhr.response.nextVideo) {
-                    player.on('ended', function() {
-                        location.assign('/watch?v=' + xhr.response.nextVideo +
-                            '&list=' + plid +
-                            <% if params.listen != preferences.listen %>
-                                '&listen=<%= params.listen %>' +
-                            <% end %>
-                            <% if params.autoplay || params.continue_autoplay %>
-                                '&autoplay=1' +
-                            <% end %>
-                            <% if params.speed != preferences.speed %>
-                                '&speed=<%= params.speed %>' +
-                            <% end %>
-                            ''
-                        );
-                    });
-                }
-            }
-        }
-    }
-
-    xhr.ontimeout = function() {
-        console.log('Pulling playlist timed out.');
-        get_playlist(plid, timeouts + 1);
-    }
+var embed_data = {
+    id: '<%= video.id %>',
+    plid: '<%= plid %>',
+    video_series: <%= video_series.to_json %>,
+    params: <%= params.to_json %>,
+    preferences: <%= preferences.to_json %>
 }
-
-get_playlist('<%= plid %>');
-<% elsif video_series %>
-player.on('ended', function() {
-    location.assign('/embed/<%= video_series.shift %>' +
-        <% if !video_series.empty? %>
-            '?playlist=<%= video_series.join(",") %>' +
-        <% end %>
-        <% if params.listen != preferences.listen %>
-            '&listen=<%= params.listen %>' +
-        <% end %>
-        <% if params.autoplay || params.continue_autoplay %>
-            '&autoplay=1' +
-        <% end %>
-        <% if params.speed != preferences.speed %>
-            '&speed=<%= params.speed %>' +
-        <% end %>
-        ''
-    );
-});
-<% end %>
 </script>
+<script src="/js/embed.js"></script>
 </body>
 </html>