karin-plugin-kkk 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # 变更日志
 
+## [1.2.2](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.2.1...v1.2.2) (2025-04-13)
+
+
+### Bug Fixes
+
+* **bilibili:** 修复转发动态过滤逻辑中的遗漏条件 ([d11f485](https://github.com/ikenxuan/karin-plugin-kkk/commit/d11f485174d16f86a0b1d1918f05597614db3bd3))
+* **bilibili:** 添加空值检查以防止动态标签过滤时崩溃 ([2e3c7b1](https://github.com/ikenxuan/karin-plugin-kkk/commit/2e3c7b151eb46082611f82573146f1c4c8756978))
+* ci ([e73e132](https://github.com/ikenxuan/karin-plugin-kkk/commit/e73e13294efea2a471c5ce0dc14937ddc5d862a2))
+* **web.config.ts:** 优化推送配置组件布局和描述信息 ([be34225](https://github.com/ikenxuan/karin-plugin-kkk/commit/be342256032f2fad1e7122f7066dd579693a699b))
+* **抖音推送:** 修复视频下载链接获取逻辑，增加备用链接 ([d090f88](https://github.com/ikenxuan/karin-plugin-kkk/commit/d090f88d432ba4e9368642fd6ce0d04838a742c5))
+
 ## [1.2.1](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.2.0...v1.2.1) (2025-04-09)
 
 

package/lib/apps/admin.js

@@ -1,7 +1,7 @@
 import { createRequire } from 'module';
 import '../chunk-SLADWUI4.js';
-import { bilibiliLogin, douyinLogin } from '../chunk-CZCM6XX6.js';
-import { Config, Common, Render } from '../chunk-EQOCF3T7.js';
+import { bilibiliLogin, douyinLogin } from '../chunk-EOPASE74.js';
+import { Config, Common, Render } from '../chunk-NDSCNB4K.js';
 import { init_esm_shims } from '../chunk-FOF5UXCN.js';
 import fs from 'node:fs';
 import karin, { logger, Plugin } from 'node-karin';

package/lib/apps/help.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'module';
-import { Render, Config, Version, Common } from '../chunk-EQOCF3T7.js';
+import { Render, Config, Version, Common } from '../chunk-NDSCNB4K.js';
 import { init_esm_shims } from '../chunk-FOF5UXCN.js';
 import { execSync } from 'node:child_process';
 import fs from 'node:fs';

package/lib/apps/push.js

@@ -1,7 +1,7 @@
 import { createRequire } from 'module';
 import '../chunk-SLADWUI4.js';
-import { DouYinpush, Bilibilipush } from '../chunk-CZCM6XX6.js';
-import { Config, getDouyinData, getBilibiliData } from '../chunk-EQOCF3T7.js';
+import { DouYinpush, Bilibilipush } from '../chunk-EOPASE74.js';
+import { Config, getDouyinData, getBilibiliData } from '../chunk-NDSCNB4K.js';
 import { init_esm_shims } from '../chunk-FOF5UXCN.js';
 import karin from 'node-karin';
 

package/lib/apps/tools.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'module';
-import { getDouyinID, DouYin, getBilibiliID, Bilibili, getKuaishouID, fetchKuaishouData, Kuaishou } from '../chunk-CZCM6XX6.js';
-import { Config, Common } from '../chunk-EQOCF3T7.js';
+import { getDouyinID, DouYin, getBilibiliID, Bilibili, getKuaishouID, fetchKuaishouData, Kuaishou } from '../chunk-EOPASE74.js';
+import { Config, Common } from '../chunk-NDSCNB4K.js';
 import { init_esm_shims } from '../chunk-FOF5UXCN.js';
 import karin from 'node-karin';
 

package/lib/{chunk-CZCM6XX6.js → chunk-EOPASE74.js}

@@ -1,5 +1,5 @@
 import { createRequire } from 'module';
-import { index_default, Config, Networks, Common, Base, cleanOldDynamicCache, bilibiliDB, getBilibiliData, Render, bilibiliAPI, mergeFile, Version, douyinDB, getDouyinData, wbi_sign } from './chunk-EQOCF3T7.js';
+import { index_default, Config, Networks, Common, Base, cleanOldDynamicCache, bilibiliDB, getBilibiliData, Render, bilibiliAPI, mergeFile, Version, douyinDB, getDouyinData, wbi_sign } from './chunk-NDSCNB4K.js';
 import { init_esm_shims } from './chunk-FOF5UXCN.js';
 import fs4 from 'node:fs';
 import karin2, { logger, segment, common, karin, handler, render, mkdirSync } from 'node-karin';
@@ -145,7 +145,7 @@ function checklevel(obj) {
   return obj;
 }
 function checkvip(member) {
-  return member.vip.vipStatus === 1 ? `<span style="color: ${member.vip.nickname_color || "#FB7299"}; font-weight: 700;">${member.uname}</span>` : `<span style="color: #888">${member.uname}</span>`;
+  return member.vip.vipStatus === 1 ? `<span style="color: ${member.vip.nickname_color ?? "#FB7299"}; font-weight: 700;">${member.uname}</span>` : `<span style="color: #888">${member.uname}</span>`;
 }
 function getRelativeTimeFromTimestamp(timestamp) {
   const now = Math.floor(Date.now() / 1e3);
@@ -862,18 +862,16 @@ UID\uFF1A${host_mid}`);
   async renderPushList() {
     await this.syncConfigToDatabase();
     const groupInfo = await this.e.bot.getGroupInfo("groupId" in this.e && this.e.groupId ? this.e.groupId : "");
-    const groupId = "groupId" in this.e && this.e.groupId ? this.e.groupId : "";
-    const subscriptions = await bilibiliDB.getGroupSubscriptions(groupId);
-    if (subscriptions.length === 0) {
+    "groupId" in this.e && this.e.groupId ? this.e.groupId : "";
+    if (Config.pushlist.bilibili.length === 0) {
       await this.e.reply(`\u5F53\u524D\u7FA4\uFF1A${groupInfo.groupName}(${groupInfo.groupId})
 \u6CA1\u6709\u8BBE\u7F6E\u4EFB\u4F55B\u7AD9UP\u63A8\u9001\uFF01
 \u53EF\u4F7F\u7528\u300C#\u8BBE\u7F6EB\u7AD9\u63A8\u9001 + UP\u4E3BUID\u300D\u8FDB\u884C\u8BBE\u7F6E`);
       return;
     }
     const renderOpt = [];
-    for (const subscription of subscriptions) {
-      const host_mid = subscription.get("host_mid");
-      const userInfo = await getBilibiliData("\u7528\u6237\u4E3B\u9875\u6570\u636E", Config.cookies.bilibili, { host_mid });
+    for (const item of Config.pushlist.bilibili) {
+      const userInfo = await getBilibiliData("\u7528\u6237\u4E3B\u9875\u6570\u636E", Config.cookies.bilibili, { host_mid: item.host_mid });
       renderOpt.push({
         avatar_img: userInfo.data.card.face,
         username: userInfo.data.card.name,
@@ -904,6 +902,7 @@ function extractEmojisData(data) {
 }
 var skipDynamic = (Dynamic_Data) => {
   const filterMode = Config.bilibili.push.filterMode || "blacklist";
+  logger.debug("\u5224\u65AD\u6807\u9898\u662F\u5426\u6709\u5C4F\u853D\u8BCD\u6216\u5C4F\u853D\u6807\u7B7E: ", `https://t.bilibili.com/${Dynamic_Data.id_str}`);
   if (filterMode === "blacklist") {
     for (const filterKeywords of Config.bilibili.push.filterKeywords) {
       if (Dynamic_Data.modules.module_dynamic.major?.archive?.title.includes(filterKeywords) || Dynamic_Data.modules.module_dynamic.desc?.text?.includes(filterKeywords)) {
@@ -911,6 +910,7 @@ var skipDynamic = (Dynamic_Data) => {
         return true;
       }
       if (Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" && "orig" in Dynamic_Data) {
+        if (Dynamic_Data.orig.type === "DYNAMIC_TYPE_AV" /* AV */ || !Dynamic_Data.orig.modules.module_dynamic.desc) continue;
         if (Dynamic_Data.orig.modules.module_dynamic.major?.archive?.title.includes(filterKeywords) || Dynamic_Data.orig.modules.module_dynamic.desc?.text?.includes(filterKeywords)) {
           logger.mark(`\u8F6C\u53D1\u52A8\u6001\uFF1A${`https://t.bilibili.com/${Dynamic_Data.id_str}`} \u7684\u5B50\u52A8\u6001 ${logger.green(`https://t.bilibili.com/${Dynamic_Data.orig.id_str}`)} \u5305\u542B\u9ED1\u540D\u5355\u5173\u952E\u8BCD\uFF1A\u300C${logger.red(filterKeywords)}\u300D\uFF0C\u8DF3\u8FC7\u63A8\u9001`);
           return true;
@@ -919,6 +919,7 @@ var skipDynamic = (Dynamic_Data) => {
     }
     if (Dynamic_Data.type === "DYNAMIC_TYPE_DRAW" /* DRAW */ || Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" /* FORWARD */) {
       for (const filterTags of Config.bilibili.push.filterTags) {
+        if (!Dynamic_Data.modules.module_dynamic?.desc?.rich_text_nodes) continue;
         for (const tag of Dynamic_Data.modules.module_dynamic.desc.rich_text_nodes) {
           if (tag.orig_text.includes(filterTags)) {
             logger.mark(`\u56FE\u6587\u52A8\u6001\uFF1A${logger.green(`https://t.bilibili.com/${Dynamic_Data.id_str}`)} \u5305\u542B\u9ED1\u540D\u5355\u6807\u7B7E\uFF1A\u300C${logger.red(filterTags)}\u300D\uFF0C\u8DF3\u8FC7\u63A8\u9001`);
@@ -926,6 +927,7 @@ var skipDynamic = (Dynamic_Data) => {
           }
         }
         if (Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" && "orig" in Dynamic_Data) {
+          if (Dynamic_Data.orig.type === "DYNAMIC_TYPE_AV" /* AV */ || !Dynamic_Data.orig.modules.module_dynamic.desc) continue;
           for (const tag of Dynamic_Data.orig.modules.module_dynamic.desc.rich_text_nodes) {
             if (tag.orig_text.includes(filterTags)) {
               logger.mark(`\u8F6C\u53D1\u52A8\u6001\uFF1A${`https://t.bilibili.com/${Dynamic_Data.id_str}`} \u7684\u5B50\u52A8\u6001 ${logger.green(`https://t.bilibili.com/${Dynamic_Data.orig.id_str}`)} \u5305\u542B\u9ED1\u540D\u5355\u6807\u7B7E\uFF1A\u300C${logger.red(filterTags)}\u300D\uFF0C\u8DF3\u8FC7\u63A8\u9001`);
@@ -949,6 +951,7 @@ var skipDynamic = (Dynamic_Data) => {
           return false;
         }
         if (Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" && "orig" in Dynamic_Data) {
+          if (Dynamic_Data.orig.type === "DYNAMIC_TYPE_AV" /* AV */ || !Dynamic_Data.orig.modules.module_dynamic.desc) continue;
           if (Dynamic_Data.orig.modules.module_dynamic.major?.archive?.title?.includes(whiteKeyword) || Dynamic_Data.orig.modules.module_dynamic.desc?.text?.includes(whiteKeyword)) {
             logger.mark(`\u8F6C\u53D1\u52A8\u6001\uFF1A${`https://t.bilibili.com/${Dynamic_Data.id_str}`} \u7684\u5B50\u52A8\u6001 ${logger.green(`https://t.bilibili.com/${Dynamic_Data.orig.id_str}`)} \u5305\u542B\u767D\u540D\u5355\u5173\u952E\u8BCD\uFF1A\u300C${logger.green(whiteKeyword)}\u300D\uFF0C\u5141\u8BB8\u63A8\u9001`);
             return false;
@@ -958,6 +961,7 @@ var skipDynamic = (Dynamic_Data) => {
     }
     if (hasTagWhitelist && (Dynamic_Data.type === "DYNAMIC_TYPE_DRAW" /* DRAW */ || Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" /* FORWARD */)) {
       for (const whiteTag of Config.bilibili.push.whitelistTags) {
+        if (!Dynamic_Data.modules.module_dynamic?.desc?.rich_text_nodes) continue;
         for (const tag of Dynamic_Data.modules.module_dynamic.desc.rich_text_nodes) {
           if (tag.orig_text.includes(whiteTag)) {
             logger.mark(`\u56FE\u6587\u52A8\u6001\uFF1A${logger.green(`https://t.bilibili.com/${Dynamic_Data.id_str}`)} \u5305\u542B\u767D\u540D\u5355\u6807\u7B7E\uFF1A\u300C${logger.green(whiteTag)}\u300D\uFF0C\u5141\u8BB8\u63A8\u9001`);
@@ -965,6 +969,7 @@ var skipDynamic = (Dynamic_Data) => {
           }
         }
         if (Dynamic_Data.type === "DYNAMIC_TYPE_FORWARD" && "orig" in Dynamic_Data) {
+          if (Dynamic_Data.orig.type === "DYNAMIC_TYPE_AV" /* AV */ || !Dynamic_Data.orig.modules.module_dynamic.desc) continue;
           for (const tag of Dynamic_Data.orig.modules.module_dynamic.desc.rich_text_nodes) {
             if (tag.orig_text.includes(whiteTag)) {
               logger.mark(`\u8F6C\u53D1\u52A8\u6001\uFF1A${`https://t.bilibili.com/${Dynamic_Data.id_str}`} \u7684\u5B50\u52A8\u6001 ${logger.green(`https://t.bilibili.com/${Dynamic_Data.orig.id_str}`)} \u5305\u542B\u767D\u540D\u5355\u6807\u7B7E\uFF1A\u300C${logger.green(whiteTag)}\u300D\uFF0C\u5141\u8BB8\u63A8\u9001`);
@@ -1062,7 +1067,7 @@ var Bilibili = class extends Base {
           img = await Render("bilibili/comment", {
             Type: "\u89C6\u9891",
             CommentsData: commentsdata,
-            CommentLength: String(commentsdata?.length ? commentsdata.length : 0),
+            CommentLength: String(commentsdata?.length ?? 0),
             share_url: "https://b23.tv/" + infoData.data.bvid,
             Clarity: Config.bilibili.videopriority === true ? nockData.data.accept_description[0] : correctList.accept_description[0],
             VideoSize: Config.bilibili.videopriority === true ? (nockData.data.durl[0].size / (1024 * 1024)).toFixed(2) : videoSize,
@@ -1187,9 +1192,9 @@ ${this.downloadfilename}
               img = await Render("bilibili/comment", {
                 Type: "\u52A8\u6001",
                 CommentsData: commentsdata,
-                CommentLength: String(commentsdata?.length ? commentsdata.length : 0),
+                CommentLength: String(commentsdata?.length ?? 0),
                 share_url: "https://t.bilibili.com/" + dynamicInfo.data.item.id_str,
-                ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length || "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
+                ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length ?? "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
                 shareurl: "\u52A8\u6001\u5206\u4EAB\u94FE\u63A5"
               });
               if (imgArray.length === 1) await this.e.reply(imgArray[0]);
@@ -1259,7 +1264,7 @@ ${this.downloadfilename}
                 CommentsData: bilibiliComments(commentsData),
                 CommentLength: String(bilibiliComments(commentsData)?.length ? bilibiliComments(commentsData).length : 0),
                 share_url: "https://t.bilibili.com/" + dynamicInfo.data.item.id_str,
-                ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length || "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
+                ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length ?? "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
                 shareurl: "\u52A8\u6001\u5206\u4EAB\u94FE\u63A5"
               })
             );
@@ -1368,7 +1373,7 @@ ${this.downloadfilename}
                   CommentsData: bilibiliComments(commentsData),
                   CommentLength: String(bilibiliComments(commentsData)?.length ? bilibiliComments(commentsData).length : 0),
                   share_url: "https://www.bilibili.com/video/" + bvid,
-                  ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length || "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
+                  ImageLength: dynamicInfo.data.item.modules?.module_dynamic?.major?.draw?.items?.length ?? "\u52A8\u6001\u4E2D\u6CA1\u6709\u9644\u5E26\u56FE\u7247",
                   shareurl: "\u52A8\u6001\u5206\u4EAB\u94FE\u63A5"
                 })
               );
@@ -1550,7 +1555,7 @@ ${this.downloadfilename}
   }
 };
 function checkvip3(member) {
-  return member.vip.vipStatus || member.vip.status === 1 ? `<span style="color: ${member.vip.nickname_color || "#FB7299"}; font-weight: 700;">${member.name}</span>` : `<span style="color: ${Common.useDarkTheme() ? "#e9e9e9" : "#313131"}; font-weight: 700;">${member.name}</span>`;
+  return member.vip.vipStatus || member.vip.status === 1 ? `<span style="color: ${member.vip.nickname_color ?? "#FB7299"}; font-weight: 700;">${member.name}</span>` : `<span style="color: ${Common.useDarkTheme() ? "#e9e9e9" : "#313131"}; font-weight: 700;">${member.name}</span>`;
 }
 function br3(data) {
   return data = data.replace(/\n/g, "<br>");
@@ -1664,9 +1669,9 @@ async function douyinComments(data, emojidata) {
     const nickname = data.comments[i].user.nickname;
     const userimageurl = data.comments[i].user.avatar_thumb.url_list[0];
     const text = data.comments[i].text;
-    const ip = data.comments[i].ip_label ? data.comments[i].ip_label : "\u672A\u77E5";
+    const ip = data.comments[i].ip_label ?? "\u672A\u77E5";
     const time = data.comments[i].create_time;
-    const label_type = data.comments[i].label_type ? data.comments[i].label_type : -1;
+    const label_type = data.comments[i].label_type ?? -1;
     const sticker = data.comments[i].sticker ? data.comments[i].sticker.animate_url.url_list[0] : null;
     const digg_count = data.comments[i].digg_count;
     const imageurl = data.comments[i].image_list && data.comments[i].image_list[0] && data.comments[i].image_list[0].origin_url && data.comments[i].image_list[0].origin_url.url_list ? data.comments[i].image_list[0].origin_url.url_list[0] : null;
@@ -2165,7 +2170,7 @@ var DouYinpush = class extends Base {
                   }).getLongLink();
                 } else {
                   downloadUrl = await new Networks({
-                    url: Detail_Data.video.play_addr_h264.url_list[2] ?? Detail_Data.video.play_addr_h264.url_list[2],
+                    url: Detail_Data.video.bit_rate[0].play_addr.url_list[2] ?? Detail_Data.video.play_addr_h264.url_list[2] ?? Detail_Data.video.play_addr_h264.url_list[2],
                     headers: this.headers
                   }).getLongLink();
                 }
@@ -2395,18 +2400,15 @@ sec_uid${UserInfoData.user.sec_uid}`);
   async renderPushList() {
     await this.syncConfigToDatabase();
     const groupInfo = await this.e.bot.getGroupInfo("groupId" in this.e && this.e.groupId ? this.e.groupId : "");
-    const groupId = "groupId" in this.e && this.e.groupId ? this.e.groupId : "";
-    const subscriptions = await douyinDB.getGroupSubscriptions(groupId);
-    if (subscriptions.length === 0) {
+    if (Config.pushlist.douyin.length === 0) {
       await this.e.reply(`\u5F53\u524D\u7FA4\uFF1A${groupInfo.groupName}(${groupInfo.groupId})
 \u6CA1\u6709\u8BBE\u7F6E\u4EFB\u4F55\u6296\u97F3\u535A\u4E3B\u63A8\u9001\uFF01
 \u53EF\u4F7F\u7528\u300C#\u8BBE\u7F6E\u6296\u97F3\u63A8\u9001 + \u6296\u97F3\u53F7\u300D\u8FDB\u884C\u8BBE\u7F6E`);
       return;
     }
     const renderOpt = [];
-    for (const subscription of subscriptions) {
-      const sec_uid = subscription.get("sec_uid");
-      const userInfo = await getDouyinData("\u7528\u6237\u4E3B\u9875\u6570\u636E", Config.cookies.douyin, { sec_uid });
+    for (const item of Config.pushlist.douyin) {
+      const userInfo = await getDouyinData("\u7528\u6237\u4E3B\u9875\u6570\u636E", Config.cookies.douyin, { sec_uid: item.sec_uid });
       renderOpt.push({
         avatar_img: userInfo.user.avatar_larger.url_list[0],
         username: userInfo.user.nickname,
@@ -2705,7 +2707,7 @@ var DouYin = class extends Base {
             }).getLongLink();
           } else {
             g_video_url = await new Networks({
-              url: video.play_addr_h264.url_list[2] || video.play_addr_h264.url_list[2],
+              url: video.play_addr_h264.url_list[2] ?? video.play_addr_h264.url_list[2],
               headers: this.headers
             }).getLongLink();
           }
@@ -2737,7 +2739,7 @@ ${g_video_url}`));
             {
               Type: this.is_mp4 ? "\u89C6\u9891" : this.is_slides ? "\u5408\u8F91" : "\u56FE\u96C6",
               CommentsData: commentsArray,
-              CommentLength: String(commentsArray.jsonArray?.length ? commentsArray.jsonArray.length : 0),
+              CommentLength: String(commentsArray.jsonArray?.length ?? 0),
               share_url: this.is_mp4 ? `https://aweme.snssdk.com/aweme/v1/play/?video_id=${VideoData.aweme_detail.video.play_addr.uri}&ratio=1080p&line=0` : VideoData.aweme_detail.share_url,
               Title: g_title,
               VideoSize: mp4size,
@@ -3080,7 +3082,7 @@ var Kuaishou = class extends Base {
       Type: "\u89C6\u9891",
       viewCount: data.VideoData.data.visionVideoDetail.photo.viewCount,
       CommentsData,
-      CommentLength: String(CommentsData?.length ? CommentsData.length : 0),
+      CommentLength: String(CommentsData?.length ?? 0),
       share_url: video_url,
       VideoSize: fileSizeInMB,
       likeCount: data.VideoData.data.visionVideoDetail.photo.likeCount