From f05e1b996a2b74c1d4e34038f4d2debb145ff841 Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Wed, 13 Apr 2022 14:51:36 +0000 Subject: I2P support for search, Imgur and Wikipedia (#189) --- src/pages/options/imgur/imgur.html | 32 +++++++++- src/pages/options/imgur/imgur.js | 30 ++++++++-- src/pages/options/instagram/instagram.html | 4 +- src/pages/options/lbry/lbry.html | 4 +- src/pages/options/medium/medium.html | 4 +- src/pages/options/peertube/peertube.html | 4 +- src/pages/options/pixiv/pixiv.html | 6 +- src/pages/options/reddit/reddit.html | 4 +- src/pages/options/reddit/reddit.js | 2 +- src/pages/options/search/search.html | 76 +++++++++++++++++++++++- src/pages/options/search/search.js | 55 ++++++++++++++++- src/pages/options/sendTargets/sendTargets.html | 4 +- src/pages/options/spotify/spotify.html | 4 +- src/pages/options/tiktok/tiktok.html | 4 +- src/pages/options/translate/translate.html | 6 +- src/pages/options/twitter/twitter.html | 4 +- src/pages/options/wikipedia/wikipedia.html | 30 +++++++++- src/pages/options/wikipedia/wikipedia.js | 21 ++++++- src/pages/options/youtube/youtube.html | 34 +++++------ src/pages/options/youtubeMusic/youtubeMusic.html | 42 ++++++------- src/pages/options/youtubeMusic/youtubeMusic.js | 2 +- 21 files changed, 296 insertions(+), 76 deletions(-) (limited to 'src/pages/options') diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index a769bd06..b00c7d71 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -139,6 +139,7 @@ @@ -167,6 +168,7 @@
+

Default Instances

@@ -178,7 +180,7 @@
- +
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
- - \ No newline at end of file + diff --git a/src/pages/options/imgur/imgur.js b/src/pages/options/imgur/imgur.js index 9742bfd2..26a7d417 100644 --- a/src/pages/options/imgur/imgur.js +++ b/src/pages/options/imgur/imgur.js @@ -18,13 +18,21 @@ protocolElement.addEventListener("change", function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; let torDiv = document.getElementsByClassName("tor")[0]; + let i2pDiv = document.getElementsByClassName("i2p")[0]; if (protocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + i2pDiv.style.display = 'none'; } else if (protocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + i2pDiv.style.display = 'none'; + } + else if (protocol == 'i2p') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'none'; + i2pDiv.style.display = 'block'; } } @@ -32,6 +40,7 @@ imgurHelper.init().then(() => { disableImgurElement.checked = !imgurHelper.getDisable(); let protocol = imgurHelper.getProtocol(); + console.log('protocol', protocol); protocolElement.value = protocol; changeProtocolSettings(protocol); @@ -56,4 +65,15 @@ imgurHelper.init().then(() => { imgurHelper.getRimgoTorCustomRedirects, imgurHelper.setRimgoTorCustomRedirects ); -}); \ No newline at end of file + + commonHelper.processDefaultCustomInstances( + 'rimgo', + 'i2p', + imgurHelper, + document, + imgurHelper.getRimgoI2pRedirectsChecks, + imgurHelper.setRimgoI2pRedirectsChecks, + imgurHelper.getRimgoI2pCustomRedirects, + imgurHelper.setRimgoI2pCustomRedirects + ); +}); diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index baf5166f..ced087b9 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -171,7 +171,7 @@
- +
- +
- +
- +
- +
- +
- +
- +
@@ -210,6 +211,30 @@
+
+
+

Default Instances

+
+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -262,6 +287,30 @@
+
+
+

Default Instances

+
+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -314,6 +363,30 @@
+
+
+

Default Instances

