karin-plugin-kkk 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # 变更日志
 
+## [1.6.2](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.1...v1.6.2) (2025-05-14)
+
+
+### Bug Fixes
+
+* vipStatus ([f7f1a80](https://github.com/ikenxuan/karin-plugin-kkk/commit/f7f1a8096acaa01388b8e2b04137c8d60f95c683))
+
+## [1.6.1](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.0...v1.6.1) (2025-05-14)
+
+
+### Bug Fixes
+
+* close [#88](https://github.com/ikenxuan/karin-plugin-kkk/issues/88) ([8ef73bc](https://github.com/ikenxuan/karin-plugin-kkk/commit/8ef73bc2fc1c24b43070d93adc3a1d3180231926))
+* send msg ([884b8e0](https://github.com/ikenxuan/karin-plugin-kkk/commit/884b8e0a27b9973ddf576923f2fd0e5d35bd04c8))
+* 简化抖音推送群组目标处理逻辑 ([f32d971](https://github.com/ikenxuan/karin-plugin-kkk/commit/f32d9718817dfb1e7ef6141a49d8a12245bccdef))
+* 类型安全 ([1cf5f7f](https://github.com/ikenxuan/karin-plugin-kkk/commit/1cf5f7f4132a6f478ca821132baa88a246e80df3))
+
 ## [1.6.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.5.0...v1.6.0) (2025-05-12)
 
 

package/config/default_config/bilibili.yaml

@@ -35,6 +35,14 @@ autoResolution: true
 # 谁可以触发扫码登录，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员。修改后需重启
 loginPerm: master
 
+# 视频解析时显示的内容，可选值：'cover'(封面)、'title'(标题)、'author'(作者)、'stats'(视频统计信息)、'desc'(简介)，数组为空则不显示任何内容
+displayContent:
+  - cover
+  - title
+  - author
+  - stats
+  - desc
+
 # B站推送相关配置
 push: 
   # 推送开关，开启后需重启；使用「#设置B站推送 + 用户UID」配置推送列表

package/lib/apps/admin.js

@@ -2,12 +2,12 @@ import fs from "node:fs";
 import karin, { segment, common, handler, logger } from "node-karin";
 import require$$1 from "path";
 import "sequelize";
-import { g as getBilibiliData, f as browserExports, C as Common, a as Config } from "../chunk/index-DRX4XSDJ.js";
+import { g as getBilibiliData, f as browserExports, C as Common, a as Config } from "../chunk/index-Dp9gQN2I.js";
 import { Version } from "../Version.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";
-import "../chunk/push-D60CjIo9.js";
+import "../chunk/push-BIWMkxj6.js";
 import "../chunk/index-BDlGFCbK.js";
 import { execSync, spawn } from "node:child_process";
 import { chromium } from "playwright";

package/lib/apps/help.js

@@ -4,7 +4,7 @@ import { m as markdown } from "../chunk/index-BDlGFCbK.js";
 import karin, { mkdirSync, render, segment, isPackaged, updatePkg, updateGitPlugin, logger, common, restart } from "node-karin";
 import { karinPathTemp } from "node-karin/root";
 import "sequelize";
-import { R as Render, a as Config, C as Common } from "../chunk/index-DRX4XSDJ.js";
+import { R as Render, a as Config, C as Common } from "../chunk/index-Dp9gQN2I.js";
 import { Version } from "../Version.js";
 import "node-karin/axios";
 import "stream/promises";

package/lib/apps/push.js

@@ -1,4 +1,4 @@
-import { a as Config, B as Bilibilipush, h as getDouyinData, g as getBilibiliData } from "../chunk/index-DRX4XSDJ.js";
+import { a as Config, B as Bilibilipush, h as getDouyinData, g as getBilibiliData } from "../chunk/index-Dp9gQN2I.js";
 import karin from "node-karin";
 import "sequelize";
 import "../Version.js";
@@ -6,7 +6,7 @@ import "node:fs";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";
-import { D as DouYinpush } from "../chunk/push-D60CjIo9.js";
+import { D as DouYinpush } from "../chunk/push-BIWMkxj6.js";
 import "../chunk/index-BDlGFCbK.js";
 import "node:child_process";
 import "playwright";

package/lib/apps/tools.js

@@ -1,12 +1,12 @@
 import karin, { logger } from "node-karin";
 import "sequelize";
-import { N as Networks, a as Config, e as Client, i as Base, R as Render, j as downloadVideo, k as Bilibili, C as Common } from "../chunk/index-DRX4XSDJ.js";
+import { N as Networks, a as Config, e as Client, i as Base, R as Render, j as downloadVideo, k as Bilibili, C as Common } from "../chunk/index-Dp9gQN2I.js";
 import "../Version.js";
 import "node:fs";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";
-import { g as getDouyinID, a as DouYin } from "../chunk/push-D60CjIo9.js";
+import { g as getDouyinID, a as DouYin } from "../chunk/push-BIWMkxj6.js";
 import "node:child_process";
 import "playwright";
 async function getBilibiliID(url) {

package/lib/chunk/{index-DRX4XSDJ.js → index-Dp9gQN2I.js}

@@ -30302,19 +30302,30 @@ class Bilibili extends Base {
           }) + "&platform=html5",
           headers: this.headers
         }).getData();
-        await this.e.reply([
-          segment.image(pic),
-          `
+        const replyContent = [];
+        if (Config.bilibili.displayContent && Config.bilibili.displayContent.length > 0) {
+          const contentMap = {
+            cover: segment.image(pic),
+            title: `
 📺 标题: ${title}
 `,
-          `
+            author: `
 👤 作者: ${name}
 `,
-          this.formatVideoStats(view2, danmaku, like, coin, share, favorite),
-          `
+            stats: this.formatVideoStats(view2, danmaku, like, coin, share, favorite),
+            desc: `
 
 📝 简介: ${desc}`
-        ]);
+          };
+          Config.bilibili.displayContent.forEach((item) => {
+            if (contentMap[item]) {
+              replyContent.push(contentMap[item]);
+            }
+          });
+          if (replyContent.length > 0) {
+            await this.e.reply(replyContent.reverse());
+          }
+        }
         let videoSize = "";
         let correctList;
         if (this.islogin) {
@@ -30839,7 +30850,7 @@ ${line3}`;
   }
 }
 function checkvip$2(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.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 br$2(data2) {
   return data2 = data2.replace(/\n/g, "<br>");
@@ -31146,7 +31157,7 @@ function checklevel(obj) {
   return obj;
 }
 function checkvip$1(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.status === 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 now2 = Math.floor(Date.now() / 1e3);
@@ -33383,10 +33394,10 @@ class Bilibilipush extends Base {
       let skip = await skipDynamic(data2[dynamicId]);
       let send_video = true;
       let img2 = [];
-      const dynamicCARDINFO = await this.amagi.getBilibiliData("动态卡片数据", { dynamic_id: dynamicId });
+      const dynamicCARDINFO = await this.amagi.getBilibiliData("动态卡片数据", { dynamic_id: dynamicId, typeMode: "strict" });
       const dycrad = dynamicCARDINFO.data.card && dynamicCARDINFO.data.card.card && JSON.parse(dynamicCARDINFO.data.card.card);
       if (!skip) {
-        const userINFO = await this.amagi.getBilibiliData("用户主页数据", { host_mid: data2[dynamicId].host_mid });
+        const userINFO = await this.amagi.getBilibiliData("用户主页数据", { host_mid: data2[dynamicId].host_mid, typeMode: "strict" });
         let emojiDATA = await this.amagi.getBilibiliData("Emoji数据");
         emojiDATA = extractEmojisData(emojiDATA.data.packages);
         logger$2.debug(`UP: ${data2[dynamicId].remark}
@@ -33467,12 +33478,12 @@ https://t.bilibili.com/${dynamicId}`);
             if (data2[dynamicId].Dynamic_Data.modules.module_dynamic.major.type === "MAJOR_TYPE_ARCHIVE") {
               const aid = data2[dynamicId].Dynamic_Data.modules.module_dynamic.major.archive.aid;
               const bvid = data2[dynamicId].Dynamic_Data.modules.module_dynamic.major.archive.bvid;
-              const INFODATA = await getBilibiliData("单个视频作品数据", "", { bvid });
+              const INFODATA = await getBilibiliData("单个视频作品数据", "", { bvid, typeMode: "strict" });
               if (INFODATA.data.redirect_url) {
                 send_video = false;
                 logger$2.debug(`UP主：${INFODATA.data.owner.name} 的该动态类型为${logger$2.yellow("番剧或影视")}，默认跳过不下载，直达：${logger$2.green(INFODATA.data.redirect_url)}`);
               } else {
-                await getBilibiliData("单个视频下载信息数据", "", { avid: aid, cid: INFODATA.data.cid });
+                await getBilibiliData("单个视频下载信息数据", "", { avid: aid, cid: INFODATA.data.cid, typeMode: "strict" });
               }
               img2 = await Render(
                 "bilibili/dynamic/DYNAMIC_TYPE_AV",
@@ -33543,7 +33554,7 @@ https://t.bilibili.com/${dynamicId}`);
                 break;
               }
               case "DYNAMIC_TYPE_DRAW": {
-                const dynamicCARD = await getBilibiliData("动态卡片数据", Config.cookies.bilibili, { dynamic_id: data2[dynamicId].Dynamic_Data.orig.id_str });
+                const dynamicCARD = await getBilibiliData("动态卡片数据", Config.cookies.bilibili, { dynamic_id: data2[dynamicId].Dynamic_Data.orig.id_str, typeMode: "strict" });
                 const cardData = JSON.parse(dynamicCARD.data.card.card);
                 param = {
                   username: checkvip(data2[dynamicId].Dynamic_Data.orig.modules.module_author),
@@ -33625,7 +33636,7 @@ https://t.bilibili.com/${dynamicId}`);
           const { groupId, botId } = target;
           const bot = karin$1.getBot(botId);
           const Contact = karin$1.contactGroup(groupId);
-          status = await bot.sendMsg(Contact, img2 ? [...img2] : []);
+          status = await karin$1.sendMsg(botId, Contact, img2 ? [...img2] : []);
           if (Config.bilibili.push.parsedynamic) {
             switch (data2[dynamicId].dynamic_type) {
               case "DYNAMIC_TYPE_AV": {
@@ -33653,7 +33664,8 @@ https://t.bilibili.com/${dynamicId}`);
                   playUrlData.data.accept_description = correctList.accept_description;
                   videoSize = await getvideosize(correctList.videoList[0].base_url, playUrlData.data.dash.audio[0].base_url, dynamicCARDINFO.data.card.desc.bvid);
                   if (Config.upload.usefilelimit && Number(videoSize) > Number(Config.upload.filelimit) && !Config.upload.compress) {
-                    await bot.sendMsg(
+                    await karin$1.sendMsg(
+                      botId,
                       Contact,
                       [
                         segment.text(`设定的最大上传大小为 ${Config.upload.filelimit}MB
@@ -33920,7 +33932,7 @@ UID：${host_mid}`);
     }
     if (abclist.length > 0) {
       for (const i of abclist) {
-        const resp = await this.amagi.getBilibiliData("用户主页数据", { host_mid: i.host_mid });
+        const resp = await this.amagi.getBilibiliData("用户主页数据", { host_mid: i.host_mid, typeMode: "strict" });
         const remark = resp.data.card.name;
         const matchingItemIndex = config.bilibili.findIndex((item) => item.host_mid === i.host_mid);
         if (matchingItemIndex !== -1) {
@@ -33989,7 +34001,7 @@ function br(data2) {
   return data2 = data2.replace(/\n/g, "<br>");
 }
 function checkvip(member) {
-  return member.vip.vipStatus === 1 ? `<span style="color: ${member.vip.nickname_color ?? "#FB7299"}; font-weight: 700;">${member.name}</span>` : `<span style="color: ${Common.useDarkTheme() ? "#EDEDED" : "#606060"}">${member.name}</span>`;
+  return member.vip.status === 1 ? `<span style="color: ${member.vip.nickname_color ?? "#FB7299"}; font-weight: 700;">${member.name}</span>` : `<span style="color: ${Common.useDarkTheme() ? "#EDEDED" : "#606060"}">${member.name}</span>`;
 }
 function extractEmojisData(data2) {
   const emojisData = [];

package/lib/chunk/{push-D60CjIo9.js → push-BIWMkxj6.js}

@@ -3,7 +3,7 @@ import { dirname } from "node:path";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 import { logger, segment, render, common, mkdirSync, karin } from "node-karin";
-import { h as getDouyinData, a as Config, C as Common, N as Networks, i as Base, R as Render, m as Count, f as browserExports, n as downloadFile, o as mergeFile, j as downloadVideo, p as cleanOldDynamicCache, q as douyinDB, s as baseHeaders } from "./index-DRX4XSDJ.js";
+import { h as getDouyinData, a as Config, C as Common, N as Networks, i as Base, R as Render, m as Count, f as browserExports, n as downloadFile, o as mergeFile, j as downloadVideo, p as cleanOldDynamicCache, q as douyinDB, s as baseHeaders } from "./index-Dp9gQN2I.js";
 import { Version } from "../Version.js";
 import require$$0 from "util";
 import require$$1 from "stream";
@@ -7657,7 +7657,7 @@ class DouYinpush extends Base {
           let status = { message_id: "" };
           const bot = karin.getBot(botId);
           const Contact = karin.contactGroup(groupId);
-          status = await bot.sendMsg(Contact, img2 ? [...img2] : []);
+          status = await karin.sendMsg(botId, Contact, img2 ? [...img2] : []);
           if (pushItem.living && "room_data" in pushItem.Detail_Data && status.message_id) {
             await douyinDB.updateLiveStatus(pushItem.sec_uid, true);
           }
@@ -7673,9 +7673,9 @@ class DouYinpush extends Base {
 
                     共拥有${logger.yellow(Detail_Data.video.bit_rate.length)}个视频源
 
-                    视频ID：${logger.green(Detail_Data.VideoData.aweme_detail.aweme_id)}
+                    视频ID：${logger.green(Detail_Data.aweme_id)}
 
-                    分享链接：${logger.green(Detail_Data.VideoData.aweme_detail.share_url)}
+                    分享链接：${logger.green(Detail_Data.share_url)}
                     `);
                   const videoObj = douyinProcessVideos(Detail_Data.video.bit_rate, Config.upload.filelimit);
                   downloadUrl = await new Networks({
@@ -7722,18 +7722,12 @@ class DouYinpush extends Base {
     try {
       for (const item of userList) {
         const sec_uid = item.sec_uid;
-        const videolist = await this.amagi.getDouyinData("用户主页视频列表数据", { sec_uid });
-        const userinfo = await this.amagi.getDouyinData("用户主页数据", { sec_uid });
-        const subscriptions = await douyinDB.getUserSubscribedGroups(sec_uid);
-        const targets = [];
-        for (const sub of subscriptions) {
-          const groupId = sub.get("groupId");
-          const groupModel = await douyinDB.getGroupById(groupId);
-          if (groupModel) {
-            const botId = groupModel.get("botId");
-            targets.push({ groupId, botId });
-          }
-        }
+        const videolist = await this.amagi.getDouyinData("用户主页视频列表数据", { sec_uid, typeMode: "strict" });
+        const userinfo = await this.amagi.getDouyinData("用户主页数据", { sec_uid, typeMode: "strict" });
+        const targets = item.group_id.map((groupWithBot) => {
+          const [groupId, botId] = groupWithBot.split(":");
+          return { groupId, botId };
+        });
         if (targets.length === 0) continue;
         if (videolist.aweme_list.length > 0) {
           for (const aweme of videolist.aweme_list) {
@@ -7773,7 +7767,7 @@ class DouYinpush extends Base {
         }
         const liveStatus = await douyinDB.getLiveStatus(sec_uid);
         if (userinfo.user.live_status === 1) {
-          const liveInfo = await this.amagi.getDouyinData("直播间信息数据", { sec_uid: userinfo.user.sec_uid });
+          const liveInfo = await this.amagi.getDouyinData("直播间信息数据", { sec_uid: userinfo.user.sec_uid, typeMode: "strict" });
           if (!liveStatus.living) {
             willbepushlist[`live_${sec_uid}`] = {
               remark: item.remark,
@@ -7836,7 +7830,7 @@ class DouYinpush extends Base {
         index++;
       }
       const sec_uid = data.data[index].user_list[0].user_info.sec_uid;
-      const UserInfoData = await this.amagi.getDouyinData("用户主页数据", { sec_uid });
+      const UserInfoData = await this.amagi.getDouyinData("用户主页数据", { sec_uid, typeMode: "strict" });
       let user_shortid;
       UserInfoData.user.unique_id === "" ? user_shortid = UserInfoData.user.short_id : user_shortid = UserInfoData.user.unique_id;
       config.douyin ??= [];
@@ -7980,7 +7974,7 @@ sec_uid${UserInfoData.user.sec_uid}`);
     }
     if (updateList.length > 0) {
       for (const i of updateList) {
-        const userinfo = await this.amagi.getDouyinData("用户主页数据", { sec_uid: i.sec_uid });
+        const userinfo = await this.amagi.getDouyinData("用户主页数据", { sec_uid: i.sec_uid, typeMode: "strict" });
         const remark = userinfo.user.nickname;
         const matchingItemIndex = config.douyin.findIndex((item) => item.sec_uid === i.sec_uid);
         if (matchingItemIndex !== -1) {

package/lib/index.js

@@ -1,4 +1,4 @@
-import { C as Common, a as Config, l as logMiddleware, r as registerBilibiliRoutes, b as registerDouyinRoutes, c as registerKuaishouRoutes, d as logger$2, e as Client } from "./chunk/index-DRX4XSDJ.js";
+import { C as Common, a as Config, l as logMiddleware, r as registerBilibiliRoutes, b as registerDouyinRoutes, c as registerKuaishouRoutes, d as logger$2, e as Client } from "./chunk/index-Dp9gQN2I.js";
 import require$$0 from "util";
 import require$$0$1 from "url";
 import require$$0$2 from "http";
@@ -1036,7 +1036,7 @@ function requireCommon() {
       createDebug.namespaces = namespaces;
       createDebug.names = [];
       createDebug.skips = [];
-      const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+      const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
       for (const ns of split) {
         if (ns[0] === "-") {
           createDebug.skips.push(ns.slice(1));
@@ -1255,7 +1255,7 @@ function requireBrowser() {
     function load() {
       let r;
       try {
-        r = exports.storage.getItem("debug");
+        r = exports.storage.getItem("debug") || exports.storage.getItem("DEBUG");
       } catch (error) {
       }
       if (!r && typeof process !== "undefined" && "env" in process) {

package/lib/web.config.js

@@ -1,7 +1,7 @@
 import { defineConfig, components } from "node-karin";
 import _ from "node-karin/lodash";
 import "sequelize";
-import { a as Config } from "./chunk/index-DRX4XSDJ.js";
+import { a as Config } from "./chunk/index-Dp9gQN2I.js";
 import "./Version.js";
 import "node:fs";
 import "node-karin/axios";
@@ -438,6 +438,34 @@ const web_config = defineConfig({
                   })
                 ]
               }),
+              components.checkbox.group("displayContent", {
+                label: "评论解析前返回的内容",
+                description: "若什么都不选，则不会返回任何视频相关信息",
+                orientation: "horizontal",
+                defaultValue: all.bilibili.displayContent,
+                checkbox: [
+                  components.checkbox.create("displayContent:checkbox:1", {
+                    label: "封面",
+                    value: "cover"
+                  }),
+                  components.checkbox.create("displayContent:checkbox:2", {
+                    label: "标题",
+                    value: "title"
+                  }),
+                  components.checkbox.create("displayContent:checkbox:3", {
+                    label: "作者",
+                    value: "author"
+                  }),
+                  components.checkbox.create("displayContent:checkbox:4", {
+                    label: "视频统计信息",
+                    value: "stats"
+                  }),
+                  components.checkbox.create("displayContent:checkbox:5", {
+                    label: "简介",
+                    value: "desc"
+                  })
+                ]
+              }),
               components.divider.create("divider-bilibili-1", {
                 description: "B站推送相关",
                 descPosition: 20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "keywords": [
     "karin-plugin",