diff --git a/dist/pixiv-artist-filter.js b/dist/pixiv-artist-filter.js index 377e07c..f5e4d73 100644 --- a/dist/pixiv-artist-filter.js +++ b/dist/pixiv-artist-filter.js @@ -1,6 +1,6 @@ -(function(){"use strict";const g=``,{fetch:m}=unsafeWindow;let u=a().map(t=>t.userid);unsafeWindow.fetch=async(...t)=>{const[e,i]=t,n=await m(e,i),s=e;if(s.startsWith("/ajax/search/")){const l=()=>n.clone().json().then(r=>(s.startsWith("/ajax/search/illustrations")?r.body.illust.data=r.body.illust.data.filter(({userId:o})=>!u.includes(o)):(s.startsWith("/ajax/search/top")||s.startsWith("/ajax/search/artworks"))&&(r.body.illustManga.data=r.body.illustManga.data.filter(({userId:o})=>!u.includes(o))),{...r}));n.json=l}return n};function a(){return JSON.parse(GM_getValue("ArtistList","[]"))}function x(t){GM_setValue("ArtistList",JSON.stringify(t)),u=a().map(e=>e.userid)}function f(t,e){const i=a();i.findIndex(n=>n.userid===e)===-1&&(i.push({name:t,userid:e}),x(i))}function b(t){const e=a().filter(i=>i.userid!==t);x(e)}function h(t){if(t.pxv_settings_but)return;t.pxv_settings_but=!0;const e=document.createElement("button");e.id="pxv-artist-filter",e.classList.add("pxv-but","pxv-settings-but"),e.textContent="Artist Filter";const i=()=>{const n=document.createElement("template");let s=a();const l=[];for(const{name:r,userid:o}of s){const d=document.createElement("div"),c=document.createElement("a");c.target="_blank",c.href=`/users/${o}`,c.text=r;const p=document.createElement("button");p.innerHTML=g,p.onclick=()=>{b(o),d.parentNode?.removeChild(d)},d.append(p,c),l.push(d)}return n.append(...l),n.childNodes};e.onclick=()=>{e.blur();const n=document.createElement("template");n.innerHTML=` +C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.44772 17.5523 8 17 8H7.01047Z">`,{fetch:g}=unsafeWindow;let u=a().map(t=>t.userid);unsafeWindow.fetch=async(...t)=>{const[e,i]=t,n=await g(e,i),r=e;if(r.startsWith("/ajax/search/")){const l=()=>n.clone().json().then(s=>(r.startsWith("/ajax/search/illustrations")?s.body.illust.data=s.body.illust.data.filter(({userId:o})=>!u.includes(o)):(r.startsWith("/ajax/search/top")||r.startsWith("/ajax/search/artworks"))&&(s.body.illustManga.data=s.body.illustManga.data.filter(({userId:o})=>!u.includes(o))),{...s}));n.json=l}return n};function a(){return JSON.parse(GM_getValue("ArtistList","[]"))}function x(t){GM_setValue("ArtistList",JSON.stringify(t)),u=a().map(e=>e.userid)}function f(t,e){const i=a();i.findIndex(n=>n.userid===e)===-1&&(i.push({name:t,userid:e}),x(i))}function h(t){const e=a().filter(i=>i.userid!==t);x(e)}function b(t){if(t.pxv_settings_but)return;t.pxv_settings_but=!0;const e=document.createElement("button");e.id="pxv-artist-filter",e.classList.add("pxv-but","pxv-settings-but"),e.textContent="Artist Filter";const i=()=>{const n=document.createElement("template");let r=a();const l=[];for(const{name:s,userid:o}of r){const d=document.createElement("div"),c=document.createElement("a");c.target="_blank",c.href=`/users/${o}`,c.text=s;const p=document.createElement("button");p.innerHTML=m,p.onclick=()=>{h(o),d.parentNode?.removeChild(d)},d.append(p,c),l.push(d)}return n.append(...l),n.childNodes};e.onclick=()=>{e.blur();const n=document.createElement("template");n.innerHTML=`

Artist Filter List

@@ -11,7 +11,7 @@ C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.4477
- `;const s=n.content.firstElementChild;(s?.getElementsByClassName("pxv-artist-grid").item(0)).replaceChildren(...i());const r=s?.getElementsByClassName("pxv-but").item(0);r.onclick=()=>document.body.removeChild(s),document.body.appendChild(s)},t.parentNode.insertBefore(e,t.nextSibling)}function v(t){if(t.pxv_fil_but)return;t.pxv_fil_but=!0;const e=t.parentElement?.querySelector("div a[data-gtm-value]:not(:has(*))"),i=document.createElement("button");i.id="pxv-artist-filter",i.classList.add("pxv-but","pxv-modal-filter-but"),i.textContent="Filter",i.onclick=()=>{if(confirm(`Do you want to filter ${e.text}'s posts ?`)){const n=e.text,s=e.getAttribute("data-gtm-value")||"-1";f(n,s),alert(`${e.text} has been added to the filter list.`)}},t.appendChild(i)}function _(){GM_addStyle(` + `;const r=n.content.firstElementChild;(r?.getElementsByClassName("pxv-artist-grid").item(0)).replaceChildren(...i());const s=r?.getElementsByClassName("pxv-but").item(0);s.onclick=()=>document.body.removeChild(r),document.body.appendChild(r)},t.parentNode.insertBefore(e,t.nextSibling)}function v(t){if(t.pxv_fil_but)return;t.pxv_fil_but=!0;const e=t.parentElement?.querySelector("div a[data-gtm-value]:not(:has(*))"),i=document.createElement("button");i.id="pxv-artist-filter",i.classList.add("pxv-but","pxv-modal-filter-but"),i.textContent="Filter",i.onclick=()=>{if(confirm(`Do you want to filter ${e.text}'s posts ?`)){const n=e.text,r=e.getAttribute("data-gtm-value")||"-1";f(n,r),alert(`${e.text} has been added to the filter list.`)}},t.appendChild(i)}function _(){GM_addStyle(` .pxv-but { color: rgb(245, 245, 245); background-color: rgb(0, 150, 250); @@ -106,4 +106,4 @@ C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.4477 flex-grow:1; margin: auto 0; } - `),setInterval(()=>{if(!window.location.pathname.includes("/tags/"))return;const t=document.getElementsByTagName("nav").item(0);t&&h(t)},1e3),setInterval(()=>{if(!window.location.pathname.includes("/tags/"))return;const t=document.evaluate("//*/div[@open='']",document,null,XPathResult.FIRST_ORDERED_NODE_TYPE);t.singleNodeValue&&v(t.singleNodeValue)},1e3)}_()})(); + `),setInterval(()=>{if(window.location.pathname!=="/search")return;const t=document.getElementsByTagName("nav").item(2);t&&b(t)},1e3),setInterval(()=>{if(window.location.pathname!=="/search")return;const t=document.evaluate("//*/div[@open='']",document,null,XPathResult.FIRST_ORDERED_NODE_TYPE);t.singleNodeValue&&v(t.singleNodeValue)},1e3)}_()})(); diff --git a/dist/pixiv-artist-filter.meta.js b/dist/pixiv-artist-filter.meta.js index 2d5e05c..c4304e9 100644 --- a/dist/pixiv-artist-filter.meta.js +++ b/dist/pixiv-artist-filter.meta.js @@ -1,7 +1,7 @@ // ==UserScript== // @name pixiv-artist-filter // @description filter unwanted artists from pixiv results -// @version 0.0.1 +// @version 0.0.2 // @namespace noproompter // @match https://www.pixiv.net/* // @noframes diff --git a/dist/pixiv-artist-filter.user.js b/dist/pixiv-artist-filter.user.js index 766fbaf..5d355ea 100644 --- a/dist/pixiv-artist-filter.user.js +++ b/dist/pixiv-artist-filter.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name pixiv-artist-filter // @description filter unwanted artists from pixiv results -// @version 0.0.1 +// @version 0.0.2 // @namespace noproompter // @match https://www.pixiv.net/* // @noframes @@ -16,9 +16,9 @@ // @grant GM.addElement // ==/UserScript== -(function(){"use strict";const g=``,{fetch:m}=unsafeWindow;let u=a().map(t=>t.userid);unsafeWindow.fetch=async(...t)=>{const[e,i]=t,n=await m(e,i),s=e;if(s.startsWith("/ajax/search/")){const l=()=>n.clone().json().then(r=>(s.startsWith("/ajax/search/illustrations")?r.body.illust.data=r.body.illust.data.filter(({userId:o})=>!u.includes(o)):(s.startsWith("/ajax/search/top")||s.startsWith("/ajax/search/artworks"))&&(r.body.illustManga.data=r.body.illustManga.data.filter(({userId:o})=>!u.includes(o))),{...r}));n.json=l}return n};function a(){return JSON.parse(GM_getValue("ArtistList","[]"))}function x(t){GM_setValue("ArtistList",JSON.stringify(t)),u=a().map(e=>e.userid)}function f(t,e){const i=a();i.findIndex(n=>n.userid===e)===-1&&(i.push({name:t,userid:e}),x(i))}function b(t){const e=a().filter(i=>i.userid!==t);x(e)}function h(t){if(t.pxv_settings_but)return;t.pxv_settings_but=!0;const e=document.createElement("button");e.id="pxv-artist-filter",e.classList.add("pxv-but","pxv-settings-but"),e.textContent="Artist Filter";const i=()=>{const n=document.createElement("template");let s=a();const l=[];for(const{name:r,userid:o}of s){const d=document.createElement("div"),c=document.createElement("a");c.target="_blank",c.href=`/users/${o}`,c.text=r;const p=document.createElement("button");p.innerHTML=g,p.onclick=()=>{b(o),d.parentNode?.removeChild(d)},d.append(p,c),l.push(d)}return n.append(...l),n.childNodes};e.onclick=()=>{e.blur();const n=document.createElement("template");n.innerHTML=` +C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.44772 17.5523 8 17 8H7.01047Z">`,{fetch:g}=unsafeWindow;let u=a().map(t=>t.userid);unsafeWindow.fetch=async(...t)=>{const[e,i]=t,n=await g(e,i),r=e;if(r.startsWith("/ajax/search/")){const l=()=>n.clone().json().then(s=>(r.startsWith("/ajax/search/illustrations")?s.body.illust.data=s.body.illust.data.filter(({userId:o})=>!u.includes(o)):(r.startsWith("/ajax/search/top")||r.startsWith("/ajax/search/artworks"))&&(s.body.illustManga.data=s.body.illustManga.data.filter(({userId:o})=>!u.includes(o))),{...s}));n.json=l}return n};function a(){return JSON.parse(GM_getValue("ArtistList","[]"))}function x(t){GM_setValue("ArtistList",JSON.stringify(t)),u=a().map(e=>e.userid)}function f(t,e){const i=a();i.findIndex(n=>n.userid===e)===-1&&(i.push({name:t,userid:e}),x(i))}function h(t){const e=a().filter(i=>i.userid!==t);x(e)}function b(t){if(t.pxv_settings_but)return;t.pxv_settings_but=!0;const e=document.createElement("button");e.id="pxv-artist-filter",e.classList.add("pxv-but","pxv-settings-but"),e.textContent="Artist Filter";const i=()=>{const n=document.createElement("template");let r=a();const l=[];for(const{name:s,userid:o}of r){const d=document.createElement("div"),c=document.createElement("a");c.target="_blank",c.href=`/users/${o}`,c.text=s;const p=document.createElement("button");p.innerHTML=m,p.onclick=()=>{h(o),d.parentNode?.removeChild(d)},d.append(p,c),l.push(d)}return n.append(...l),n.childNodes};e.onclick=()=>{e.blur();const n=document.createElement("template");n.innerHTML=`

Artist Filter List

@@ -29,7 +29,7 @@ C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.4477
- `;const s=n.content.firstElementChild;(s?.getElementsByClassName("pxv-artist-grid").item(0)).replaceChildren(...i());const r=s?.getElementsByClassName("pxv-but").item(0);r.onclick=()=>document.body.removeChild(s),document.body.appendChild(s)},t.parentNode.insertBefore(e,t.nextSibling)}function v(t){if(t.pxv_fil_but)return;t.pxv_fil_but=!0;const e=t.parentElement?.querySelector("div a[data-gtm-value]:not(:has(*))"),i=document.createElement("button");i.id="pxv-artist-filter",i.classList.add("pxv-but","pxv-modal-filter-but"),i.textContent="Filter",i.onclick=()=>{if(confirm(`Do you want to filter ${e.text}'s posts ?`)){const n=e.text,s=e.getAttribute("data-gtm-value")||"-1";f(n,s),alert(`${e.text} has been added to the filter list.`)}},t.appendChild(i)}function _(){GM_addStyle(` + `;const r=n.content.firstElementChild;(r?.getElementsByClassName("pxv-artist-grid").item(0)).replaceChildren(...i());const s=r?.getElementsByClassName("pxv-but").item(0);s.onclick=()=>document.body.removeChild(r),document.body.appendChild(r)},t.parentNode.insertBefore(e,t.nextSibling)}function v(t){if(t.pxv_fil_but)return;t.pxv_fil_but=!0;const e=t.parentElement?.querySelector("div a[data-gtm-value]:not(:has(*))"),i=document.createElement("button");i.id="pxv-artist-filter",i.classList.add("pxv-but","pxv-modal-filter-but"),i.textContent="Filter",i.onclick=()=>{if(confirm(`Do you want to filter ${e.text}'s posts ?`)){const n=e.text,r=e.getAttribute("data-gtm-value")||"-1";f(n,r),alert(`${e.text} has been added to the filter list.`)}},t.appendChild(i)}function _(){GM_addStyle(` .pxv-but { color: rgb(245, 245, 245); background-color: rgb(0, 150, 250); @@ -124,4 +124,4 @@ C6.1204 19.5586 6.56641 20 7.11464 20H17C17.5523 20 18 19.5523 18 19V9C18 8.4477 flex-grow:1; margin: auto 0; } - `),setInterval(()=>{if(!window.location.pathname.includes("/tags/"))return;const t=document.getElementsByTagName("nav").item(0);t&&h(t)},1e3),setInterval(()=>{if(!window.location.pathname.includes("/tags/"))return;const t=document.evaluate("//*/div[@open='']",document,null,XPathResult.FIRST_ORDERED_NODE_TYPE);t.singleNodeValue&&v(t.singleNodeValue)},1e3)}_()})(); + `),setInterval(()=>{if(window.location.pathname!=="/search")return;const t=document.getElementsByTagName("nav").item(2);t&&b(t)},1e3),setInterval(()=>{if(window.location.pathname!=="/search")return;const t=document.evaluate("//*/div[@open='']",document,null,XPathResult.FIRST_ORDERED_NODE_TYPE);t.singleNodeValue&&v(t.singleNodeValue)},1e3)}_()})(); diff --git a/package.json b/package.json index 85c5f98..2edc964 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "pixiv-artist-filter", "description": "filter unwanted artists from pixiv results", - "version":"0.0.1" + "version":"0.0.2" } diff --git a/src/main.ts b/src/main.ts index 164509e..f85cb6f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -268,9 +268,9 @@ function init() { `) const attach_settings = setInterval(() => { - if ( !window.location.pathname.includes('/tags/')) return ; + if ( !(window.location.pathname === '/search')) return ; - const navNode = document.getElementsByTagName('nav').item(0); + const navNode = document.getElementsByTagName('nav').item(2); if (navNode){ AttachSettings(navNode) } @@ -278,7 +278,7 @@ function init() { },1000) const pixiv_attach_artist = setInterval( () => { - if ( !window.location.pathname.includes('/tags/')) return ; + if ( !(window.location.pathname === '/search')) return ; const profileModalsearch = document.evaluate("//*/div[@open='']", document,null, XPathResult.FIRST_ORDERED_NODE_TYPE); //const profileModalsearch = document.evaluate("//*/a[contains(text(),'View Profile')]", document,null, XPathResult.FIRST_ORDERED_NODE_TYPE);