diff --git a/html/watch.ejs b/html/watch.ejs index 767cb9ed..836e19b2 100644 --- a/html/watch.ejs +++ b/html/watch.ejs @@ -31,7 +31,7 @@ <% if(secure) { %><% } %><% if(!secure) { %><% } %> - + @@ -39,25 +39,25 @@ <% } %> <% if (!e) { %> - + - - - - long video from <%=VideoObject?.author%> On Poke! + + + + long video from <%=VideoData?.author%> On Poke! 👍 <%=convert(engagement?.likes)%> | 👎 <%=convert(engagement?.dislikes)%> | 📈 <%=convert(engagement.viewCount)%> Views 🗓️ <%= date.replace("Premiered", " ") %> 💬 <% if (!isNaN(inv.commentCount)) { %><%= inv.commentCount.toLocaleString() %> <% } else { %> 0 <% } %>" property=twitter:description> - + - + <% } %> -<%= VideoObject?.title %> | <%= /^[A-Z]/.test(VideoObject.title) ? 'Watch' : 'watch' %> +<%= VideoData?.title %> | <%= /^[A-Z]/.test(VideoData.title) ? 'Watch' : 'watch' %> - <% if (VideoObject.videoId == "QrGrOK8oZG8") { %> + <% if (VideoData.videoId == "QrGrOK8oZG8") { %> - <% if (Array.isArray(VideoObject?.keywords)) { %> + <% if (Array.isArray(VideoData?.keywords)) { %>
- <% if (VideoObject?.keywords && VideoObject.keywords.length > 0) { %> - <% VideoObject?.keywords.forEach(x => { %> + <% if (VideoData?.keywords && VideoData.keywords.length > 0) { %> + <% VideoData?.keywords.forEach(x => { %>
<%=x %> @@ -1610,7 +1610,7 @@ WIP! - <% if (VideoObject.genre === "Gaming") { %> + <% if (VideoData.genre === "Gaming") { %>
Poke! Games Hub
@@ -1714,25 +1714,25 @@ WIP!
- + Download <% if (!video?.Channel.Name.endsWith(' - Topic')) { %> - <% if (!VideoObject.title.endsWith('Audio)')) { %> + <% if (!VideoData.title.endsWith('Audio)')) { %> - + Encryption <% }%><% }%> - <% if (video?.Channel.Name.endsWith(' - Topic') || VideoObject.title.endsWith('Audio)')) { %> + <% if (video?.Channel.Name.endsWith(' - Topic') || VideoData.title.endsWith('Audio)')) { %> - <% if (video?.Channel.Name.endsWith(' - Topic') || VideoObject.title.endsWith('Audio)')) { %> - + <% if (video?.Channel.Name.endsWith(' - Topic') || VideoData.title.endsWith('Audio)')) { %> + Open In Music Player @@ -1813,14 +1813,14 @@ WIP!
<% if (universe) { %> - <% if (VideoObject.author == "7clouds") { %> + <% if (VideoData.author == "7clouds") { %>
-<% if (VideoObject.author !== "7clouds") { %> +<% if (VideoData.author !== "7clouds") { %>
- > <%-VideoObject.title.replace(/\/channel\//g, "/channel?id=").replace(/https:\/\/youtube.com/g, ""); %> + > <%-VideoData.title.replace(/\/channel\//g, "/channel?id=").replace(/https:\/\/youtube.com/g, ""); %>
@@ -1851,12 +1851,12 @@ WIP!
- + Recommended Videos
- Uploaded by <%=VideoObject.author%> + Uploaded by <%=VideoData.author%>
@@ -1868,7 +1868,7 @@ Recommended Videos <% if (!r) { %> - <% if (VideoObject.recommendedVideos.length > 1) { %> + <% if (VideoData.recommendedVideos.length > 1) { %>
@@ -1878,17 +1878,17 @@ Recommended Videos <% if (!f) { %> -<% if (VideoObject.recommendedVideos) { %> +<% if (VideoData.recommendedVideos) { %> <% const musicChannels = new Set(); -VideoObject?.recommendedVideos.forEach(video => { +VideoData?.recommendedVideos.forEach(video => { if (video.title.toLowerCase().includes("official video") || video.title.toLowerCase().includes("official music video") || video.title.toLowerCase().includes("official audio")) { musicChannels.add(video.authorId); } }); %> -<% VideoObject?.recommendedVideos.forEach(x => { %> +<% VideoData?.recommendedVideos.forEach(x => { %>
<% if (!optout) { %> @@ -1936,7 +1936,7 @@ VideoObject?.recommendedVideos.forEach(video => { <% } %> <% } %> - <% if (!VideoObject.recommendedVideos) { %> + <% if (!VideoData.recommendedVideos) { %>

oops

<% } %> @@ -1977,7 +1977,7 @@ VideoObject?.recommendedVideos.forEach(video => { <% if (r === "f") { %>
@@ -2001,12 +2001,12 @@ VideoObject?.recommendedVideos.forEach(video => {
<% if (optout) { %> - Lyrics (Wow) + Lyrics (Wow) <% } %> <% if (!optout) { %> - Lyrics (Wow) + Lyrics (Wow) <% } %>
<% } %> @@ -2036,7 +2036,7 @@ VideoObject?.recommendedVideos.forEach(video => { } } -<% if (Array.isArray(VideoObject.recommendedVideos) && VideoObject.recommendedVideos.length > 1) { %> +<% if (Array.isArray(VideoData.recommendedVideos) && VideoData.recommendedVideos.length > 1) { %> let checkbox = document.getElementById("continue"); @@ -2044,10 +2044,10 @@ checkbox.addEventListener('change', function(e) { if (checkbox.checked) { console.log("[AUTOPLAY] enabled"); document.getElementById('video').addEventListener('ended', autoplaynextvideo, false); - let url = window.location.hostname + "/watch?v=<%- VideoObject?.recommendedVideos[0]?.videoId %>"; + let url = window.location.hostname + "/watch?v=<%- VideoData?.recommendedVideos[0]?.videoId %>"; function autoplaynextvideo(e) { - location.href = "/watch?v=<%- VideoObject?.recommendedVideos[0]?.videoId%>&autoplay=<%-btoa("1f739d935676111cfff4b4693e3816e664797050" + VideoObject?.recommendedVideos[0].videoId) %>"; + location.href = "/watch?v=<%- VideoData?.recommendedVideos[0]?.videoId%>&autoplay=<%-btoa("1f739d935676111cfff4b4693e3816e664797050" + VideoData?.recommendedVideos[0].videoId) %>"; } } if (/[?&]autoplay=/.test(location.search)) { @@ -2058,7 +2058,7 @@ checkbox.addEventListener('change', function(e) { if (/[?&]autoplay=/.test(location.search)) { if (checkbox.checked) { - fetch("https://" + window.location.hostname + "/watch?v=<%- VideoObject?.recommendedVideos[0].videoId%>").then(() => {}) + fetch("https://" + window.location.hostname + "/watch?v=<%- VideoData?.recommendedVideos[0].videoId%>").then(() => {}) } } }); @@ -2082,7 +2082,7 @@ checkbox.addEventListener('change', function(e) { if (/[?&]autoplay=/.test(location.search)) { checkbox.checked = true; console.log("[AUTOPLAY] enabled"); - let url = window.location.hostname + "/watch?v=<%- VideoObject?.recommendedVideos[0].videoId%>"; + let url = window.location.hostname + "/watch?v=<%- VideoData?.recommendedVideos[0].videoId%>"; document.body.style.cursor = "wait"; // set cursor to "wait" before the fetch request starts fetch(url) .then(response => response.json()) @@ -2097,11 +2097,11 @@ if (/[?&]autoplay=/.test(location.search)) { document.getElementById('video').addEventListener('ended', autoplaynextvideo, false); if (/[?&]autoplay=/.test(location.search)) { if (checkbox.checked) { - fetch("https://" + window.location.hostname + "/watch?v=<%- VideoObject?.recommendedVideos[0].videoId%>").then(() => {}) + fetch("https://" + window.location.hostname + "/watch?v=<%- VideoData?.recommendedVideos[0].videoId%>").then(() => {}) } } function autoplaynextvideo(e) { - location.href = "/watch?v=<%- VideoObject?.recommendedVideos[0].videoId%>&autoplay=<%-btoa("1f739d935676111cfff4b4693e3816e664797050" + VideoObject?.recommendedVideos[0].videoId) %>"; + location.href = "/watch?v=<%- VideoData?.recommendedVideos[0].videoId%>&autoplay=<%-btoa("1f739d935676111cfff4b4693e3816e664797050" + VideoData?.recommendedVideos[0].videoId) %>"; } } <% } %> @@ -2168,13 +2168,13 @@ if (/[?&]autoplay=/.test(location.search)) { if (userID) { // If user ID exists in localStorage, set the href attribute - anchor.href = `/api/set-channel-subs?ID=${userID}&channelName=<%=VideoObject.author%>&avatar=<%- media_proxy_url %>/proxy?url=<%= VideoObject.authorThumbnails[1].url %>&channelID=<%=video?.Channel.id || VideoObject.authorId %>`; + anchor.href = `/api/set-channel-subs?ID=${userID}&channelName=<%=VideoData.author%>&avatar=<%- media_proxy_url %>/proxy?url=<%= VideoData.authorThumbnails[1].url %>&channelID=<%=video?.Channel.id || VideoData.authorId %>`; } else { anchor.href = "/account-create" } - + <% if(IsOldWindows) { %> @@ -2387,20 +2387,20 @@ window.addEventListener("unload", cleanup) <% } %> <% if (!e) { %> - + - + - - - - + + + + - + <% } %> - <%=VideoObject.title%> | PokeTube Mobile + <%=VideoData.title%> | PokeTube Mobile @@ -2561,7 +2561,7 @@ a {
-