From 8aaa41de3df33c3371a789f843d1922af6b96a95 Mon Sep 17 00:00:00 2001 From: ashley Date: Wed, 8 May 2024 13:56:04 +0000 Subject: [PATCH 1/7] remove IE support :p --- css/app.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css/app.js b/css/app.js index a51efc90..0e99f4d8 100644 --- a/css/app.js +++ b/css/app.js @@ -82,6 +82,14 @@ document.addEventListener('DOMContentLoaded', function() { window.addEventListener('resize', lazyLoadBg); }); +const htmlContent = `Browser is not supported :p

Heyo :3


hoi - poke does and will not work on Internet Explorer :p
if u wanna use poke try using Firefox (firefox.com) or Chromium :3
love u :3

`; + + if (/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) { + document.open(); + document.write(htmlContent); + document.close(); +} + // Fade in elements on scroll or fullscreen change function fadeInElements() { const elements = document.querySelectorAll('.fade-in'); From ba5fa3f4e84c5e378e1e5323472521c6c8f5a9d7 Mon Sep 17 00:00:00 2001 From: ashley Date: Wed, 8 May 2024 13:57:37 +0000 Subject: [PATCH 2/7] bump bundle version :3 --- html/poketube.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/poketube.ejs b/html/poketube.ejs index 07c0f7ec..11d6a831 100644 --- a/html/poketube.ejs +++ b/html/poketube.ejs @@ -1993,7 +1993,7 @@ window.addEventListener("unload", cleanup) - + From bcdab7785683ea7a4d44b10614e8597b5ed9f8c2 Mon Sep 17 00:00:00 2001 From: ashley Date: Wed, 8 May 2024 21:19:47 +0000 Subject: [PATCH 3/7] more poketube --> poke --- instances.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/instances.json b/instances.json index a2f77dec..95b1c23e 100644 --- a/instances.json +++ b/instances.json @@ -8,9 +8,9 @@ "proxy": true, "official": true, "DEFAULT": true, - "region": "πŸ‡ΊπŸ‡Έ", + "region": "πŸ‡©πŸ‡ͺ", "software": { - "name": "poketube", + "name": "poke", "version": "lastest", "branch": "dev" } @@ -24,7 +24,7 @@ "piwik": false, "region": "πŸ‡ΊπŸ‡Έ", "software": { - "name": "poketube", + "name": "poke", "version": "lastest", "branch": "dev" } @@ -38,7 +38,7 @@ "piwik": false, "region": "πŸ‡ΊπŸ‡Έ", "software": { - "name": "poketube", + "name": "poke", "version": "latest", "branch": "dev" } @@ -52,7 +52,7 @@ "piwik": false, "region": "πŸ‡¬πŸ‡§", "software": { - "name": "poketube", + "name": "poke", "version": "latest", "branch": "dev" } @@ -67,7 +67,7 @@ "proxy": false, "region": "πŸ‡ΊπŸ‡Έ", "software": { - "name": "poketube", + "name": "poke", "version": "latest", "branch": "dev" } @@ -97,7 +97,7 @@ "proxy": false, "region": "πŸ‡³πŸ‡±", "software": { - "name": "poketube", + "name": "poke", "version": "latest", "branch": "dev" } @@ -111,7 +111,7 @@ "proxy": false, "region": "πŸ‡³πŸ‡±", "software": { - "name": "poketube", + "name": "poke", "version": "latest", "branch": "dev" } From c6cb1334b22cab57d8b81c2992c62ea5c7095b23 Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 9 May 2024 13:43:29 +0000 Subject: [PATCH 4/7] oops --- src/libpoketube/libpoketube-youtubei-objects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libpoketube/libpoketube-youtubei-objects.json b/src/libpoketube/libpoketube-youtubei-objects.json index 6b09d629..e462c7bf 100644 --- a/src/libpoketube/libpoketube-youtubei-objects.json +++ b/src/libpoketube/libpoketube-youtubei-objects.json @@ -14,7 +14,7 @@ "INNERTUBE_CONTEXT_CLIENT_NAME": "1", "INNERTUBE_CONTEXT_CLIENT_VERSION": "2.20240214.05.00", "INNERTUBE_CONTEXT_GL": "US", - "INNERTUBE_CONTEXT_HL": "en-US" + "INNERTUBE_CONTEXT_HL": "en" }, "LATEST_ECATCHER_SERVICE_PARAMS": { "client.name": "WEB" }, "INNERTUBE_API_KEYS": { From 3a3cacb6d081d7bdd0bf5cc3cfbd04e462f6609b Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 9 May 2024 14:37:29 +0000 Subject: [PATCH 5/7] add poke.blahai.gay --- instances.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/instances.json b/instances.json index 95b1c23e..52e4f08b 100644 --- a/instances.json +++ b/instances.json @@ -116,5 +116,19 @@ "branch": "dev" } } + ], [ + "poke.blahai.gay", + { + "uri": "https://poke.blahai.gay/", + "CLOUDFLARE": true, + "piwik": false, + "proxy": false, + "region": "πŸ‡©πŸ‡ͺ", + "software": { + "name": "poke", + "version": "latest", + "branch": "dev" + } + } ] ] From fd26924324d07726d6fe36ed819eb2c377cebf89 Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 9 May 2024 14:58:20 +0000 Subject: [PATCH 6/7] add commmit field --- src/libpoketube/init/pages-api.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libpoketube/init/pages-api.js b/src/libpoketube/init/pages-api.js index 9920e383..d7e73a1c 100644 --- a/src/libpoketube/init/pages-api.js +++ b/src/libpoketube/init/pages-api.js @@ -30,6 +30,7 @@ const pkg = require("../../../package.json"); const os = require('os'); const cnf = require("../../../config.json"); const innertube = require("../libpoketube-youtubei-objects.json"); +const { exec } = require('child_process'); const verfull = "v24.0605-VeE-MINOR_UPDATE-stable-dev-nonLTS-git-MTcxNTAwOTczNQ=="; const versmol = "v24.0605-vEe" @@ -211,6 +212,8 @@ app.use("/sb/i/:v/:imagePath/:img", async function (req, res) { }); app.get("/api/version.json", async (req, res) => { + let latestCommitHash; + const invidious = await modules .fetch("https://invid-api.poketube.fun/api/v1/stats") .then((res) => res.text()) @@ -220,12 +223,15 @@ app.use("/sb/i/:v/:imagePath/:img", async function (req, res) { const totalMemory = os.totalmem() / (1024 * 1024 * 1024); const roundedMemory = totalMemory.toFixed(2); + exec('git rev-list HEAD -n 1 --abbrev-commit', (error, stdout, stderr) => latestCommitHash = error || stderr ? console.error(`Error executing command: ${error || stderr}`) : stdout.trim()); + const response = { pt_version: { version:versmol, version_full:verfull }, branch, + commit: latestCommitHash, updatequote, relaseunixdate, vernum: versionnumber, From 62d7def602c090f9196d700cab0d9eee389f8e83 Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 9 May 2024 15:03:50 +0000 Subject: [PATCH 7/7] test commit ignore pls --- src/libpoketube/init/pages-api.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libpoketube/init/pages-api.js b/src/libpoketube/init/pages-api.js index d7e73a1c..94b4b3c9 100644 --- a/src/libpoketube/init/pages-api.js +++ b/src/libpoketube/init/pages-api.js @@ -223,7 +223,14 @@ app.use("/sb/i/:v/:imagePath/:img", async function (req, res) { const totalMemory = os.totalmem() / (1024 * 1024 * 1024); const roundedMemory = totalMemory.toFixed(2); - exec('git rev-list HEAD -n 1 --abbrev-commit', (error, stdout, stderr) => latestCommitHash = error || stderr ? console.error(`Error executing command: ${error || stderr}`) : stdout.trim()); +exec('git rev-list HEAD -n 1 --abbrev-commit', (error, stdout, stderr) => { + if (error || stderr) { + console.error(`Error executing command: ${error || stderr}`); + return; + } + + latestCommitHash = stdout.trim(); + }); const response = { pt_version: {