+
+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -324,4 +397,5 @@ - \ No newline at end of file + + diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index d96665e9..0eeac5ed 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -63,12 +63,15 @@ protocolElement.addEventListener("change", function changeProtocolSettings(protocol) { let normalsearxDiv = searxDivElement.getElementsByClassName("normal")[0]; let torsearxDiv = searxDivElement.getElementsByClassName("tor")[0]; + let i2psearxDiv = searxDivElement.getElementsByClassName("i2p")[0]; let normalsearxngDiv = searxngDivElement.getElementsByClassName("normal")[0]; let torsearxngDiv = searxngDivElement.getElementsByClassName("tor")[0]; + let i2psearxngDiv = searxngDivElement.getElementsByClassName("i2p")[0]; let normalwhoogleDiv = whoogleDivElement.getElementsByClassName("normal")[0]; let torwhoogleDiv = whoogleDivElement.getElementsByClassName("tor")[0]; + let i2pwhoogleDiv = whoogleDivElement.getElementsByClassName("i2p")[0]; if (protocol == 'normal') { normalsearxDiv.style.display = 'block'; @@ -77,6 +80,9 @@ function changeProtocolSettings(protocol) { torsearxDiv.style.display = 'none'; torsearxngDiv.style.display = 'none'; torwhoogleDiv.style.display = 'none'; + i2psearxDiv.style.display = 'none'; + i2psearxngDiv.style.display = 'none'; + i2pwhoogleDiv.style.display = 'none'; } else if (protocol == 'tor') { normalsearxDiv.style.display = 'none'; @@ -85,6 +91,20 @@ function changeProtocolSettings(protocol) { torsearxDiv.style.display = 'block'; torsearxngDiv.style.display = 'block'; torwhoogleDiv.style.display = 'block'; + i2psearxDiv.style.display = 'none'; + i2psearxngDiv.style.display = 'none'; + i2pwhoogleDiv.style.display = 'none'; + } + else if (protocol == 'i2p') { + normalsearxDiv.style.display = 'none'; + normalsearxngDiv.style.display = 'none'; + normalwhoogleDiv.style.display = 'none'; + torsearxDiv.style.display = 'none'; + torsearxngDiv.style.display = 'none'; + torwhoogleDiv.style.display = 'none'; + i2psearxDiv.style.display = 'block'; + i2psearxngDiv.style.display = 'block'; + i2pwhoogleDiv.style.display = 'block'; } } @@ -120,6 +140,17 @@ searchHelper.init().then(() => { searchHelper.setSearxTorCustomRedirects ); + commonHelper.processDefaultCustomInstances( + 'searx', + 'i2p', + searchHelper, + document, + searchHelper.getSearxI2pRedirectsChecks, + searchHelper.setSearxI2pRedirectsChecks, + searchHelper.getSearxI2pCustomRedirects, + searchHelper.setSearxI2pCustomRedirects + ); + commonHelper.processDefaultCustomInstances( 'searxng', 'normal', @@ -142,6 +173,17 @@ searchHelper.init().then(() => { searchHelper.setSearxngTorCustomRedirects ); + commonHelper.processDefaultCustomInstances( + 'searxng', + 'i2p', + searchHelper, + document, + searchHelper.getSearxngI2pRedirectsChecks, + searchHelper.setSearxngI2pRedirectsChecks, + searchHelper.getSearxngI2pCustomRedirects, + searchHelper.setSearxngI2pCustomRedirects + ); + commonHelper.processDefaultCustomInstances( 'whoogle', 'normal', @@ -163,4 +205,15 @@ searchHelper.init().then(() => { searchHelper.getWhoogleTorCustomRedirects, searchHelper.setWhoogleTorCustomRedirects ); -}); \ No newline at end of file + + commonHelper.processDefaultCustomInstances( + 'whoogle', + 'i2p', + searchHelper, + document, + searchHelper.getWhoogleI2pRedirectsChecks, + searchHelper.setWhoogleI2pRedirectsChecks, + searchHelper.getWhoogleI2pCustomRedirects, + searchHelper.setWhoogleI2pCustomRedirects + ); +}); diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index 7da5d1fa..786b310b 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -178,7 +178,7 @@
- +
- +
- +
- +
- +
- +
@@ -180,7 +181,7 @@
- +
+ +
+
+

Default Instances

+
+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+ @@ -201,4 +227,4 @@ - \ No newline at end of file + diff --git a/src/pages/options/wikipedia/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js index 1cad27a3..a2dafbfe 100644 --- a/src/pages/options/wikipedia/wikipedia.js +++ b/src/pages/options/wikipedia/wikipedia.js @@ -18,13 +18,21 @@ protocolElement.addEventListener("change", function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; let torDiv = document.getElementsByClassName("tor")[0]; + let i2pDiv = document.getElementsByClassName("i2p")[0]; if (protocol == 'normal') { normalDiv.style.display = 'block'; torDiv.style.display = 'none'; + i2pDiv.style.display = 'none'; } else if (protocol == 'tor') { normalDiv.style.display = 'none'; torDiv.style.display = 'block'; + i2pDiv.style.display = 'none'; + } + else if (protocol == 'i2p') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'none'; + i2pDiv.style.display = 'block'; } } @@ -57,4 +65,15 @@ wikipediaHelper.init().then(() => { wikipediaHelper.getWikilessTorCustomRedirects, wikipediaHelper.setWikilessTorCustomRedirects ) -}) \ No newline at end of file + + commonHelper.processDefaultCustomInstances( + 'wikiless', + 'i2p', + wikipediaHelper, + document, + wikipediaHelper.getWikilessI2pRedirectsChecks, + wikipediaHelper.setWikilessI2pRedirectsChecks, + wikipediaHelper.getWikilessI2pCustomRedirects, + wikipediaHelper.setWikilessI2pCustomRedirects + ) +}) diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 95ebb7d4..e29fefbe 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -15,7 +15,7 @@
- @@ -75,7 +75,7 @@
- + @@ -94,7 +94,7 @@
- + @@ -103,7 +103,7 @@
- + @@ -112,7 +112,7 @@
- + @@ -120,7 +120,7 @@
- + @@ -746,7 +746,7 @@
- +
- +
- +
- + +

Custom Instances

-
-
+
+
+ + +
+
+
+
-
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.js b/src/pages/options/youtubeMusic/youtubeMusic.js index 5ae354d8..597458d3 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.js +++ b/src/pages/options/youtubeMusic/youtubeMusic.js @@ -19,4 +19,4 @@ youtubeMusicHelper.init().then(() => { youtubeMusicHelper.getBeatbumpNormalCustomRedirects, youtubeMusicHelper.setBeatbumpNormalCustomRedirects ) -}); \ No newline at end of file +}); -- cgit 1.4.1