From 5ea86baf06939586ee0a855833b782c28fe7b001 Mon Sep 17 00:00:00 2001 From: Nero Date: Sat, 17 Jun 2023 14:12:32 +0200 Subject: [PATCH] ^Adjust to Invidious --- background.js | 17 +++++------------ options/options.html | 8 +------- options/options.js | 8 ++------ 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/background.js b/background.js index fb5b71b..2aca024 100644 --- a/background.js +++ b/background.js @@ -1,12 +1,8 @@ -let ausnahme = false; -let w2gRegex = /w2g\.tv/; - - // Einstellungen ziehen, ContentScript registrieren browser.storage.local.get( { activated: true, - instance: "redirect.invidio.us", + instance: "yewtu.be", } ).then((storage) => { if (storage.activated) { @@ -71,25 +67,22 @@ browser.webRequest.onBeforeRequest.addListener(async (details) => { let activated; let instance; - let proxy; - let imageRedirect; await browser.storage.local.get({ activated: true, - instance: "redirect.invidio.us", - imageRedirect: true + instance: "yewtu.be", }).then((item) => { activated = item.activated; instance = item.instance; - imageRedirect = item.imageRedirect; }); if (activated) { const youtubeRegex = /youtube.com(\/?.*)/; const youtubeShortRegex = /youtu.be\/.+/; - if (imageRedirect && details.url.startsWith("https://img.youtube.com/vi")) { - return { redirectUrl: 'https://' + proxy + '/vi/' + details.url.split("/vi/")[1].split("/")[0] + "/hqdefault.jpg?host=i.ytimg.com" } + if (details.url.startsWith("https://img.youtube.com/vi")) { + console.log("JOOOOO"); + return { redirectUrl: 'https://' + instance + '/vi/' + details.url.split("/vi/")[1].split("/")[0] + "/mqdefault.jpg" } } else if (youtubeRegex.test(details.url)) { return { redirectUrl: 'https://' + instance + youtubeRegex.exec(details.url)[1] }; diff --git a/options/options.html b/options/options.html index ab80030..c338743 100644 --- a/options/options.html +++ b/options/options.html @@ -81,18 +81,12 @@ - +

Instance URL:
- Redirect images - ❓ -

diff --git a/options/options.js b/options/options.js index a5f0c94..ac6207e 100644 --- a/options/options.js +++ b/options/options.js @@ -3,14 +3,12 @@ document.querySelector("form").addEventListener("submit", (e) => { e.preventDefault(); let instance = document.querySelector("#instance").value.trim(); instance = instance.replace(/^https?:?\/?\/?/, '').replace('\/$'); - proxy = proxy.replace(/^https?:?\/?\/?/, '').replace('\/$'); - if (!instance || !proxy) { + if (!instance) { return alert("Please fill out the fields!"); } browser.storage.local.set({ instance: instance, - imageRedirect: document.querySelector("#imageRedirect").checked }).then(() => alert("Saved!")); }); @@ -18,10 +16,8 @@ document.querySelector("form").addEventListener("submit", (e) => { // Restore options document.addEventListener("DOMContentLoaded", () => { browser.storage.local.get({ - imageRedirect: true, - instance: "redirect.invidio.us", + instance: "yewtu.be", }).then((item) => { document.querySelector("#instance").value = item.instance; - document.querySelector("#imageRedirect").checked = item.imageRedirect; }); }); \ No newline at end of file