From b1bd8544acd02eb9a1a5b43c0d04fdd3d5add58f Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Tue, 8 Mar 2022 19:12:09 +0300 Subject: Added pixivMoe #84 --- src/pages/background/background.js | 4 + src/pages/options/general/general.html | 4 + src/pages/options/imgur/imgur.html | 4 + src/pages/options/instagram/instagram.html | 4 + src/pages/options/maps/maps.html | 4 + src/pages/options/medium/medium.html | 4 + src/pages/options/pixiv/pixiv.html | 161 +++++++++++++++++++++++ src/pages/options/pixiv/pixiv.js | 59 +++++++++ src/pages/options/reddit/reddit.html | 4 + src/pages/options/search/search.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 | 9 ++ src/pages/popup/popup.js | 32 +++-- 18 files changed, 305 insertions(+), 12 deletions(-) create mode 100644 src/pages/options/pixiv/pixiv.html create mode 100644 src/pages/options/pixiv/pixiv.js (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index c494b787..0d47b3d4 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -11,6 +11,7 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; +import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; import generalHelper from "../../assets/javascripts/helpers/general.js"; import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; @@ -29,6 +30,7 @@ async function wholeInit() { wikipediaHelper.init() imgurHelper.init() tiktokHelper.init() + pixivHelper.init() generalHelper.init() } @@ -68,6 +70,8 @@ browser.webRequest.onBeforeRequest.addListener( if (tiktokHelper.isTiktok(url, initiator)) newUrl = tiktokHelper.redirect(url, details.type); + if (!newUrl) newUrl = pixivHelper.redirect(url, details.type, initiator); + if (translateHelper.isTranslate(url, initiator)) newUrl = translateHelper.redirect(url); if (searchHelper.isSearch(url)) newUrl = searchHelper.redirect(url) diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index cf9615e7..19e8e946 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -47,6 +47,10 @@ Imgur +
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 347aac60..8f611caa 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index e030b46d..fe99d12e 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -49,6 +49,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index f571b4e8..c0a9b7d5 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -49,6 +49,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index b8ef47c5..89d73027 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html new file mode 100644 index 00000000..c768fddf --- /dev/null +++ b/src/pages/options/pixiv/pixiv.html @@ -0,0 +1,161 @@ + + + + + + + + + + LibRedirect Options: TikTok + + + +
+
+ + + + General +
+
+ + YouTube +
+
+ + YT Music +
+
+ + Twitter +
+
+ + Instagram +
+
+ + TikTok +
+
+ + Reddit +
+
+ + Imgur +
+
+ + Pixiv +
+
+ + Wikipedia +
+
+ + + + + + + Medium +
+
+ + + + + Search +
+
+ + + + + Translate +
+
+ + + + Maps +
+
+ +
+
+

Enable

+ +
+ +
+

Protocol

+ +
+ +
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

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

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/pages/options/pixiv/pixiv.js b/src/pages/options/pixiv/pixiv.js new file mode 100644 index 00000000..0cefd1d2 --- /dev/null +++ b/src/pages/options/pixiv/pixiv.js @@ -0,0 +1,59 @@ +import pixivHelper from "../../../assets/javascripts/helpers/pixiv.js"; +import commonHelper from "../../../assets/javascripts/helpers/common.js"; + +let disablePixivElement = document.getElementById("disable-pixiv"); +disablePixivElement.addEventListener("change", + (event) => pixivHelper.setDisable(!event.target.checked) +); + +let protocolElement = document.getElementById("protocol") +protocolElement.addEventListener("change", + (event) => { + let protocol = event.target.options[protocolElement.selectedIndex].value + pixivHelper.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'; + } +} + +pixivHelper.init().then(() => { + disablePixivElement.checked = !pixivHelper.getDisable(); + + let protocol = pixivHelper.getProtocol(); + protocolElement.value = protocol; + changeProtocolSettings(protocol); + + commonHelper.processDefaultCustomInstances( + 'pixivMoe', + 'normal', + pixivHelper, + document, + pixivHelper.getPixivMoeNormalRedirectsChecks, + pixivHelper.setPixivMoeNormalRedirectsChecks, + pixivHelper.getPixivMoeNormalCustomRedirects, + pixivHelper.setPixivMoeNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'pixivMoe', + 'tor', + pixivHelper, + document, + pixivHelper.getPixivMoeTorRedirectsChecks, + pixivHelper.setPixivMoeTorRedirectsChecks, + pixivHelper.getPixivMoeTorCustomRedirects, + pixivHelper.setPixivMoeTorCustomRedirects + ) +}) \ No newline at end of file diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index a7229d02..ce83f0c4 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 4f232736..6f2bc64e 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index b8b95441..0e003f36 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 701d54e7..01b02243 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 3e9f228a..00ae8e9b 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -49,6 +49,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index cbf418f9..c38def39 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -48,6 +48,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 347e9221..7ef7f961 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -49,6 +49,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index 687764b4..e327ba31 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -49,6 +49,10 @@ Imgur
+
+ + Pixiv +
Wikipedia diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 5e75b792..d62420f2 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -68,6 +68,15 @@
+
+
+ + +

Pixiv

+
+ +
+
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index fe907153..c4e61df8 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -14,6 +14,7 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; +import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; let disableTwitterElement = document.getElementById("disable-nitter"); let disableYoutubeElement = document.getElementById("disable-youtube"); @@ -27,20 +28,22 @@ let disableWikipediaElement = document.getElementById("disable-wikipedia"); let disableMediumElement = document.getElementById("disable-medium"); let disableImgurElement = document.getElementById("disable-imgur"); let disableTiktokElement = document.getElementById("disable-tiktok"); +let disablePixivElement = document.getElementById("disable-pixiv"); async function wholeInit() { - await youtubeHelper.init(); - await youtubeMusicHelper.init(); - await twitterHelper.init(); - await instagramHelper.init(); - await mapsHelper.init(); - await redditHelper.init(); - await searchHelper.init(); - await translateHelper.init(); - await wikipediaHelper.init(); - await imgurHelper.init(); - await tiktokHelper.init(); - await mediumHelper.init(); + await youtubeHelper.init() + await youtubeMusicHelper.init() + await twitterHelper.init() + await instagramHelper.init() + await mapsHelper.init() + await redditHelper.init() + await searchHelper.init() + await translateHelper.init() + await wikipediaHelper.init() + await imgurHelper.init() + await tiktokHelper.init() + await pixivHelper.init() + await mediumHelper.init() }; wholeInit().then(() => { @@ -55,6 +58,7 @@ wholeInit().then(() => { disableWikipediaElement.checked = !wikipediaHelper.getDisable(); disableImgurElement.checked = !imgurHelper.getDisable(); disableTiktokElement.checked = !tiktokHelper.getDisable(); + disablePixivElement.checked = !pixivHelper.getDisable(); disableMediumElement.checked = !mediumHelper.getDisable(); }) @@ -102,6 +106,10 @@ disableTiktokElement.addEventListener("change", event => tiktokHelper.setDisable(!event.target.checked) ); +disablePixivElement.addEventListener("change", + event => pixivHelper.setDisable(!event.target.checked) +); + disableMediumElement.addEventListener("change", event => mediumHelper.setDisable(!event.target.checked) ); -- cgit 1.4.1