diff options
22 files changed, 543 insertions, 13 deletions
diff --git a/src/assets/images/pixiv-icon.png b/src/assets/images/pixiv-icon.png new file mode 100644 index 00000000..3dd6e660 --- /dev/null +++ b/src/assets/images/pixiv-icon.png Binary files differdiff --git a/src/assets/images/pixiv-icon.svg b/src/assets/images/pixiv-icon.svg new file mode 100644 index 00000000..2e3cb564 --- /dev/null +++ b/src/assets/images/pixiv-icon.svg @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="67.73333mm" + height="67.73333mm" + viewBox="0 0 67.733331 67.733331" + version="1.1" + id="svg5" + inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" + sodipodi:docname="pixiv-icon.svg" + inkscape:export-filename="/mnt/main_storage/Git/libredirect/src/assets/images/pixiv-icon.png" + inkscape:export-xdpi="48" + inkscape:export-ydpi="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview7" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="1.622695" + inkscape:cx="53.614512" + inkscape:cy="136.50132" + inkscape:window-width="1888" + inkscape:window-height="1060" + inkscape:window-x="32" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs2" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-103.98557,-52.402599)"> + <circle + style="fill:#0096fa;fill-opacity:1;stroke-width:2.64583" + id="path1234" + cx="137.85223" + cy="86.269264" + r="33.866665" /> + <path + style="fill:#ffffff;stroke-width:0.313386" + d="m 122.7229,105.30379 c -0.24873,-0.40245 0.7237,-1.54717 1.31432,-1.54717 0.347,0 0.42151,-2.55398 0.42151,-14.446665 V 74.863294 l -1.03225,0.892679 c -2.10117,1.817053 -3.35517,3.636697 -3.35517,4.868584 0,2.298073 -1.08814,1.726257 -2.82048,-1.482147 l -0.78346,-1.451038 1.56693,-1.400312 c 10.52844,-9.408887 24.10553,-12.052505 33.56986,-6.536439 2.25569,1.314672 4.93919,4.203746 6.03254,6.494663 1.20804,2.531212 1.59075,4.221702 1.60031,7.068726 0.0327,9.739076 -9.81435,16.74731 -21.67016,15.422863 -2.55639,-0.285577 -6.17239,-1.083524 -7.85889,-1.734229 -0.5011,-0.193334 -0.54843,0.07462 -0.54843,3.104446 v 3.31605 l 0.94017,0.48616 c 0.56299,0.29114 0.94015,0.7344 0.94015,1.10491 0,0.58416 -0.2265,0.61873 -4.05553,0.61873 -2.5259,0 -4.13318,-0.12566 -4.26142,-0.33315 z m 19.92492,-9.384243 c 3.71424,-0.704393 6.88163,-2.766994 8.79493,-5.727265 3.22224,-4.985408 2.57484,-12.126756 -1.49817,-16.526092 -4.49505,-4.855189 -12.08781,-5.637541 -19.30051,-1.988706 l -1.49264,0.755112 0.0825,10.88286 0.0824,10.88286 2.11342,0.706325 c 3.4895,1.166218 8.18184,1.590735 11.21817,1.014906 z" + id="path6646" /> + </g> +</svg> diff --git a/src/assets/javascripts/helpers/pixiv.js b/src/assets/javascripts/helpers/pixiv.js new file mode 100644 index 00000000..2fedb455 --- /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 fe0c31e0..2edc437e 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 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 @@ -48,6 +48,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html" class="selected">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -50,6 +50,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -50,6 +50,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="UTF-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> + <link href="../../stylesheets/styles.css" rel="stylesheet" /> + <title>LibRedirect Options: TikTok</title> +</head> + +<body class="option"> + <section class="links"> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" + width="26px" fill="currentColor"> + <path + d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z" /> + </svg> + <a href="../general/general.html">General</a> + </div> + <div class="title"> + <img src="../../../assets/images/youtube-icon.png" /> + <a href="../youtube/youtube.html">YouTube</a> + </div> + <div class="title"> + <img src="../../../assets/images/youtube-music-icon.png" /> + <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> + </div> + <div class="title"> + <img src="../../../assets/images/twitter-icon.png" /> + <a href="../twitter/twitter.html">Twitter</a> + </div> + <div class="title"> + <img src="../../../assets/images/instagram-icon.png" /> + <a href="../instagram/instagram.html">Instagram</a> + </div> + <div class="title"> + <img src="../../../assets/images/tiktok-icon.png" /> + <a href="../tiktok/tiktok.html">TikTok</a> + </div> + <div class="title"> + <img src="../../../assets/images/reddit-icon.png" /> + <a href="../reddit/reddit.html">Reddit</a> + </div> + <div class="title"> + <img src="../../../assets/images/imgur-icon.png" /> + <a href="../imgur/imgur.html">Imgur</a> + </div> + <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html" class="selected">Pixiv</a> + </div> + <div class="title"> + <img src="../../../assets/images/wikipedia-icon.svg" /> + <a href="../wikipedia/wikipedia.html">Wikipedia</a> + </div> + <div class="title"> + <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> + <circle cx="500" cy="500" r="500" /> + <ellipse ry="475" rx="250" cy="501" cx="1296" /> + <ellipse cx="1682" cy="502" rx="88" ry="424" /> + </svg> + <a href="../medium/medium.html">Medium</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> + </svg> + <a href="../search/search.html">Search</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> + </svg> + <a href="../translate/translate.html">Translate</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path + d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" /> + </svg> + <a href="../maps/maps.html">Maps</a> + </div> + </section> + + <section class="option-block"> + <div class="some-block option-block"> + <h4>Enable</h4> + <input id="disable-pixiv" type="checkbox" checked /> + </div> + + <div class="some-block option-block"> + <h4>Protocol</h4> + <select id="protocol"> + <option value="normal">Normal</option> + <option value="tor">Tor</option> + </select> + </div> + + <hr> + + <div id="normal"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="pixivMoe-normal-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-pixivMoe-normal-instance-form"> + <div class="some-block option-block"> + <input id="pixivMoe-normal-custom-instance" placeholder="https://pixiv.moe" type="url" /> + <button type="submit" class="add" id="pixivMoe-normal-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="pixivMoe-normal-custom-checklist"></div> + </div> + <div id="tor"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="pixivMoe-tor-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-pixivMoe-tor-instance-form"> + <div class="some-block option-block"> + <input id="pixivMoe-tor-custom-instance" placeholder="https://pixivMoe.com" type="url" /> + <button type="submit" class="add" id="pixivMoe-tor-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="pixivMoe-tor-custom-checklist"></div> + </div> + </section> + + + <script type="module" src="../init.js"></script> + <script type="module" src="./pixiv.js"></script> + <!-- <script src="../../assets/javascripts/localise.js"></script> --> +</body> + +</html> \ 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -50,6 +50,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -49,6 +49,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html" class="selected">Wikipedia</a> </div> 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 @@ -50,6 +50,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -50,6 +50,10 @@ <a href="../imgur/imgur.html">Imgur</a> </div> <div class="title"> + <img src="../../../assets/images/pixiv-icon.png" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> 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 @@ -70,6 +70,15 @@ <div class="some-block"> <div class="title"> + <!-- https://clipground.com/pics/getsecond?url=pixiv-logo-2.png --> + <img src="../../assets/images/pixiv-icon.png" /> + <h4>Pixiv</h4> + </div> + <input id="disable-pixiv" type="checkbox" checked /> + </div> + + <div class="some-block"> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <h4>Wikipedia</h4> </div> 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) ); |
