From a09a7cf4ca388d43f100afb5148421dc6c445b1e Mon Sep 17 00:00:00 2001 From: the1812 Date: Thu, 7 Jan 2021 23:35:27 +0800 Subject: [PATCH] Fix GM_ calls (fix #1330) --- min/bvid-convert.min.js | 2 +- min/copy-comment-link.min.js | 2 +- min/copy-feeds-link.min.js | 2 +- src/activity/copy-feeds-link/copy-feeds-link.ts | 2 +- src/utils/copy-comment-link/copy-comment-link.ts | 2 +- src/video/bvid-convert/bvid-convert.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/min/bvid-convert.min.js b/min/bvid-convert.min.js index 0af1487d1..2e131493a 100644 --- a/min/bvid-convert.min.js +++ b/min/bvid-convert.min.js @@ -1 +1 @@ -(()=>(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some((i=>document.URL.startsWith(i)));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select((()=>unsafeWindow.aid)).then((i=>{if(!i){return}if(document.URL.includes("videocard_series")){console.log("skip video series");return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,((e,n)=>`/${n}/av${i}`));if(document.URL!==e){history.replaceState({},document.title,e)}}))}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select((()=>unsafeWindow.aid||unsafeWindow.bvid)))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=(i,e)=>{if(!i||!e){return""}return`\n
av${i}
\n
${e}
\n`};const n=dq(".bvid-convert");n.addEventListener("click",(i=>{const e=i.target;const n=e.classList;if(n.contains("mdi")){if(n.contains("mdi-check")){return}const i=e.previousSibling;if(i){const e=window.location.search?`?${window.location.search}`:"";GM_setClipboard(`https://www.bilibili.com/video/${i.textContent}${e}`,{mimetype:"text/plain"});n.remove("mdi-link");n.add("mdi-check");setTimeout((()=>{n.remove("mdi-check");n.add("mdi-link")}),1e3)}}}));const t=async()=>{const e=dq(".bvid-convert");e.innerHTML=i(unsafeWindow.aid,unsafeWindow.bvid);const n=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(n){e.innerHTML=i(unsafeWindow.aid,n.innerHTML)}};Observer.videoChange(t)}}}})(); \ No newline at end of file +(()=>(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some((i=>document.URL.startsWith(i)));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select((()=>unsafeWindow.aid)).then((i=>{if(!i){return}if(document.URL.includes("videocard_series")){console.log("skip video series");return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,((e,n)=>`/${n}/av${i}`));if(document.URL!==e){history.replaceState({},document.title,e)}}))}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select((()=>unsafeWindow.aid||unsafeWindow.bvid)))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=(i,e)=>{if(!i||!e){return""}return`\n
av${i}
\n
${e}
\n`};const n=dq(".bvid-convert");n.addEventListener("click",(i=>{const e=i.target;const n=e.classList;if(n.contains("mdi")){if(n.contains("mdi-check")){return}const i=e.previousSibling;if(i){const e=window.location.search?`?${window.location.search}`:"";GM.setClipboard(`https://www.bilibili.com/video/${i.textContent}${e}`,"text");n.remove("mdi-link");n.add("mdi-check");setTimeout((()=>{n.remove("mdi-check");n.add("mdi-link")}),1e3)}}}));const t=async()=>{const e=dq(".bvid-convert");e.innerHTML=i(unsafeWindow.aid,unsafeWindow.bvid);const n=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(n){e.innerHTML=i(unsafeWindow.aid,n.innerHTML)}};Observer.videoChange(t)}}}})(); \ No newline at end of file diff --git a/min/copy-comment-link.min.js b/min/copy-comment-link.min.js index b82b3839c..b65f42607 100644 --- a/min/copy-comment-link.min.js +++ b/min/copy-comment-link.min.js @@ -1 +1 @@ -(()=>(t,e)=>{(async()=>{const{forEachCommentItem:t}=await e.importAsync("comment-apis");const i=["https://t.bilibili.com","https://space.bilibili.com","https://live.bilibli.com"];const n=t=>{if(document.URL.match(/\/\/t\.bilibili\.com\/(\d+)/)){return""}if(i.every((t=>!document.URL.includes(t)))){return""}let e=t;while(e!==null&&e!==document.body){if(e.hasAttribute("data-did")){return`https://t.bilibili.com/${e.getAttribute("data-did")}`}e=e.parentElement}return""};const l=t=>{const e=t=>{t.forEach((t=>{const e=dq(t.element,".opera-list ul");if(!e||dq(e,".copy-link")){return}const i=document.createElement("li");i.classList.add("copy-link");i.textContent="复制链接";i.addEventListener("click",(()=>{const e=n(t.element)||document.URL.replace(/#.+$/,"");GM_setClipboard(`${e}#reply${t.id}`,{mimetype:"text/plain"});console.log("[Copy Comment Link]",`${e}#reply${t.id}`)}));e.appendChild(i)}))};e([t,...t.replies]);t.onRepliesUpdate=t=>e(t)};t({added:l})})()})(); \ No newline at end of file +(()=>(t,e)=>{(async()=>{const{forEachCommentItem:t}=await e.importAsync("comment-apis");const i=["https://t.bilibili.com","https://space.bilibili.com","https://live.bilibli.com"];const n=t=>{if(document.URL.match(/\/\/t\.bilibili\.com\/(\d+)/)){return""}if(i.every((t=>!document.URL.includes(t)))){return""}let e=t;while(e!==null&&e!==document.body){if(e.hasAttribute("data-did")){return`https://t.bilibili.com/${e.getAttribute("data-did")}`}e=e.parentElement}return""};const l=t=>{const e=t=>{t.forEach((t=>{const e=dq(t.element,".opera-list ul");if(!e||dq(e,".copy-link")){return}const i=document.createElement("li");i.classList.add("copy-link");i.textContent="复制链接";i.addEventListener("click",(()=>{const e=n(t.element)||document.URL.replace(/#.+$/,"");GM.setClipboard(`${e}#reply${t.id}`,"text");console.log("[Copy Comment Link]",`${e}#reply${t.id}`)}));e.appendChild(i)}))};e([t,...t.replies]);t.onRepliesUpdate=t=>e(t)};t({added:l})})()})(); \ No newline at end of file diff --git a/min/copy-feeds-link.min.js b/min/copy-feeds-link.min.js index 423f5b743..3ca34da25 100644 --- a/min/copy-feeds-link.min.js +++ b/min/copy-feeds-link.min.js @@ -1 +1 @@ -(()=>(t,a)=>{(async()=>{const{forEachFeedsCard:t,addMenuItem:e}=await a.importAsync("feeds-apis");const i=t=>{e(t,{className:"copy-link",text:"复制链接",action:()=>{GM_setClipboard(`https://t.bilibili.com/${t.id}`,{mimetype:"text/plain"})}})};t({added:i})})()})(); \ No newline at end of file +(()=>(t,a)=>{(async()=>{const{forEachFeedsCard:t,addMenuItem:e}=await a.importAsync("feeds-apis");const i=t=>{e(t,{className:"copy-link",text:"复制链接",action:()=>{GM.setClipboard(`https://t.bilibili.com/${t.id}`,"text")}})};t({added:i})})()})(); \ No newline at end of file diff --git a/src/activity/copy-feeds-link/copy-feeds-link.ts b/src/activity/copy-feeds-link/copy-feeds-link.ts index b0fbb8b35..99ab72186 100644 --- a/src/activity/copy-feeds-link/copy-feeds-link.ts +++ b/src/activity/copy-feeds-link/copy-feeds-link.ts @@ -7,7 +7,7 @@ import { FeedsCard } from '../feeds-apis' className: 'copy-link', text: '复制链接', action: () => { - GM_setClipboard(`https://t.bilibili.com/${card.id}`, { mimetype: 'text/plain' }) + GM.setClipboard(`https://t.bilibili.com/${card.id}`, 'text') } }) } diff --git a/src/utils/copy-comment-link/copy-comment-link.ts b/src/utils/copy-comment-link/copy-comment-link.ts index 04a593ea5..2f4b411de 100644 --- a/src/utils/copy-comment-link/copy-comment-link.ts +++ b/src/utils/copy-comment-link/copy-comment-link.ts @@ -36,7 +36,7 @@ import { CommentItem } from '../comment-apis' copyLinkButton.textContent = '复制链接' copyLinkButton.addEventListener('click', () => { const url = findParentFeedsUrl(item.element) || document.URL.replace(/#.+$/, '') - GM_setClipboard(`${url}#reply${item.id}`, { mimetype: 'text/plain' }) + GM.setClipboard(`${url}#reply${item.id}`, 'text') console.log('[Copy Comment Link]',`${url}#reply${item.id}`) }) operationList.appendChild(copyLinkButton) diff --git a/src/video/bvid-convert/bvid-convert.ts b/src/video/bvid-convert/bvid-convert.ts index ea10ca3a8..c9b777d3b 100644 --- a/src/video/bvid-convert/bvid-convert.ts +++ b/src/video/bvid-convert/bvid-convert.ts @@ -55,7 +55,7 @@ export default { const link = target.previousSibling as Node if (link) { const params = window.location.search ? `?${window.location.search}` : '' - GM_setClipboard(`https://www.bilibili.com/video/${link.textContent}${params}`, { mimetype: 'text/plain' }) + GM.setClipboard(`https://www.bilibili.com/video/${link.textContent}${params}`, 'text') list.remove('mdi-link') list.add('mdi-check') setTimeout(() => {