From c89f9cd7852ecd94a1c00569f6e80e542a34a517 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 16 Mar 2022 10:59:34 +0300 Subject: Added librarian #78 --- src/pages/background/background.js | 60 ++++---- src/pages/options/general/general.html | 11 ++ src/pages/options/imgur/imgur.html | 4 + src/pages/options/instagram/instagram.html | 4 + src/pages/options/lbry/lbry.html | 176 +++++++++++++++++++++++ src/pages/options/lbry/lbry.js | 59 ++++++++ src/pages/options/maps/maps.html | 4 + src/pages/options/medium/medium.html | 4 + src/pages/options/peertube/peertube.html | 4 + src/pages/options/peertube/peertube.js | 6 +- src/pages/options/pixiv/pixiv.html | 4 + src/pages/options/reddit/reddit.html | 4 + src/pages/options/search/search.html | 4 + src/pages/options/sendTargets/sendTargets.html | 4 + src/pages/options/tiktok/tiktok.html | 4 + src/pages/options/translate/translate.html | 4 + src/pages/options/twitter/twitter.html | 4 + src/pages/options/wikipedia/wikipedia.html | 4 + src/pages/options/youtube/youtube.html | 4 + src/pages/options/youtubeMusic/youtubeMusic.html | 4 + src/pages/popup/popup.html | 8 ++ src/pages/popup/popup.js | 18 ++- 22 files changed, 365 insertions(+), 33 deletions(-) create mode 100644 src/pages/options/lbry/lbry.html create mode 100644 src/pages/options/lbry/lbry.js (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 779d0e95..b9a44075 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -14,28 +14,30 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; +import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; import generalHelper from "../../assets/javascripts/helpers/general.js"; import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; window.browser = window.browser || window.chrome; async function wholeInit() { - await youtubeHelper.init() - await youtubeMusicHelper.init() - await twitterHelper.init() - await instagramHelper.init() - await mapsHelper.init() - await searchHelper.init() - await translateHelper.init() - await mediumHelper.init() - await redditHelper.init() - await wikipediaHelper.init() - await imgurHelper.init() - await tiktokHelper.init() - await pixivHelper.init() - await sendTargetsHelper.init() - await peertubeHelper.init() - await generalHelper.init() + await youtubeHelper.init(); + await youtubeMusicHelper.init(); + await twitterHelper.init(); + await instagramHelper.init(); + await mapsHelper.init(); + await searchHelper.init(); + await translateHelper.init(); + await mediumHelper.init(); + await redditHelper.init(); + await wikipediaHelper.init(); + await imgurHelper.init(); + await tiktokHelper.init(); + await pixivHelper.init(); + await sendTargetsHelper.init(); + await peertubeHelper.init(); + await lbryHelper.init(); + await generalHelper.init(); } await wholeInit(); @@ -77,6 +79,8 @@ browser.webRequest.onBeforeRequest.addListener( if (!newUrl) newUrl = peertubeHelper.redirect(url, details.type, initiator); + if (!newUrl) newUrl = lbryHelper.redirect(url, details.type, initiator); + if (!newUrl) newUrl = translateHelper.redirect(url); if (!newUrl) newUrl = searchHelper.redirect(url) @@ -108,19 +112,19 @@ browser.webRequest.onBeforeRequest.addListener( ["blocking"] ); -browser.tabs.onRemoved.addListener((tabId) => { - let index = BYPASSTABs.indexOf(tabId); - if (index > -1) { - BYPASSTABs.splice(index, 1); - console.log("Removed BYPASSTABs", tabId); +browser.tabs.onRemoved.addListener( + tabId => { + let i = BYPASSTABs.indexOf(tabId); + if (i > -1) { + BYPASSTABs.splice(i, 1); + console.log("Removed BYPASSTABs", tabId); + } } -}); +); browser.webRequest.onResponseStarted.addListener( details => { - let autoRedirect = generalHelper.getAutoRedirect(); - - if (!autoRedirect) return null; + if (!generalHelper.getAutoRedirect()) return null; console.log("statusCode", details.statusCode); if (details.type == 'main_frame' && details.statusCode >= 500) { @@ -143,9 +147,11 @@ browser.webRequest.onResponseStarted.addListener( if (!newUrl) newUrl = imgurHelper.changeInstance(url); - if (!newUrl) newUrl = wikipediaHelper.changeInstance(url) + if (!newUrl) newUrl = wikipediaHelper.changeInstance(url); + + if (!newUrl) newUrl = peertubeHelper.changeInstance(url); - if (!newUrl) newUrl = peertubeHelper.changeInstance(url) + if (!newUrl) newUrl = lbryHelper.changeInstance(url); if (newUrl) { browser.tabs.update({ url: '/pages/errors/instance_offline.html' }); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 70b26aad..7fa004e6 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -68,6 +68,10 @@ Peertube +
+ + LBRY/Odysee +
@@ -313,6 +317,13 @@
+
+
+ + LBRY/Odysee +
+ +
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 6fb9bcf5..2519622a 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 9b7dfe0c..9ff3b3d2 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -70,6 +70,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html new file mode 100644 index 00000000..c1fddf35 --- /dev/null +++ b/src/pages/options/lbry/lbry.html @@ -0,0 +1,176 @@ + + + + + + + + + + LibRedirect Options: TikTok + + + +
+
+ + + + General +
+
+ + YouTube +
+
+ + YT Music +
+
+ + Twitter +
+
+ + Instagram +
+
+ + TikTok +
+
+ + Reddit +
+
+ + Imgur +
+
+ + Pixiv +
+
+ + Wikipedia +
+
+ + + + + + + Medium +
+
+ + Peertube +
+
+ + LBRY/Odysee +
+
+ + + + + Search +
+
+ + + + + Translate +
+
+ + + + Maps +
+
+ + + + Send Files +
+
+ +
+
+

