From b1bd8544acd02eb9a1a5b43c0d04fdd3d5add58f Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Tue, 8 Mar 2022 19:12:09 +0300 Subject: [PATCH] Added pixivMoe #84 --- src/assets/images/pixiv-icon.png | Bin 0 -> 4920 bytes src/assets/images/pixiv-icon.svg | 56 ++++++ src/assets/javascripts/helpers/pixiv.js | 181 ++++++++++++++++++ src/assets/javascripts/helpers/tiktok.js | 2 +- 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 + .../options/youtubeMusic/youtubeMusic.html | 4 + src/pages/popup/popup.html | 9 + src/pages/popup/popup.js | 32 ++-- 22 files changed, 543 insertions(+), 13 deletions(-) create mode 100644 src/assets/images/pixiv-icon.png create mode 100644 src/assets/images/pixiv-icon.svg create mode 100644 src/assets/javascripts/helpers/pixiv.js create mode 100644 src/pages/options/pixiv/pixiv.html create mode 100644 src/pages/options/pixiv/pixiv.js diff --git a/src/assets/images/pixiv-icon.png b/src/assets/images/pixiv-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3dd6e660dc99798f69aaac8f942741f388eb95e0 GIT binary patch literal 4920 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 + + + + + + + + + + diff --git a/src/assets/javascripts/helpers/pixiv.js b/src/assets/javascripts/helpers/pixiv.js new file mode 100644 index 0000000..2fedb45 --- /dev/null +++ b/src/assets/javascripts/helpers/pixiv.js @@ -0,0 +1,181 @@ +window.browser = window.browser || window.chrome; + +import commonHelper from './common.js' + +const targets = [ + /^https?:\/\/(www\.|)pixiv\.net.*/ +]; + +let redirects = { + "pixivMoe": { + "normal": [ + "https://pixiv.moe" + ], + "tor": [] + } +} + +const getRedirects = () => redirects; +const getCustomRedirects = function () { + return { + "pixivMoe": { + "normal": [...pixivMoeNormalRedirectsChecks, ...pixivMoeNormalCustomRedirects], + "tor": [] + }, + }; +}; + +function setRedirects(val) { + redirects.pixivMoe = val; + browser.storage.local.set({ pixivRedirects: redirects }) + console.log("pixivRedirects: ", val) + for (const item of pixivMoeNormalRedirectsChecks) + if (!redirects.pixivMoe.normal.includes(item)) { + var index = pixivMoeNormalRedirectsChecks.indexOf(item); + if (index !== -1) pixivMoeNormalRedirectsChecks.splice(index, 1); + } + setPixivMoeNormalRedirectsChecks(pixivMoeNormalRedirectsChecks); + + for (const item of pixivMoeTorRedirectsChecks) + if (!redirects.pixivMoe.normal.includes(item)) { + var index = pixivMoeTorRedirectsChecks.indexOf(item); + if (index !== -1) pixivMoeTorRedirectsChecks.splice(index, 1); + } + setPixivMoeTorRedirectsChecks(pixivMoeTorRedirectsChecks); +} + +let pixivMoeNormalRedirectsChecks; +const getPixivMoeNormalRedirectsChecks = () => pixivMoeNormalRedirectsChecks; +function setPixivMoeNormalRedirectsChecks(val) { + pixivMoeNormalRedirectsChecks = val; + browser.storage.local.set({ pixivMoeNormalRedirectsChecks }) + console.log("pixivMoeNormalRedirectsChecks: ", val) +} + +let pixivMoeTorRedirectsChecks; +const getPixivMoeTorRedirectsChecks = () => pixivMoeTorRedirectsChecks; +function setPixivMoeTorRedirectsChecks(val) { + pixivMoeTorRedirectsChecks = val; + browser.storage.local.set({ pixivMoeTorRedirectsChecks }) + console.log("pixivMoeTorRedirectsChecks: ", val) +} + +let pixivMoeNormalCustomRedirects = []; +const getPixivMoeNormalCustomRedirects = () => pixivMoeNormalCustomRedirects; +function setPixivMoeNormalCustomRedirects(val) { + pixivMoeNormalCustomRedirects = val; + browser.storage.local.set({ pixivMoeNormalCustomRedirects }) + console.log("pixivMoeNormalCustomRedirects: ", val) +} + +let pixivMoeTorCustomRedirects = []; +const getPixivMoeTorCustomRedirects = () => pixivMoeTorCustomRedirects; +function setPixivMoeTorCustomRedirects(val) { + pixivMoeTorCustomRedirects = val; + browser.storage.local.set({ pixivMoeTorCustomRedirects }) + console.log("pixivMoeTorCustomRedirects: ", val) +} + +let disable; +const getDisable = () => disable; +function setDisable(val) { + disable = val; + browser.storage.local.set({ disablePixiv: disable }) + console.log("disablePixiv", val); +} + +let protocol; +const getProtocol = () => protocol; +function setProtocol(val) { + protocol = val; + browser.storage.local.set({ pixivProtocol: val }) + console.log("pixivProtocol: ", val) +} + +function redirect(url, type, initiator) { + // https://www.pixiv.net/artworks/96572356 + // https://www.pixiv.net/en/artworks/96572356 + // https://pixiv.moe/illust/96572356 + + if (disable) return null; + if (initiator && ([...redirects.pixivMoe.normal, ...pixivMoeNormalCustomRedirects].includes(initiator.origin) || targets.includes(initiator.host))) return null; + if (!targets.some((rx) => rx.test(url.href))) return null; + console.log("PixivMoe!!"); + + if (type != "main_frame" && type != "sub_frame") return null; + + let instancesList; + if (protocol == 'normal') instancesList = [...pixivMoeNormalRedirectsChecks, ...pixivMoeNormalCustomRedirects]; + if (protocol == 'tor') instancesList = [...pixivMoeTorRedirectsChecks, ...pixivMoeTorCustomRedirects]; + if (instancesList.length === 0) return null; + let randomInstance = commonHelper.getRandomInstance(instancesList); + + let pathName = url.pathname + .replace('/artworks/', '/illust/') + .replace(/\/..\//, '/') + + return `${randomInstance}${pathName}`; +} + +async function init() { + return new Promise((resolve) => { + fetch('/instances/data.json').then(response => response.text()).then(data => { + let dataJson = JSON.parse(data); + browser.storage.local.get( + [ + "disablePixiv", + "pixivRedirects", + + "pixivMoeNormalRedirectsChecks", + "pixivMoeNormalCustomRedirects", + + "pixivMoeTorRedirectsChecks", + "pixivMoeTorCustomRedirects", + + "pixivProtocol" + ], + r => { + disable = r.disablePixiv ?? false; + + protocol = r.pixivProtocol ?? "normal"; + + if (r.pixivRedirects) redirects = r.pixivRedirects; + + pixivMoeNormalRedirectsChecks = r.pixivMoeNormalRedirectsChecks ?? [...redirects.pixivMoe.normal]; + pixivMoeNormalCustomRedirects = r.pixivMoeNormalCustomRedirects ?? []; + + pixivMoeTorRedirectsChecks = r.pixivMoeTorRedirectsChecks ?? [...redirects.pixivMoe.tor]; + pixivMoeTorCustomRedirects = r.pixivMoeTorCustomRedirects ?? []; + + resolve(); + } + ) + }); + }); +} + +export default { + + getRedirects, + getCustomRedirects, + setRedirects, + + getDisable, + setDisable, + + getProtocol, + setProtocol, + + getPixivMoeNormalRedirectsChecks, + setPixivMoeNormalRedirectsChecks, + getPixivMoeTorRedirectsChecks, + setPixivMoeTorRedirectsChecks, + + getPixivMoeTorCustomRedirects, + setPixivMoeTorCustomRedirects, + getPixivMoeNormalCustomRedirects, + setPixivMoeNormalCustomRedirects, + + redirect, + init, +}; diff --git a/src/assets/javascripts/helpers/tiktok.js b/src/assets/javascripts/helpers/tiktok.js index fe0c31e..2edc437 100644 --- a/src/assets/javascripts/helpers/tiktok.js +++ b/src/assets/javascripts/helpers/tiktok.js @@ -100,7 +100,7 @@ function redirect(url, type) { // https://www.tiktok.com/@keysikaspol/video/7061265241887345946 // https://www.tiktok.com/@keysikaspol - if (type != "main_frame" && "sub_frame" && "xmlhttprequest") return null; + if (type != "main_frame" && type != "sub_frame" && type != "xmlhttprequest") return null; let instancesList; if (protocol == 'normal') instancesList = [...proxiTokNormalRedirectsChecks, ...proxiTokNormalCustomRedirects]; diff --git a/src/pages/background/background.js b/src/pages/background/background.js index c494b78..0d47b3d 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 cf9615e..19e8e94 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 347aac6..8f611ca 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 e030b46..fe99d12 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 f571b4e..c0a9b7d 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 b8ef47c..89d7302 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 0000000..c768fdd --- /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 0000000..0cefd1d --- /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 a7229d0..ce83f0c 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 4f23273..6f2bc64 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 b8b9544..0e003f3 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 701d54e..01b0224 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 3e9f228..00ae8e9 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 cbf418f..c38def3 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 347e922..7ef7f96 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 687764b..e327ba3 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 5e75b79..d62420f 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 fe90715..c4e61df 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) );