diff --git a/html/poketube.ejs b/html/poketube.ejs index 110b0baa..e3e66523 100644 --- a/html/poketube.ejs +++ b/html/poketube.ejs @@ -941,7 +941,7 @@ display: block; !important;" autoplay controls <% } %> -
+
<% if (!qua) { %> @@ -1732,7 +1732,8 @@ if (userID) { -<% if(!IsOldWindows) { %> + +<% if(IsOldWindows) { %> @@ -2063,7 +2064,7 @@ a {
- <%=inv_vid.title%> + <%=inv_vid.title%>
- <%= k.Video.Channel.subscriberCount %> + <%= k.Video.Channel.subscriberCount.replace("subscribers", "Subs") %>
@@ -2319,7 +2320,7 @@ font-size: 13px;margin:0;padding:0;white-space: nowrap;
-
+
<%-String(channelurlfixer(inv_vid.descriptionHtml)).replace(/\n/g, "
").replace(/twitter\.com/g, "nitter.net").replace(/reddit\.com/g, "teddit.net") %>
@@ -2367,6 +2368,21 @@ the channels social media accounts! <%- instagram.name %>
<% } %> + + <% if (!twitter) { %> + <% if (!discord) { %> + <% if (!reddit) { %> + <% if (!twitch) { %> + + <% if (!instagram) { %> +
+ Nyo connections found ;_; +
+ <% } %> + <% } %> + <% } %> + + <% } %> <% } %>
@@ -2415,14 +2431,54 @@ the channels social media accounts!
-
+
View Channel
- + +
+
Stats for 🤓
+ + Video id : <%=inv_vid.videoId%>
+ ImmersiveAmbientModecolor: <% if (lightOrDark(color) == "light") { %><%=color%> (color 1)<% } %><% if (lightOrDark(color) == "dark") { %> <%=color2%> (color 2) <% } %>
+ Video Format :<% if (!qua) { %> 22 (720p) openh264 ( https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %> + <% if (qua === "medium") { %> 18 (320p) openh264 (https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %>
+ PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%>
+ <% if (isvidious) { %> + + Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location
+ <% } %> + <% if (!isvidious) { %> + + Proxy : tube.kuylar.dev - refresh the page to change the proxy location
+ <% } %> + Date : <%- Date.now() %> - <%- useragent.os.replace("Linux", "GNU/Linux") %> on <%- useragent.browser %>
+ <% if (isvidious) { %> + + Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "mobile "+ u.replace("https://","") ) %>
+ <% } %> + <% if (!isvidious) { %> + + Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "tube.kuylar.dev" ) %>
+ <% } %> + + 143 : true
+
+ @@ -2806,10 +2862,7 @@ timeLinks.forEach(link => { } } }); - -// Set up an interval to check every second -setInterval(checkAndToggleRecommended, 1000); - + function removeParam(paramName) { let searchParams = new URLSearchParams(window.location.search); @@ -2854,7 +2907,8 @@ if (/[?&]autoplay=/.test(location.search)) { function autoplaynextvideo(e) { location.href = "/watch?v=<%- k.Video.Recommendations.Video[0].id%>&autoplay=<%-btoa("1f739d935676111cfff4b4693e3816e664797050" + k.Video.Recommendations.Video[0].id ) %>" } -}var anchor = document.getElementById("sub"); +} + var anchor = document.getElementById("sub"); // Check if there's a user ID in localStorage var userID = localStorage.getItem("UserID"); diff --git a/p/server.js b/p/server.js index 1d82f190..4595afd3 100644 --- a/p/server.js +++ b/p/server.js @@ -1,6 +1,7 @@ const express = require("express"); const fetch = require("node-fetch"); const { URL } = require("url"); +const { Readable } = require("node:stream"); // Array of hostnames that will be proxied const URL_WHITELIST = [ @@ -58,6 +59,8 @@ app.use(function (req, res, next) { * @param {express.Response} res */ const proxy = async (req, res) => { + const { fetch } = await import("undici") + try { let url; @@ -80,7 +83,7 @@ const proxy = async (req, res) => { method: req.method, }); - f.body.pipe(res); +Readable.fromWeb(f.body).pipe(res); } catch (e) { console.log(`==> Error: ${e}`); res.status(500).send("Internal server error"); diff --git a/src/libpoketube/libpoketube-dislikes.js b/src/libpoketube/libpoketube-dislikes.js index daa52590..160810c2 100644 --- a/src/libpoketube/libpoketube-dislikes.js +++ b/src/libpoketube/libpoketube-dislikes.js @@ -48,11 +48,11 @@ class PokeTubeDislikesAPIManager { try { - const engagement = await fetch(fallbackUrl).then((res) => res.json()); + const engagement = await fetch(apiUrl).then((res) => res.json()); return engagement; } catch { try { - const engagement = await fetch(apiUrl).then((res) => res.json()); + const engagement = await fetch(fallbackUrl).then((res) => res.json()); return engagement; } catch { return null;