koishi-plugin-twitter-fetcher 2.0.1 → 2.0.2

package/lib/index.js

@@ -166,6 +166,10 @@ function sanitizeMediaUrl(url) {
   return url.trim().replace(/&/g, "&").replace(/\\u002F/g, "/").replace(/\\\//g, "/").replace(/[),.;\]]+$/g, "");
 }
 __name(sanitizeMediaUrl, "sanitizeMediaUrl");
+function hasPotentialMediaGate(text) {
+  return /(age-restricted|adult content|sensitive content|potentially sensitive|sign in to confirm|年龄|成人内容|敏感内容|可能包含敏感)/i.test(text);
+}
+__name(hasPotentialMediaGate, "hasPotentialMediaGate");
 function mimeToExtension(mime = "") {
   if (mime.includes("png")) return ".png";
   if (mime.includes("webp")) return ".webp";
@@ -346,7 +350,9 @@ async function getTweetDataByBrowser(puppeteer, tweetUrl, cookie, useOriginal, l
         text: textEl?.textContent?.trim() || "",
         author: authorNameEl?.textContent?.trim() || "",
         userScreenName: authorIdHref ? authorIdHref.slice(1) : "",
-        urls
+        urls,
+        gateText: `${article.textContent || ""}
+${document.body.textContent || ""}`
       };
     }, tweetId);
     const domKeys = /* @__PURE__ */ new Set();
@@ -360,7 +366,11 @@ async function getTweetDataByBrowser(puppeteer, tweetUrl, cookie, useOriginal, l
         addMedia(url, mediaType);
       }
     }
-    const media = Array.from(captured.entries()).filter(([key]) => !domKeys.size || domKeys.has(key)).map(([, value]) => value);
+    if (!domKeys.size && captured.size) {
+      const gateHint = data?.gateText && hasPotentialMediaGate(data.gateText) ? "检测到页面可能存在年龄墙或敏感内容遮挡。" : "";
+      log?.(`${gateHint}目标推文 DOM 未确认任何媒体，已拒绝发送 ${captured.size} 个浏览器捕获资源，避免误发头像或页面图标。`, true);
+    }
+    const media = Array.from(captured.entries()).filter(([key]) => domKeys.has(key)).map(([, value]) => value);
     log?.(`浏览器解析完成: text=${data?.text ? "yes" : "no"}, domMedia=${domKeys.size}, capturedMedia=${captured.size}, media=${media.length}`);
     return {
       text: data?.text || "",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-twitter-fetcher",
   "description": "一个推特/Twitter/X内容获取与订阅插件，支持链接实时解析和用户后台订阅推送。",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -34,12 +34,12 @@
     "ffmpeg",
     "browser"
   ],
-  "peerDependencies": {
-    "@koishijs/plugin-console": "^5.30.0",
-    "koishi": "^4.18.7",
-    "koishi-plugin-ffmpeg": "^1.1.0",
-    "koishi-plugin-puppeteer": "*"
-  },
+  "peerDependencies": {
+    "@koishijs/plugin-console": "^5.30.0",
+    "koishi": "^4.18.7",
+    "koishi-plugin-ffmpeg": "^1.1.0",
+    "koishi-plugin-puppeteer": "*"
+  },
   "koishi": {
     "description": {
       "zh": "自动解析推特/Twitter/X链接，聚合内容。支持订阅推送、浏览器原生获取、真 GIF 和多种媒体发送方式。"
@@ -49,21 +49,21 @@
         "puppeteer",
         "database"
       ],
-      "optional": [
-        "console",
-        "ffmpeg"
-      ]
-    }
-  },
+      "optional": [
+        "console",
+        "ffmpeg"
+      ]
+    }
+  },
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --format=cjs --target=node18 --external:koishi --external:koishi-plugin-puppeteer --external:@koishijs/plugin-console --outfile=lib/index.js && tsc --emitDeclarationOnly"
   },
   "peerDependenciesMeta": {
-    "@koishijs/plugin-console": {
-      "optional": true
-    },
-    "koishi-plugin-ffmpeg": {
-      "optional": true
-    }
-  }
-}
+    "@koishijs/plugin-console": {
+      "optional": true
+    },
+    "koishi-plugin-ffmpeg": {
+      "optional": true
+    }
+  }
+}

package/readme.md

@@ -133,6 +133,7 @@
 
 ## 更新日志
 
+*   **v2.0.2**: 修复 v2.0.1 中浏览器媒体安全日志类型不匹配导致的 TypeScript 编译错误。
 *   **v2.0.1**: 修复浏览器媒体模式在年龄墙、敏感内容遮挡或登录墙下可能误发头像、图标等页面资源的问题。现在只会发送目标推文 DOM 中确认过的媒体。
 *   **v2.0.0**: 新增右侧悬浮侧边栏、推文/媒体获取方式选择、浏览器媒体原图策略、GIF 转换、图片/视频文件发送方式设置、媒体独立发送开关。
 *   **v1.1.6**: 新增原图下载功能，支持在解析和推送时分别配置是否下载最高画质原图。