Enable

+ +
+ +
+

Protocol

+ +
+ +
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/pages/options/lbry/lbry.js b/src/pages/options/lbry/lbry.js new file mode 100644 index 00000000..43ff74d3 --- /dev/null +++ b/src/pages/options/lbry/lbry.js @@ -0,0 +1,59 @@ +import lbryHelper from "../../../assets/javascripts/helpers/lbry.js"; +import commonHelper from "../../../assets/javascripts/helpers/common.js"; + +let disableLbryElement = document.getElementById("disable-lbry"); +disableLbryElement.addEventListener("change", + (event) => lbryHelper.setDisable(!event.target.checked) +); + +let protocolElement = document.getElementById("protocol") +protocolElement.addEventListener("change", + event => { + let protocol = event.target.options[protocolElement.selectedIndex].value + lbryHelper.setProtocol(protocol); + changeProtocolSettings(protocol); + } +); + +function changeProtocolSettings(protocol) { + let normalDiv = document.getElementById("normal"); + let torDiv = document.getElementById("tor"); + if (protocol == 'normal') { + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (protocol == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } +} + +lbryHelper.init().then(() => { + disableLbryElement.checked = !lbryHelper.getDisable(); + + let protocol = lbryHelper.getProtocol(); + protocolElement.value = protocol; + changeProtocolSettings(protocol); + + commonHelper.processDefaultCustomInstances( + 'librarian', + 'normal', + lbryHelper, + document, + lbryHelper.getLibrarianNormalRedirectsChecks, + lbryHelper.setLibrarianNormalRedirectsChecks, + lbryHelper.getLibrarianNormalCustomRedirects, + lbryHelper.setLibrarianNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'librarian', + 'tor', + lbryHelper, + document, + lbryHelper.getLibrarianTorRedirectsChecks, + lbryHelper.setLibrarianTorRedirectsChecks, + lbryHelper.getLibrarianTorCustomRedirects, + lbryHelper.setLibrarianTorCustomRedirects + ) +}) \ No newline at end of file diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index fccb733b..04272146 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -70,6 +70,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 93f7848d..6b69bdc8 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 08b83b1a..1ef835f1 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/peertube/peertube.js b/src/pages/options/peertube/peertube.js index a770af8f..7aa0f711 100644 --- a/src/pages/options/peertube/peertube.js +++ b/src/pages/options/peertube/peertube.js @@ -1,8 +1,8 @@ import peertubeHelper from "../../../assets/javascripts/helpers/peertube.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; -let disableTiktokElement = document.getElementById("disable-peertube"); -disableTiktokElement.addEventListener("change", +let disablePeertubeElement = document.getElementById("disable-peertube"); +disablePeertubeElement.addEventListener("change", (event) => peertubeHelper.setDisable(!event.target.checked) ); @@ -29,7 +29,7 @@ function changeProtocolSettings(protocol) { } peertubeHelper.init().then(() => { - disableTiktokElement.checked = !peertubeHelper.getDisable(); + disablePeertubeElement.checked = !peertubeHelper.getDisable(); let protocol = peertubeHelper.getProtocol(); protocolElement.value = protocol; diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html index b34f71a6..a66c5d29 100644 --- a/src/pages/options/pixiv/pixiv.html +++ b/src/pages/options/pixiv/pixiv.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 737e000e..97f5093b 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 3f3659c8..6683c299 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index ab84a565..983db907 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index a6b6c6b5..4f82cecd 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index f451c830..34b2ebe5 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 668ba3c3..9e4a5d45 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -70,6 +70,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 379d33ca..1c12ea16 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -69,6 +69,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 7b555504..6146171e 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -70,6 +70,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index cc446ded..ca90dcc4 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -70,6 +70,10 @@ Peertube
+
+ + LBRY/Odysee +
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 981b604d..419c9590 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -106,6 +106,14 @@
+ +