karin-plugin-kkk 1.2.3 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # 变更日志
 
+## [1.3.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.2.3...v1.3.0) (2025-04-26)
+
+
+### Features
+
+* **Config:** 添加扫码登录权限配置 close [#73](https://github.com/ikenxuan/karin-plugin-kkk/issues/73) ([0e22e6b](https://github.com/ikenxuan/karin-plugin-kkk/commit/0e22e6b7b128c663f9a6b81391aae528d93384ce))
+* **config:** 默认关闭平台解析提示并添加表情回应功能（默认开启） ([ea301d7](https://github.com/ikenxuan/karin-plugin-kkk/commit/ea301d7ffaaa80d6b4f046b143703e29ee322c98))
+
+
+### Bug Fixes
+
+* **login:** 更新抖音和哔哩哔哩登录免责声明 close [#72](https://github.com/ikenxuan/karin-plugin-kkk/issues/72) ([6b91d8e](https://github.com/ikenxuan/karin-plugin-kkk/commit/6b91d8e4d479f86ac41315124350b07085e821e7))
+* 修复视频上传和评论处理中的问题 ([8036d4d](https://github.com/ikenxuan/karin-plugin-kkk/commit/8036d4d0c4d568c30b9140c5e3a7c50c7fda90ca))
+* 修改默认回复表情 ([4dc106e](https://github.com/ikenxuan/karin-plugin-kkk/commit/4dc106ef160361f5daf773c855ed3c98dbd2eebf))
+* 修正评论数据长度检查逻辑 ([866de17](https://github.com/ikenxuan/karin-plugin-kkk/commit/866de17efb187f68c3df8871892f7b8d8c9926e8))
+* 每个推送对象单独过滤。close [#69](https://github.com/ikenxuan/karin-plugin-kkk/issues/69) ([#70](https://github.com/ikenxuan/karin-plugin-kkk/issues/70)) ([38b0cab](https://github.com/ikenxuan/karin-plugin-kkk/commit/38b0cab43c05107a2b4d853a13cc23887cc4579b))
+* 移除大部分命令设置功能，使用webui修改配置，仅保留推送相关的设置 ([883ff4c](https://github.com/ikenxuan/karin-plugin-kkk/commit/883ff4c1a1d34742c34b88da341d31e61332f8a9))
+
 ## [1.2.3](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.2.2...v1.2.3) (2025-04-13)
 
 

package/config/default_config/app.yaml

@@ -26,4 +26,14 @@ APIServerMount: true
 Theme: 0
 
 # 渲染的图片是否移除底部水印
-RemoveWatermark: false
+RemoveWatermark: false
+
+# 渲染图片的等待时间，单位：秒。传递 0 可禁用等待
+RenderWaitTime: 60
+
+# 表情回应
+EmojiReply: true
+
+# 表情 ID，详情查看：https://github.com/NapNeko/NapCatQQ/blob/main/src/core/external/face_config.json
+EmojiReplyID: 128064
+

package/config/default_config/bilibili.yaml

@@ -2,7 +2,7 @@
 switch: true
 
 # B站解析提示，发送提示信息：“检测到B站链接，开始解析”
-tip: true
+tip: false
 
 # B站评论解析，发送哔哩哔哩作品评论图
 comment: true
@@ -16,29 +16,14 @@ videopriority: false
 # 根据「视频拦截阈值」自动选择合适的分辨率，关闭后默认选择最大分辨率进行下载
 autoResolution: true
 
+# 谁可以触发扫码登录，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员。修改后需重启
+loginPerm: all
+
 # B站推送相关配置
 push: 
   # 推送开关，开启后需重启；使用「#设置B站推送 + 用户UID」配置推送列表
   switch: true
-  # 过滤模式：blacklist为黑名单模式，whitelist为白名单模式
-  filterMode: blacklist
-  # 黑名单模式：动态中有指定关键词时，不推送
-  filterKeywords:
-    - 黑名单关键词1
-    - 黑名单关键词2
-  # 黑名单模式：动态中有指定标签时，不推送
-  filterTags:
-    - 黑名单标签1
-    - 黑名单标签2 
-  # 白名单模式：动态中有指定关键词时，才推送
-  whitelistKeywords:
-    - 白名单关键词1
-    - 白名单关键词2
-  # 白名单模式：动态中有指定标签时，才推送
-  whitelistTags:
-    - 白名单标签1
-    - 白名单标签2
-  # 谁可以设置推送，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员
+  # 谁可以设置推送，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员。修改后需重启
   permission: master
   # 推送定时任务的cron表达式，默认为每十分钟推送一次
   cron: '*/10 * * * *'

package/config/default_config/douyin.yaml

@@ -2,7 +2,7 @@
 switch: true
 
 # 抖音解析提示，发送提示信息：“检测到抖音链接，开始解析”
-tip: true
+tip: false
 
 # 抖音评论解析
 comment: true
@@ -13,29 +13,14 @@ numcomment: 5
 # 根据「视频拦截阈值」自动选择合适的分辨率，关闭后默认选择最大分辨率进行下载
 autoResolution: true
 
+# 谁可以触发扫码登录，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员。修改后需重启
+loginPerm: all
+
 # 抖音推送相关配置
 push: 
   # 推送开关，开启后需重启；使用「#设置抖音推送 + 抖音号」配置推送列表
   switch: true
-  # 过滤模式：blacklist为黑名单模式，whitelist为白名单模式
-  filterMode: blacklist
-  # 黑名单模式：作品中有指定关键词时，不推送
-  filterKeywords:
-    - 黑名单关键词1
-    - 黑名单关键词2
-  # 黑名单模式：作品中有指定标签时，不推送
-  filterTags:
-    - 黑名单标签1
-    - 黑名单标签2 
-  # 白名单模式：作品中有指定关键词时，才推送
-  whitelistKeywords:
-    - 白名单关键词1
-    - 白名单关键词2
-  # 白名单模式：作品中有指定标签时，才推送
-  whitelistTags:
-    - 白名单标签1
-    - 白名单标签2
-  # 谁可以设置推送，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员
+  # 谁可以设置推送，all为所有人，admin为管理员，master为主人，group.owner为群主，group.admin为群管理员。修改后需重启
   permission: master
   # 推送定时任务的cron表达式，默认为每十分钟推送一次
   cron: '*/10 * * * *'

package/config/default_config/kuaishou.yaml

@@ -2,7 +2,7 @@
 switch: true
 
 # 快手解析提示，发送提示信息：“检测到快手链接，开始解析”
-tip: true
+tip: false
 
 # 快手评论解析，发送快手作品评论图
 comment: true

package/lib/apps/admin.js

@@ -1,10 +1,10 @@
 import { createRequire } from 'module';
-import '../chunk-SLADWUI4.js';
-import { bilibiliLogin, douyinLogin } from '../chunk-VW4ZAQ3U.js';
-import { Config, Common, Render } from '../chunk-NDSCNB4K.js';
-import { init_esm_shims } from '../chunk-FOF5UXCN.js';
+import '../chunk-KQITAYDY.js';
+import { bilibiliLogin, douyinLogin } from '../chunk-5WIDO4V7.js';
+import { Config, Common } from '../chunk-DSCWGW73.js';
+import { init_esm_shims } from '../chunk-XHTHHTBA.js';
 import fs from 'node:fs';
-import karin, { logger, Plugin } from 'node-karin';
+import karin, { logger } from 'node-karin';
 import path from 'path';
 
 createRequire(import.meta.url);
@@ -22,11 +22,11 @@ var task = Config.app.rmmp4 && karin.task("[kkk-\u89C6\u9891\u7F13\u5B58\u81EA\u
 var biLogin = karin.command(/^#?(kkk)?\s*B站\s*(扫码)?\s*登录$/i, async (e) => {
   await bilibiliLogin(e);
   return true;
-}, { perm: "group.admin", name: "kkk-ck\u7BA1\u7406" });
+}, { perm: Config.bilibili.loginPerm, name: "kkk-ck\u7BA1\u7406" });
 var dylogin = karin.command(/^#?(kkk)?抖音(扫码)?登录$/, async (e) => {
   await douyinLogin(e);
   return true;
-}, { perm: "group.admin", name: "kkk-ck\u7BA1\u7406" });
+}, { perm: Config.douyin.loginPerm, name: "kkk-ck\u7BA1\u7406" });
 var setdyck = karin.command(/^#?(kkk)?s*设置抖音ck$/i, async (e) => {
   const msg = await e.reply("\u8BF7\u53D1\u5728120\u79D2\u5185\u9001\u6296\u97F3ck\n\u6559\u7A0B\uFF1Ahttps://ikenxuan.github.io/kkkkkk-10086/docs/intro/other#%E9%85%8D%E7%BD%AE%E4%B8%8D%E5%90%8C%E5%B9%B3%E5%8F%B0%E7%9A%84-cookies\n");
   const context = await karin.ctx(e);
@@ -43,103 +43,6 @@ var setbilick = karin.command(/^#?(kkk)?s*设置s*(B站)ck$/i, async (e) => {
   await e.reply("\u8BBE\u7F6E\u6210\u529F\uFF01", { at: true });
   return true;
 }, { perm: "master", name: "kkk-ck\u7BA1\u7406", event: "message.friend" });
-var Admin = class extends Plugin {
-  constructor() {
-    super({
-      name: "kkk-\u7BA1\u7406",
-      rule: [
-        { reg: createSwitchRegExp("app"), fnc: "ConfigSwitch", permission: "master" },
-        { reg: createNumberRegExp("app"), fnc: "ConfigNumber", permission: "master" },
-        { reg: createCustomRegExp("app"), fnc: "ConfigCustom", permission: "master" },
-        { reg: createSwitchRegExp("douyin"), fnc: "ConfigSwitch", permission: "master" },
-        { reg: createNumberRegExp("douyin"), fnc: "ConfigNumber", permission: "master" },
-        { reg: createNumberRegExp("douyin"), fnc: "ConfigCustom", permission: "master" },
-        { reg: createSwitchRegExp("bilibili"), fnc: "ConfigSwitch", permission: "master" },
-        { reg: createNumberRegExp("bilibili"), fnc: "ConfigNumber", permission: "master" },
-        { reg: createNumberRegExp("bilibili"), fnc: "ConfigCustom", permission: "master" },
-        { reg: createSwitchRegExp("upload"), fnc: "ConfigSwitch", permission: "master" },
-        { reg: createNumberRegExp("upload"), fnc: "ConfigNumber", permission: "master" },
-        { reg: createNumberRegExp("upload"), fnc: "ConfigCustom", permission: "master" },
-        { reg: createSwitchRegExp("kuaishou"), fnc: "ConfigSwitch", permission: "master" },
-        { reg: createNumberRegExp("kuaishou"), fnc: "ConfigNumber", permission: "master" },
-        { reg: createNumberRegExp("kuaishou"), fnc: "ConfigCustom", permission: "master" },
-        { reg: /^#kkk设置$/, fnc: "index_Settings", permission: "master" },
-        { reg: /^#?kkk删除缓存$/, fnc: "deleteCache", permission: "master" }
-      ]
-    });
-  }
-  async deleteCache(e) {
-    await removeAllFiles(Common.tempDri.video);
-    await e.reply(Common.tempDri.video + "\u76EE\u5F55\u4E0B\u6240\u6709\u6587\u4EF6\u5DF2\u5220\u9664");
-    return true;
-  }
-  // 配置开关
-  async ConfigSwitch(e) {
-    logger.debug("\u5F00\u5173\u914D\u7F6E", e.msg);
-    const platform = this.getPlatformFromMessage(e.msg);
-    const regRet = createSwitchRegExp(platform).exec(e.msg);
-    if (regRet) {
-      const key = regRet[1];
-      const isOn = regRet[2] === "\u5F00\u542F";
-      Config.Modify(platform, PlatformTypeConfig[platform].types[key], isOn);
-      await this.index_Settings(e);
-    }
-    return false;
-  }
-  // 修改数值配置
-  async ConfigNumber(e) {
-    logger.debug("\u6570\u503C\u914D\u7F6E", e.msg);
-    const platform = this.getPlatformFromMessage(e.msg);
-    const regRet = createNumberRegExp(platform).exec(e.msg);
-    if (regRet) {
-      const configType = PlatformTypeConfig[platform].numberConfig[regRet[1]];
-      const number = this.checkNumberValue(Number(regRet[2]), configType.limit);
-      Config.Modify(platform, configType.key, number);
-      await this.index_Settings(e);
-    }
-    return false;
-  }
-  // 处理自定义内容
-  async ConfigCustom(e) {
-    logger.debug("\u81EA\u5B9A\u4E49\u5185\u5BB9", e.msg);
-    const platform = this.getPlatformFromMessage(e.msg);
-    const regRet = createCustomRegExp(platform).exec(e.msg);
-    if (regRet) {
-      const key = regRet[1];
-      const customValue = regRet[2].trim();
-      const customConfig = PlatformTypeConfig[platform]?.customConfig;
-      if (!customConfig || !customConfig[key]) {
-        logger.debug(logger.warn(`\u65E0\u6548\u7684\u8BBE\u7F6E\u9879\uFF1A${key}`));
-        return false;
-      }
-      const configKey = customConfig[key].key;
-      Config.Modify(platform, configKey, customValue);
-      await this.index_Settings(e);
-    }
-    return false;
-  }
-  // 渲染设置图片
-  async index_Settings(e) {
-    const _cfg = Config.All();
-    const statusData = getStatus(_cfg);
-    const img = await Render("admin/index", { data: statusData });
-    await e.reply(img);
-    return true;
-  }
-  // 根据消息判断平台
-  getPlatformFromMessage(msg) {
-    if (msg.includes("\u6296\u97F3")) return "douyin";
-    if (msg.includes("B\u7AD9")) return "bilibili";
-    if (msg.includes("\u4E0A\u4F20")) return "upload";
-    if (msg.includes("\u5FEB\u624B")) return "kuaishou";
-    return "app";
-  }
-  // 检查数值范围
-  checkNumberValue(value, limit) {
-    const [min, max] = limit.split("-").map(Number);
-    return Math.min(Math.max(value, min), max);
-  }
-};
 async function removeAllFiles(dir) {
   const files = await fs.promises.readdir(dir);
   for (const file of files) {
@@ -153,134 +56,5 @@ async function removeAllFiles(dir) {
     }
   }
 }
-function getStatus(data) {
-  const result = {};
-  const processValue = (value) => {
-    if (typeof value === "boolean") {
-      return `<div class="cfg-status ${value ? "" : "status-off"}">${value ? "\u5DF2\u5F00\u542F" : "\u5DF2\u5173\u95ED"}</div>`;
-    } else if (typeof value === "number") {
-      return `<div class="cfg-status ${value === null ? "status-off" : ""}">${value ?? "\u672A\u914D\u7F6E"}</div>`;
-    } else if (typeof value === "string") {
-      return `<div class="cfg-status">${value.length > 12 ? `${value.slice(0, 12)}...` : value}</div>`;
-    } else if (Array.isArray(value)) {
-      return value.length === 0 ? '<div class="cfg-status status-off">\u672A\u914D\u7F6E</div>' : `<div class="cfg-status">\u5DF2\u914D\u7F6E ${value.length} \u9879</div>`;
-    } else if (value === null) {
-      return '<div class="cfg-status status-off">\u672A\u914D\u7F6E</div>';
-    }
-    return '<div class="cfg-status status-off">\u672A\u77E5\u7C7B\u578B</div>';
-  };
-  const processObject = (obj) => {
-    const res = {};
-    for (const key in obj) {
-      const value = obj[key];
-      if (value !== null && typeof value === "object" && !Array.isArray(value)) {
-        res[key] = processObject(value);
-      } else {
-        res[key] = processValue(value);
-      }
-    }
-    return res;
-  };
-  for (const key in data) {
-    result[key] = processObject(data[key]);
-  }
-  return result;
-}
-var PlatformTypeConfig = {
-  upload: {
-    name: "\u4E0A\u4F20",
-    types: {
-      \u4E0A\u4F20\u62E6\u622A: "usefilelimit",
-      \u4E0A\u4F20base64: "sendbase64",
-      \u4E0A\u4F20\u538B\u7F29: "compress",
-      \u4E0A\u4F20\u7FA4\u6587\u4EF6: "usegroupfile"
-    },
-    numberConfig: {
-      \u4E0A\u4F20\u62E6\u622A\u9608\u503C: { key: "filelimit", limit: "0-1000000" },
-      \u4E0A\u4F20\u538B\u7F29\u89E6\u53D1\u503C: { key: "compresstrigger", limit: "0-1000000" },
-      \u4E0A\u4F20\u538B\u7F29\u540E\u7684\u503C: { key: "compressvalue", limit: "0-1000000" },
-      \u4E0A\u4F20\u7FA4\u6587\u4EF6\u9608\u503C: { key: "groupfilevalue", limit: "0-1000000" }
-    }
-  },
-  app: {
-    name: "APP",
-    types: {
-      \u7F13\u5B58\u5220\u9664: "rmmp4",
-      \u89C6\u9891\u89E3\u6790: "videotool",
-      \u9ED8\u8BA4\u89E3\u6790: "defaulttool",
-      \u4E0A\u4F20\u9650\u5236: "usefilelimit",
-      API\u670D\u52A1: "APIServer",
-      base64: "sendbase64"
-    },
-    numberConfig: {
-      \u6E32\u67D3\u7CBE\u5EA6: { key: "renderScale", limit: "50-200" },
-      \u4F18\u5148\u7EA7: { key: "priority", limit: "0-114514" },
-      \u9650\u5236: { key: "filelimit", limit: "5-114514" },
-      \u4E3B\u9898: { key: "Theme", limit: "0-2" }
-    }
-  },
-  douyin: {
-    name: "\u6296\u97F3",
-    types: {
-      \u6296\u97F3\u89E3\u6790: "switch",
-      \u6296\u97F3\u8BC4\u8BBA: "comment",
-      \u6296\u97F3\u63A8\u9001: "push.switch",
-      \u6296\u97F3\u63A8\u9001\u65E5\u5FD7: "push.log",
-      \u6296\u97F3\u89E3\u6790\u63D0\u793A: "tip",
-      \u6296\u97F3\u9AD8\u6E05\u8BED\u97F3: "sendHDrecord",
-      \u6296\u97F3\u52A8\u6001\u89E3\u6790: "push.parsedynamic",
-      \u6296\u97F3\u81EA\u52A8\u6E05\u6670\u5EA6: "autoResolution"
-    },
-    numberConfig: {
-      \u6296\u97F3\u8BC4\u8BBA\u6570\u91CF: { key: "numcomment", limit: "0-999999" }
-    },
-    customConfig: {
-      \u6296\u97F3\u63A8\u9001\u8868\u8FBE\u5F0F: { key: "push.cron", type: "string" },
-      \u6296\u97F3\u63A8\u9001\u8BBE\u7F6E\u6743\u9650: { key: "push.permission", type: "string" }
-    }
-  },
-  bilibili: {
-    name: "B\u7AD9",
-    types: {
-      B\u7AD9\u89E3\u6790: "switch",
-      B\u7AD9\u8BC4\u8BBA: "comment",
-      B\u7AD9\u63A8\u9001: "push.switch",
-      B\u7AD9\u63A8\u9001\u65E5\u5FD7: "push.log",
-      B\u7AD9\u89E3\u6790\u63D0\u793A: "tip",
-      B\u7AD9\u52A8\u6001\u89E3\u6790: "push.parsedynamic",
-      B\u7AD9\u5185\u5BB9\u4F18\u5148: "videopriority",
-      B\u7AD9\u81EA\u52A8\u6E05\u6670\u5EA6: "autoResolution"
-    },
-    numberConfig: {
-      B\u7AD9\u8BC4\u8BBA\u6570\u91CF: { key: "numcomment", limit: "0-999999" }
-    },
-    customConfig: {
-      B\u7AD9\u63A8\u9001\u8868\u8FBE\u5F0F: { key: "push.cron", type: "string" },
-      B\u7AD9\u63A8\u9001\u8BBE\u7F6E\u6743\u9650: { key: "push.permission", type: "string" }
-    }
-  },
-  kuaishou: {
-    name: "\u5FEB\u624B",
-    types: {
-      \u5FEB\u624B\u89E3\u6790: "switch",
-      \u5FEB\u624B\u89E3\u6790\u63D0\u793A: "tip"
-    },
-    numberConfig: {
-      \u5FEB\u624B\u8BC4\u8BBA\u6570\u91CF: { key: "numcomment", limit: "0-30" }
-    }
-  }
-};
-var createSwitchRegExp = (platform) => {
-  const switchKeys = Object.keys(PlatformTypeConfig[platform].types);
-  return new RegExp(`^#kkk\u8BBE\u7F6E(${switchKeys.join("|")})(\u5F00\u542F|\u5173\u95ED)$`);
-};
-var createNumberRegExp = (platform) => {
-  const numberKeys = Object.keys(PlatformTypeConfig[platform].numberConfig);
-  return new RegExp(`^#kkk\u8BBE\u7F6E(${numberKeys.join("|")})(\\d+)$`);
-};
-var createCustomRegExp = (platform) => {
-  const customKeys = Object.keys(PlatformTypeConfig[platform].customConfig ?? {});
-  return new RegExp(`^#kkk\u8BBE\u7F6E(${customKeys.join("|")})(.*)$`);
-};
 
-export { Admin, biLogin, dylogin, setbilick, setdyck, task };
+export { biLogin, dylogin, setbilick, setdyck, task };

package/lib/apps/help.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'module';
-import { Render, Config, Version, Common } from '../chunk-NDSCNB4K.js';
-import { init_esm_shims } from '../chunk-FOF5UXCN.js';
+import { Render, Config, Version, Common } from '../chunk-DSCWGW73.js';
+import { init_esm_shims } from '../chunk-XHTHHTBA.js';
 import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import { markdown } from '@karinjs/md-html';

package/lib/apps/push.js

@@ -1,8 +1,8 @@
 import { createRequire } from 'module';
-import '../chunk-SLADWUI4.js';
-import { DouYinpush, Bilibilipush } from '../chunk-VW4ZAQ3U.js';
-import { Config, getDouyinData, getBilibiliData } from '../chunk-NDSCNB4K.js';
-import { init_esm_shims } from '../chunk-FOF5UXCN.js';
+import '../chunk-KQITAYDY.js';
+import { DouYinpush, Bilibilipush } from '../chunk-5WIDO4V7.js';
+import { Config, getDouyinData, getBilibiliData } from '../chunk-DSCWGW73.js';
+import { init_esm_shims } from '../chunk-XHTHHTBA.js';
 import karin from 'node-karin';
 
 createRequire(import.meta.url);

package/lib/apps/tools.js

@@ -1,8 +1,8 @@
 import { createRequire } from 'module';
-import { getDouyinID, DouYin, getBilibiliID, Bilibili, getKuaishouID, fetchKuaishouData, Kuaishou } from '../chunk-VW4ZAQ3U.js';
-import { Config, Common } from '../chunk-NDSCNB4K.js';
-import { init_esm_shims } from '../chunk-FOF5UXCN.js';
-import karin from 'node-karin';
+import { getDouyinID, DouYin, getBilibiliID, Bilibili, getKuaishouID, fetchKuaishouData, Kuaishou } from '../chunk-5WIDO4V7.js';
+import { Config, Common } from '../chunk-DSCWGW73.js';
+import { init_esm_shims } from '../chunk-XHTHHTBA.js';
+import karin, { logger } from 'node-karin';
 
 createRequire(import.meta.url);
 
@@ -21,18 +21,19 @@ var douyin = karin.command(reg.douyin, async (e) => {
 }, { name: "kkk-\u89C6\u9891\u529F\u80FD-\u6296\u97F3", priority: Config.app.defaulttool ? -Infinity : 800 });
 var bilibili = karin.command(reg.bilibili, async (e) => {
   e.msg = e.msg.replace(/\\/g, "");
-  const urlRex = /(https?:\/\/)?(www\.bilibili\.com|m\.bilibili\.com|t\.bilibili\.com|bili2233\.cn)\/[a-zA-Z0-9._%&+=\-\/?]*[a-zA-Z0-9_\/?=&#%+]*$/g;
-  const bShortRex = /https?:\/\/(b23\.tv|bili2233\.cn)\/([a-zA-Z0-9]+)/;
-  let url = "";
-  if (urlRex.test(e.msg)) {
-    const matchResult = e.msg.match(urlRex);
-    url = matchResult ? matchResult[0] : null;
-  } else if (bShortRex.test(e.msg)) {
-    const match = bShortRex.exec(e.msg);
-    url = match && match[0];
-  } else if (/^BV[1-9a-zA-Z]{10}$/.test(e.msg)) {
+  const urlRegex = /(https?:\/\/(?:www\.bilibili\.com|m\.bilibili\.com|t\.bilibili\.com|b23\.tv|bili2233\.cn)\/[^\s]+)/;
+  const bvRegex = /^BV[1-9a-zA-Z]{10}$/;
+  let url = null;
+  const urlMatch = e.msg.match(urlRegex);
+  if (urlMatch) {
+    url = urlMatch[0];
+  } else if (bvRegex.test(e.msg)) {
     url = `https://www.bilibili.com/video/${e.msg}`;
   }
+  if (!url) {
+    logger.warn(`\u672A\u80FD\u5728\u6D88\u606F\u4E2D\u627E\u5230\u6709\u6548\u7684B\u7AD9\u5206\u4EAB\u94FE\u63A5\u6216BV\u53F7: ${e.msg}`);
+    return true;
+  }
   const iddata = await getBilibiliID(url);
   await new Bilibili(e, iddata).RESOURCES(iddata);
   return true;