fix: 🐛 修复 ehentai 匹配 hitomi 功能在 CG 类画廊上未启用的 bug

#243

Author: hymbz

src/site/ehentai/crossSiteLink.tsx

@@ -14,7 +14,7 @@ import {
 } from 'helper';
 import { request, toast } from 'main';
 
-import type { GalleryContext } from './helper';
+import { isInCategories, type GalleryContext } from './helper';
 
 type ItemData = {
   id: string;
@@ -24,10 +24,12 @@ type ItemData = {
   class: string;
 };
 
-const nhentai = async ({
-  setState,
-  galleryTitle,
-}: GalleryContext): Promise<ItemData[]> => {
+type SiteFn = {
+  (context: GalleryContext): Promise<ItemData[]>;
+  errorTip: (context: GalleryContext) => string;
+};
+
+const nhentai: SiteFn = async ({ setState, galleryTitle }) => {
   type ComicInfo = {
     id: number;
     media_id: string;
@@ -93,15 +95,12 @@ const nhentai = async ({
     };
   });
 };
-nhentai.errorTip = (context: GalleryContext) =>
+nhentai.errorTip = (context) =>
   t('site.ehentai.nhentai_failed', {
     nhentai: `<a href='https://nhentai.net/search/?q=${context.galleryTitle}' target="_blank"> <u> nhentai </u> </a>`,
   });
 
-const hitomi = async ({
-  setState,
-  galleryId,
-}: GalleryContext): Promise<ItemData[]> => {
+const hitomi = async ({ setState, galleryId }) => {
   const domain = 'gold-usergeneratedcontent.net';
 
   const downImg = async (url: string) => {
@@ -174,11 +173,17 @@ hitomi.errorTip = () => t('site.ehentai.hitomi_error');
 
 /** 关联外站 */
 export const crossSiteLink = async (context: GalleryContext) => {
-  /** 只处理「Doujinshi」「Manga」 */
-  if (!querySelector('#gdc > .cs:is(.ct2, .ct3)')) return;
   if (!context.galleryTitle)
     return toast.error(t('site.ehentai.html_changed_link_failed'));
 
+  // 根据当前分类判断要匹配哪些站点
+  const siteList: SiteFn[] = [];
+  if (isInCategories('Doujinshi', 'Manga', 'Artist CG', 'Game CG', 'Image Set'))
+    siteList.push(hitomi);
+  if (isInCategories('Doujinshi', 'Manga')) siteList.push(nhentai);
+
+  if (siteList.length === 0) return;
+
   const [comicMap, setComicMap] = createStore<
     Record<string, ItemData[] | string>
   >({});
@@ -260,7 +265,7 @@ export const crossSiteLink = async (context: GalleryContext) => {
   });
 
   // 获取外站数据
-  for (const getSiteComic of [hitomi, nhentai]) {
+  for (const getSiteComic of siteList) {
     setComicMap(getSiteComic.name, 'searching...');
     try {
       const itemList = await getSiteComic(context);

src/site/ehentai/helper/index.ts

@@ -1,4 +1,6 @@
-import { querySelectorAll } from 'helper';
+import { querySelector, querySelectorAll } from 'helper';
+
+export * from './context';
 
 type EscHandler = { (): true | unknown; order: number }[];
 export const escHandler: EscHandler = [];
@@ -59,4 +61,24 @@ export const getTagNameFull = (tag: string) => {
   return tag;
 };
 
-export * from './context';
+/** 画廊分类图标对应的 class。在列表页是「.ct2」，在画廊里是「.gt2」 */
+const categoriesMap = {
+  Western: 'ta',
+  Misc: 't1',
+  Doujinshi: 't2',
+  Manga: 't3',
+  'Artist CG': 't4',
+  'Game CG': 't5',
+  'Image Set': 't6',
+  Cosplay: 't7',
+  'Asian Porn': 't8',
+  'Non-H': 't9',
+} as const;
+
+/** 判断是否当前画廊是否是指定的分类 */
+export const isInCategories = (...name: (keyof typeof categoriesMap)[]) =>
+  Boolean(
+    querySelector(
+      `#gdc > .cs:is(${name.map((c) => `.c${categoriesMap[c]}`).join(', ')})`,
+    ),
+  );

src/site/ehentai/index.tsx

@@ -39,7 +39,7 @@ import { crossSiteLink } from './crossSiteLink';
 import { detectAd } from './detectAd';
 import { expandTagList } from './expandTagList';
 import { floatTagList } from './floatTagList';
-import { createEhContext, escHandler } from './helper';
+import { createEhContext, escHandler, isInCategories } from './helper';
 import { addHotkeysActions } from './hotkeys';
 import { quickFavorite } from './quickFavorite';
 import { quickRating } from './quickRating';
@@ -161,8 +161,7 @@ import { tagLint } from './tagLint';
   // 自动调整阅读配置
   if (
     options.auto_adjust_option &&
-    // 在「Doujinshi」「Manga」「Non-H」以外的分类下
-    !querySelector('#gdc > .cs:is(.ct2, .ct3, .ct9)')
+    !isInCategories('Doujinshi', 'Manga', 'Non-H')
   ) {
     let option: MangaProps['defaultOption'] = {
       // 使用单页模式

src/site/ehentai/tagLint.tsx

@@ -22,11 +22,11 @@ import {
 
 import type { GalleryContext } from './helper';
 
-import { getTaglist, getTagNameFull } from './helper';
+import { getTaglist, getTagNameFull, isInCategories } from './helper';
 
 export const tagLint = ({ dom: { newTagField } }: GalleryContext) => {
   /** 是否是「Doujinshi」「Manga」「Non-H」 */
-  const isManga = querySelector('#gdc > .cs:is(.ct2, .ct3, .ct9)');
+  const isManga = isInCategories('Doujinshi', 'Manga', 'Non-H');
 
   const lintRules = getTagLintRules();
   type RuleNames = keyof typeof lintRules;
@@ -157,10 +157,7 @@ export const tagLint = ({ dom: { newTagField } }: GalleryContext) => {
       addOtherWarn(t('eh_tag_lint.correct_tag'), correctTags);
 
     // 涉及到图库类型的，比较复杂的检查
-    if (
-      querySelector('#gdc > .cs.ct2') &&
-      isMissingNamespace(tagList, 'parody')
-    )
+    if (isInCategories('Doujinshi') && isMissingNamespace(tagList, 'parody'))
       addOtherWarn(t('eh_tag_lint.miss_parody'), ['parody:original']);
     if (
       isManga &&