koishi-plugin-weibo-post-monitor 1.0.1-beta.2 → 1.0.1-beta.4

package/lib/index.js

@@ -356,13 +356,14 @@ async function getMessage(params, wbPost) {
   }
   const screenName = user?.screen_name || "";
   let weiboType = -1;
-  if ("page_info" in wbPost) {
+  logger.info("wbPost = " + JSON.stringify(wbPost));
+  if (wbPost?.page_info) {
     weiboType = 0;
   }
-  if ("pic_infos" in wbPost) {
+  if (wbPost?.pic_infos && wbPost?.pic_ids && wbPost.pic_ids.length > 0) {
     weiboType = 2;
   }
-  if ("topic_struct" in wbPost || "retweeted_status" in wbPost) {
+  if (wbPost?.retweeted_status) {
     weiboType = 1;
   }
   let message_text = "";
@@ -371,7 +372,6 @@ async function getMessage(params, wbPost) {
     return null;
   }
   if (weiboType == 0) {
-    logger.info("获取到类型 0-视频");
     const pageInfo = wbPost?.page_info;
     if (!pageInfo) {
       return null;
@@ -383,23 +383,21 @@ async function getMessage(params, wbPost) {
     }
   }
   if (weiboType == 1) {
-    logger.info("获取到类型 1-转发微博");
     if (params.forward) {
       tempMessage += screenName + " 转发了微博:\n{temp_text}" || "";
     }
   }
   if (weiboType == 2) {
-    logger.info("获取到类型 2-图文");
     const picIds = wbPost?.pic_ids || [];
     const picInfos = wbPost?.pic_infos || {};
     const firstPicUrl = picInfos?.[picIds[0]]?.large?.url || "";
     const picture = import_koishi2.h.image(firstPicUrl);
     tempMessage += screenName + " 发布了微博:\n{temp_text}\n" + picture || "";
   }
-  logger.info("weiboType = " + weiboType);
   const mid = wbPost?.mid || "";
   const url = `https://m.weibo.cn/status/${mid}`;
   const detailMessage = await getDetailMessage(url);
+  logger.info("detailMessage = " + detailMessage);
   if (detailMessage) {
     message_text = detailMessage;
   } else {
@@ -446,16 +444,17 @@ function stripHtmlTags(html) {
 __name(stripHtmlTags, "stripHtmlTags");
 async function getDetailMessage(wb_url) {
   try {
-    const cookie = getCookie();
-    const userAgent = getUserAgent();
-    if (!cookie) {
+    let auto_cookie2 = getCookie();
+    let now_user_agent2 = getUserAgent();
+    if (!auto_cookie2) {
       return null;
     }
     const headers = {
-      "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
-      "accept-language": "zh-CN,zh;q=0.9",
-      "user-agent": userAgent || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
-      "cookie": cookie
+      "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+      "accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
+      "cache-control": "no-cache",
+      "user-agent": now_user_agent2,
+      "cookie": auto_cookie2
     };
     const response = await import_axios2.default.get(wb_url, {
       headers,
@@ -487,6 +486,7 @@ async function getDetailMessage(wb_url) {
     const context = (0, import_vm.createContext)({});
     (0, import_vm.runInContext)(code, context);
     const renderData = context.$render_data;
+    logger.info("renderData = " + JSON.stringify(renderData));
     if (!renderData || !renderData.status || !renderData.status.text) {
       return null;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-weibo-post-monitor",
   "description": "微博帖子更新推送插件，用于获取指定微博用户的最新帖子推送到指定群聊，参考代码https://github.com/moehuhu/weibo-monitor",
-  "version": "1.0.1-beta.2",
+  "version": "1.0.1-beta.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [