fix: 🐛 兼容 AdGuard

#170
hymbz · Jun 21, 2024 · 157a296 · 157a296
1 parent 5869bd9
commit 157a296
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/metaHeader.ts b/metaHeader.ts
@@ -115,11 +115,11 @@ export const getMetaData = (isDevMode: boolean) => {
     grant: [
       'GM_addElement',
       'GM_getResourceText',
+      'GM_addStyle',
       'GM_xmlhttpRequest',
       'GM.addValueChangeListener',
       'GM.removeValueChangeListener',
       'GM.getResourceText',
-      'GM.addStyle',
       'GM.getValue',
       'GM.setValue',
       'GM.listValues',

diff --git a/src/components/useComponents/Fab.tsx b/src/components/useComponents/Fab.tsx
@@ -14,7 +14,7 @@ import { mountComponents } from './helper';
 let dom: HTMLDivElement;
 
 export const useFab = async (initProps?: FabProps) => {
-  await GM.addStyle(`
+  GM_addStyle(`
     #fab {
       --text-bg: transparent;
 

diff --git a/src/components/useComponents/Manga.tsx b/src/components/useComponents/Manga.tsx
@@ -25,7 +25,7 @@ type UseMangaProps = MangaProps & { adList?: Set<number> };
  * 显示漫画阅读窗口
  */
 export const useManga = async (initProps?: Partial<UseMangaProps>) => {
-  await GM.addStyle(`
+  GM_addStyle(`
     #comicRead {
       position: fixed;
       top: 0;

diff --git a/src/helper/import.ts b/src/helper/import.ts
@@ -4,6 +4,7 @@ const gmApi = {
     typeof GM_addElement === 'undefined' ? undefined : GM_addElement,
   GM_getResourceText,
   GM_xmlhttpRequest,
+  GM_addStyle,
   unsafeWindow,
 };
 const gmApiList = Object.keys(gmApi);

diff --git a/src/index.ts b/src/index.ts
@@ -234,7 +234,7 @@ try {
       }
 
       // 让切换章节的提示可以显示在漫画页上
-      GM.addStyle(`#smh-msg-box { z-index: 2147483647 !important }`);
+      GM_addStyle(`#smh-msg-box { z-index: 2147483647 !important }`);
 
       const handlePrevNext = (cid: number) => {
         if (cid === 0) return undefined;

diff --git a/src/site/dmzj_phone.tsx b/src/site/dmzj_phone.tsx
@@ -103,7 +103,7 @@ import {
       });
 
       document.body.childNodes[0].remove();
-      await GM.addStyle(
+      GM_addStyle(
         `
           h1 {
             margin: 0 -20vw;
@@ -135,7 +135,7 @@ import {
     case 'view': {
       // 如果不是隐藏漫画，直接进入阅读模式
       if (unsafeWindow.comic_id) {
-        await GM.addStyle('.subHeader{display:none !important}');
+        GM_addStyle('.subHeader{display:none !important}');
 
         await universalInit({
           name: 'dmzj',

diff --git a/src/site/nhentai.tsx b/src/site/nhentai.tsx
@@ -75,10 +75,10 @@ declare const gallery: { num_pages: number; media_id: string; images: Images };
     // blacklist === null 时是未登录
 
     if (options.block_totally && blacklist?.length)
-      await GM.addStyle('.blacklisted.gallery { display: none; }');
+      GM_addStyle('.blacklisted.gallery { display: none; }');
 
     if (options.auto_page_turn) {
-      await GM.addStyle(`
+      GM_addStyle(`
         hr { bottom: 0; box-sizing: border-box; margin: -1em auto 2em; }
         hr:last-child { position: relative; animation: load .8s linear alternate infinite; }
         hr:not(:last-child) { display: none; }

diff --git a/src/site/yamibo.tsx b/src/site/yamibo.tsx
@@ -31,7 +31,7 @@ interface History {
       自动签到: true,
     });
 
-  await GM.addStyle(
+  GM_addStyle(
     `#fab { --fab: #6E2B19; fab-hover: #A15640; }
 
     ${