koishi-plugin-weibo-post-monitor 0.0.4 → 0.0.6

package/lib/index.js

@@ -46,7 +46,7 @@ var Config = import_koishi.Schema.object({
   sendINFO: import_koishi.Schema.array(import_koishi.Schema.object({
     weiboUID: import_koishi.Schema.string().description("微博用户UID"),
     forward: import_koishi.Schema.boolean().default(false).description("是否监听转发"),
-    blockwords: import_koishi.Schema.string().description("屏蔽词(多个关键词用分号分隔)"),
+    blockwords: import_koishi.Schema.string().description("屏蔽词(多个屏蔽词用分号分隔)"),
     keywords: import_koishi.Schema.string().description("关键词(多个关键词用分号分隔)"),
     groupID: import_koishi.Schema.string().description("需要发送的群组"),
     sendAll: import_koishi.Schema.boolean().default(false).description("@全体成员")
@@ -90,10 +90,22 @@ var getWeiboAndSendMessageToGroup = /* @__PURE__ */ __name(async (ctx, params) =
   }
   let message = result;
   if (params.sendAll) {
-    message = '<at id="all"/> ' + message;
+    message = import_koishi.h.at("all") + " " + message;
   }
-  ctx.bots[`${params.plantform}:${params.account}`].sendMessage(params.groupID, message);
+  console.log(message);
 }, "getWeiboAndSendMessageToGroup");
+var getLastPost = /* @__PURE__ */ __name((params, weiboList) => {
+  for (const wb_element of weiboList) {
+    const result = getMessage(params, wb_element);
+    if (!result) {
+      continue;
+    }
+    if (result.islast) {
+      return result.post;
+    }
+  }
+  return null;
+}, "getLastPost");
 var getMessage = /* @__PURE__ */ __name((params, wbPost) => {
   if (!wbPost) {
     return null;
@@ -116,8 +128,6 @@ var getMessage = /* @__PURE__ */ __name((params, wbPost) => {
     weiboType = 1;
   }
   let message = "";
-  let keywordsList = params.keywords?.split(";") || [];
-  let blockwordsList = params.blockwords?.split(";") || [];
   if (weiboType == 0) {
     const pageInfo = wbPost?.page_info;
     if (!pageInfo) {
@@ -140,35 +150,14 @@ var getMessage = /* @__PURE__ */ __name((params, wbPost) => {
     const picIds = wbPost?.pic_ids || [];
     const picInfos = wbPost?.pic_infos || {};
     const firstPicUrl = picInfos?.[picIds[0]]?.large?.url || "";
-    const picture = `<img src="${firstPicUrl}"/>`;
+    const picture = import_koishi.h.image(firstPicUrl);
     message += screenName + " 发布了微博:\n" + text + "\n" + picture || "";
   }
   const mid = wbPost?.mid || "";
   const url = `
 链接：https://m.weibo.cn/status/${mid}`;
-  if (keywordsList.length > 0) {
-    let hasKeywords = false;
-    for (const keyword of keywordsList) {
-      if (message.includes(keyword)) {
-        hasKeywords = true;
-        break;
-      }
-    }
-    if (!hasKeywords) {
-      return null;
-    }
-  }
-  if (blockwordsList.length > 0) {
-    let hasBlockwords = false;
-    for (const blockword of blockwordsList) {
-      if (message.includes(blockword)) {
-        hasBlockwords = true;
-        break;
-      }
-    }
-    if (hasBlockwords) {
-      return null;
-    }
+  if (!checkWords(params, wbPost?.text_raw)) {
+    return null;
   }
   const wbpost = message ? message + url : screenName + " 发布了微博:\n" + wbPost?.text_raw + url || "";
   return { post: wbpost, islast: true };
@@ -242,18 +231,37 @@ var parseDateString = /* @__PURE__ */ __name((dateString) => {
   date.setUTCMinutes(date.getUTCMinutes() - timezoneOffset);
   return date;
 }, "parseDateString");
-var getLastPost = /* @__PURE__ */ __name((params, weiboList) => {
-  for (const wb_element of weiboList) {
-    const result = getMessage(params, wb_element);
-    if (!result) {
-      continue;
+var checkWords = /* @__PURE__ */ __name((params, message) => {
+  if (message == null)
+    return false;
+  let keywordsList = params.keywords?.split(";") || [];
+  let blockwordsList = params.blockwords?.split(";") || [];
+  if (keywordsList.length > 0) {
+    let hasKeywords = false;
+    for (const keyword of keywordsList) {
+      if (message.includes(keyword)) {
+        hasKeywords = true;
+        break;
+      }
     }
-    if (result.islast) {
-      return result.post;
+    if (!hasKeywords) {
+      return false;
     }
   }
-  return null;
-}, "getLastPost");
+  if (blockwordsList.length > 0) {
+    let hasBlockwords = false;
+    for (const blockword of blockwordsList) {
+      if (message.includes(blockword)) {
+        hasBlockwords = true;
+        break;
+      }
+    }
+    if (hasBlockwords) {
+      return false;
+    }
+  }
+  return true;
+}, "checkWords");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/package.json

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