From 5843313421c4d19d011ace3ff77418e534f49f9e Mon Sep 17 00:00:00 2001 From: tomit4 Date: Mon, 28 Nov 2022 20:57:15 -0800 Subject: [PATCH 1/4] Added support for quetre --- background.js | 52 +++++++++++++++------------------------------------ popup.html | 18 +++++++----------- popup.js | 15 +++++++-------- 3 files changed, 29 insertions(+), 56 deletions(-) diff --git a/background.js b/background.js index a35dd98..bc3da53 100644 --- a/background.js +++ b/background.js @@ -1,4 +1,5 @@ const twitterUrls = ["*://twitter.com/*", "*://mobile.twitter.com/*"]; +const quoraUrls = ["*://www.quora.com/*", "*://quora.com/*"]; const redditUrls = ["*://reddit.com/*", "*://www.reddit.com/*"]; const youtubeUrls = [ "*://youtube.com/*", @@ -7,13 +8,6 @@ const youtubeUrls = [ "*://youtu.be/*", ]; const mediumUrls = ["*://medium.com/*", "*://*.medium.com/*"]; -const instagramUrls = [ - "*://www.instagram.com/*", - "*://instagram.com/*", - "*://www.instagr.am/*", - "*://instagr.am/*", -]; - const allInstances = { nitter: [ "nitter.net", @@ -24,11 +18,7 @@ const allInstances = { teddit: ["teddit.net", "teddit.ggc-project.de", "teddit.kavin.rocks"], invidious: ["invidious.snopyta.org", "yewtu.be"], scribe: ["scribe.rip", "scribe.nixnet.services", "scribe.citizen4.eu"], - bibliogram: [ - "bibliogram.art", - "bibliogram.snopyta.org", - "bibliogram.pussthecat.org", - ], + quetre: ["quetre.iket.me", "quetre.vern.cc", "quetre.pussthecat.org"], }; let allInstancesArray = []; @@ -41,13 +31,13 @@ let currentInstances = { teddit: "teddit.net", invidious: "yewtu.be", scribe: "scribe.rip", - bibliogram: "bibliogram.art", + quetre: "quetre.iket.me", disable: false, disable_nitter: false, disable_teddit: false, disable_invidious: false, disable_scribe: false, - disable_bibliogram: false, + disable_quetre: false, }; function replaceUrl(url, regex, newDomain) { @@ -74,9 +64,7 @@ function redirect(requestDetails) { const youtubeRegex = /(https?):\/\/(youtube.com|m.youtube.com|www.youtube.com|youtu.be)\/(.*)/; const mediumRegex = /https?:\/\/(?:.*\.)*(? Nitter if (!currentInstances.disable_nitter && twitterRegex.test(originalUrl)) { @@ -122,25 +110,15 @@ function redirect(requestDetails) { return { redirectUrl: newUrl }; } - // Instagram → Bibliogram - if (!currentInstances.disable_bibliogram) { - if (instagramPostRegex.test(originalUrl)) { - const newUrl = originalUrl.replace( - /https?:\/\/((www\.)?(instagram.com|instagr.am))/, - `https://${currentInstances.bibliogram}` - ); - console.log("New URL ", newUrl); - return { redirectUrl: newUrl }; - } - - if (instagramRegex.test(originalUrl)) { - const newUrl = originalUrl.replace( - /https?:\/\/((www\.)?(instagram.com|instagr.am))/, - `https://${currentInstances.bibliogram}/u` - ); - console.log("New URL ", newUrl); - return { redirectUrl: newUrl }; - } + // Quora → Quetre + if (!currentInstances.disable_quetre && quoraRegex.test(originalUrl)) { + const newUrl = replaceUrl( + originalUrl, + quoraRegex, + currentInstances.quetre + ); + console.log("New URL ", newUrl); + return { redirectUrl: newUrl }; } // Other Instance -> Current Instance @@ -216,7 +194,7 @@ browser.webRequest.onBeforeRequest.addListener( ...redditUrls, ...youtubeUrls, ...mediumUrls, - ...instagramUrls, + ...quoraUrls, ...allInstancesArray, ], types: ["main_frame"], diff --git a/popup.html b/popup.html index 0801483..ac2ffbb 100644 --- a/popup.html +++ b/popup.html @@ -43,23 +43,19 @@
- Bibliogram instances - - + Scribe instances + +
- Scribe instances - - + Quetre instances + +
diff --git a/popup.js b/popup.js index c8b0a80..76db3c2 100644 --- a/popup.js +++ b/popup.js @@ -169,6 +169,7 @@ document.forms[0].onsubmit = (e) => { teddit: getInputValue(data.teddit.el), invidious: getInputValue(data.invidious.el), scribe: getInputValue(data.scribe.el), + quetre: getInputValue(data.quetre.el), disable: data.disable.el.checked, disable_nitter: !data.switch_nitter.el.checked, disable_teddit: !data.switch_teddit.el.checked, From 0c2be9714b194415fa2268cafc57a6e06fd997fa Mon Sep 17 00:00:00 2001 From: tomit4 Date: Sun, 4 Dec 2022 15:54:10 -0800 Subject: [PATCH 3/4] Added other quetre instances(commented out) --- background.js | 1 + 1 file changed, 1 insertion(+) diff --git a/background.js b/background.js index bc3da53..ed6fced 100644 --- a/background.js +++ b/background.js @@ -19,6 +19,7 @@ const allInstances = { invidious: ["invidious.snopyta.org", "yewtu.be"], scribe: ["scribe.rip", "scribe.nixnet.services", "scribe.citizen4.eu"], quetre: ["quetre.iket.me", "quetre.vern.cc", "quetre.pussthecat.org"], + // quetre: ["quetre.odyssey346.dev", quetre.tokhmi.xyz, quetre.privacydev.net], }; let allInstancesArray = []; From 33cc80b0658bb31791a10039d40e5ed9e01a7bff Mon Sep 17 00:00:00 2001 From: tomit4 Date: Sun, 4 Dec 2022 20:24:21 -0800 Subject: [PATCH 4/4] First draft of openstreetmap integration --- background.js | 17 +++++++++++++++++ popup.html | 10 ++++++++++ popup.js | 15 ++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/background.js b/background.js index ed6fced..bc7a460 100644 --- a/background.js +++ b/background.js @@ -1,5 +1,6 @@ const twitterUrls = ["*://twitter.com/*", "*://mobile.twitter.com/*"]; const quoraUrls = ["*://www.quora.com/*", "*://quora.com/*"]; +const gmapsUrls= ["*://www.google.com/maps*", "*://google.com/maps*"]; const redditUrls = ["*://reddit.com/*", "*://www.reddit.com/*"]; const youtubeUrls = [ "*://youtube.com/*", @@ -19,6 +20,7 @@ const allInstances = { invidious: ["invidious.snopyta.org", "yewtu.be"], scribe: ["scribe.rip", "scribe.nixnet.services", "scribe.citizen4.eu"], quetre: ["quetre.iket.me", "quetre.vern.cc", "quetre.pussthecat.org"], + osm: ["openstreetmap.org"], // quetre: ["quetre.odyssey346.dev", quetre.tokhmi.xyz, quetre.privacydev.net], }; @@ -33,12 +35,14 @@ let currentInstances = { invidious: "yewtu.be", scribe: "scribe.rip", quetre: "quetre.iket.me", + osm: "openstreetmap.org", disable: false, disable_nitter: false, disable_teddit: false, disable_invidious: false, disable_scribe: false, disable_quetre: false, + disable_osm: false, }; function replaceUrl(url, regex, newDomain) { @@ -66,6 +70,7 @@ function redirect(requestDetails) { /(https?):\/\/(youtube.com|m.youtube.com|www.youtube.com|youtu.be)\/(.*)/; const mediumRegex = /https?:\/\/(?:.*\.)*(? Nitter if (!currentInstances.disable_nitter && twitterRegex.test(originalUrl)) { @@ -122,6 +127,17 @@ function redirect(requestDetails) { return { redirectUrl: newUrl }; } + // Gmaps → OSM + if (!currentInstances.disable_osm && gmapsRegex.test(originalUrl)) { + const newUrl = replaceUrl( + originalUrl, + gmapsRegex, + `${currentInstances.osm}/search?query=` + ); + console.log("New URL ", newUrl); + return { redirectUrl: newUrl }; + } + // Other Instance -> Current Instance if ( allInstancesArray.findIndex((instance) => @@ -196,6 +212,7 @@ browser.webRequest.onBeforeRequest.addListener( ...youtubeUrls, ...mediumUrls, ...quoraUrls, + ...gmapsUrls, ...allInstancesArray, ], types: ["main_frame"], diff --git a/popup.html b/popup.html index daba254..70e7094 100644 --- a/popup.html +++ b/popup.html @@ -62,6 +62,16 @@ +
+ OpenStreetMap instances + + + + +