koishi-plugin-starfx-bot 0.27.2 → 0.27.3

package/lib/index.js

@@ -33,7 +33,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { roll: { messages: { noParam: "你问啥?", invalid: "你要不看看你说的是啥", "too-many": "太、太多了啦!", noodles: "扔出了{num}个{noodles}面的骰子，点数如下:{points}", possibility: "{param}是{possibility}%", choose: "当然是{option}啦!" } }, "room-number": { messages: { roomNumber: "当前的房间号是: {room}", changeRoom: "已将当前房间号 {oldRoom} 修改为 {newRoom}", newRoom: "已添加房间号: {room}", noRoom: "当前没有保存的房间", delRoom: "已删除房间: {room}", invalid: "无效输入" } }, forward: { messages: { delete: "已删除转发群聊: {gid}", noTarget: "未配置转发群组", success: "已转发消息到: {target}", noMessage: "请引用要转发的消息", setOK: "已配置转发: {target}", forwardContent: "[转发消息]<br/> {content}" } }, "waiting-play": { messages: { addReady: "已添加，当前待机{num}人: <br/>{list}", delReady: "已删除，当前待机{num}人: <br/>{list}", delFailed: "未删除，当前待机{num}人: <br/>{list}", clearReady: "待机列表已清空", listReady: "当前待机{num}人: <br/>{list}", invalid: "输入无效" } }, 开启车牌检测: { messages: { success: "车牌检测：已打开\n当前车牌位数: {length}", noPermission: "你没有权限开启车牌检测", noGuild: "请在群聊中使用该指令", invalidLength: "位数设定不合理，请输入 1-20 之间的数字" } }, 关闭车牌检测: { messages: { success: "已关闭车牌检测", noPermission: "你没有权限关闭车牌检测", noGuild: "请在群聊中使用该指令" } }, 车牌检测状态: { messages: { enabled: "车牌检测: 已打开\n当前车牌位数: {length}", disabled: "车牌检测: 已关闭", managerEnabled: "管理员权限正常", managerDisabled: "无管理员权限，无法修改群名", noPermission: "你没有权限查看车牌检测状态", noGuild: "请在群聊中使用该指令" } }, 车牌检测权限: { messages: { status: { enabled: "普通群员开关车牌检测: 允许", disabled: "普通群员开关车牌检测: 禁止" }, enabled: "已允许普通群员开关车牌检测", disabled: "已禁止普通群员开关车牌检测", invalid: "无效输入，请输入 开 / 关", noPermission: "你没有权限设置车牌检测权限", noGuild: "请在群聊中使用该指令" } } }, middleware: { messages: { atNotReply: "艾特我又不说话", atNotReplyOther: "艾特他又不说话", notBot: "我才不是机器人！", loveMessage: "我喜欢你", iLoveU: "我也喜欢你", notManager: "当前bot没有管理员权限，无法修改群名", editFuncNotFound: "无法找到设置群名的底层方法", editGroupNameSuccess: "检测到车牌 {content}，群名修改成功！", editGroupNameRetrySuccess: '检测到车牌 {content}，由于限制已修改为 "{spacedContent}"' } } };
+    module2.exports = { commands: { roll: { messages: { noParam: "你问啥?", invalid: "你要不看看你说的是啥", "too-many": "太、太多了啦!", noodles: "扔出了{num}个{noodles}面的骰子，点数如下:{points}", possibility: "{param}是{possibility}%", choose: "当然是{option}啦!" } }, "room-number": { messages: { roomNumber: "当前的房间号是: {room}", changeRoom: "已将当前房间号 {oldRoom} 修改为 {newRoom}", newRoom: "已添加房间号: {room}", noRoom: "当前没有保存的房间", delRoom: "已删除房间: {room}", invalid: "无效输入" } }, forward: { messages: { delete: "已删除转发群聊: {gid}", noTarget: "未配置转发群组", success: "已转发消息到: {target}", noMessage: "请引用要转发的消息", setOK: "已配置转发: {target}", forwardContent: "[转发消息]<br/> {content}" } }, "waiting-play": { messages: { addReady: "已添加，当前待机{num}人: <br/>{list}", delReady: "已删除，当前待机{num}人: <br/>{list}", delFailed: "未删除，当前待机{num}人: <br/>{list}", clearReady: "待机列表已清空", listReady: "当前待机{num}人: <br/>{list}", invalid: "输入无效" } }, 开启车牌检测: { messages: { success: "车牌检测：已打开\n当前车牌位数: {length}", noPermission: "你没有权限开启车牌检测", noGuild: "请在群聊中使用该指令", invalidLength: "位数设定不合理，请输入 1-20 之间的数字" } }, 关闭车牌检测: { messages: { success: "已关闭车牌检测", noPermission: "你没有权限关闭车牌检测", noGuild: "请在群聊中使用该指令" } }, 车牌检测状态: { messages: { enabled: "车牌检测: 已打开\n当前车牌位数: {length}", disabled: "车牌检测: 已关闭", managerEnabled: "管理员权限正常", managerDisabled: "无管理员权限，无法修改群名", noPermission: "你没有权限查看车牌检测状态", noGuild: "请在群聊中使用该指令" } }, 车牌检测权限: { messages: { status: { enabled: "普通群员开关车牌检测: 允许", disabled: "普通群员开关车牌检测: 禁止" }, enabled: "已允许普通群员开关车牌检测", disabled: "已禁止普通群员开关车牌检测", invalid: "无效输入，请输入 开 / 关", noPermission: "你没有权限设置车牌检测权限", noGuild: "请在群聊中使用该指令" } } }, middleware: { messages: { atNotReply: "艾特我又不说话", atNotReplyOther: "艾特他又不说话", notBot: "我才不是机器人！", loveMessage: "我喜欢你", iLoveU: "我也喜欢你", notManager: "当前bot没有管理员权限，无法修改群名", editFuncNotFound: "无法找到设置群名的底层方法", editGroupNameSuccess: "已修改群名: {content}", editGroupNameRetrySuccess: '修改群名: "{content}"失败，由于限制已修改为: "{spacedContent}"' } } };
   }
 });
 
@@ -63,7 +63,7 @@ var package_default = {
   contributors: [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  version: "0.27.2",
+  version: "0.27.3",
   main: "lib/index.js",
   typings: "lib/index.d.ts",
   files: [
@@ -599,35 +599,51 @@ function saveImage(arrayBuffer, directory, filename) {
 }
 __name(saveImage, "saveImage");
 async function getImageSrc(session, param, option) {
-  const number = option?.number ?? true, img = option?.img ?? true, at = option?.at ?? true, noParam = option?.noParam ?? true, quote = option?.quote ?? true;
-  if (number && param?.length && /^\d+$/.test(param)) {
-    return `https://q1.qlogo.cn/g?b=qq&nk=${param}&s=640`;
-  } else if (noParam && !param?.length) {
-    return `https://q1.qlogo.cn/g?b=qq&nk=${session.userId}&s=640`;
-  }
-  if (quote) {
-    const quoteElementArray = session?.quote?.elements;
-    if (quoteElementArray?.length) {
-      for (const element of quoteElementArray) {
-        if (img && element?.type === "img") {
-          return element?.attrs?.src;
-        } else if (at && element?.type === "at" && element?.attrs?.id && element.attrs.id !== session.selfId) {
-          return `https://q1.qlogo.cn/g?b=qq&nk=${element?.attrs?.id}&s=640`;
-        }
-      }
+  const { number = true, img = true, at = true, noParam = true, quote = true } = option ?? {};
+  if (number && /^\d+$/.test(param)) {
+    const avatar = await getHeadUrlById(session, param);
+    if (avatar) return avatar;
+  }
+  if (noParam && !param?.length) {
+    const avatar = await getHeadUrlById(session, session.userId);
+    if (avatar) return avatar;
+  }
+  const findSrcInElements = /* @__PURE__ */ __name(async (elements, skipSelfAt = false) => {
+    if (!elements?.length) return null;
+    let list = elements;
+    if (skipSelfAt) {
+      const startIdx = list.findIndex((el) => !(el?.type === "at" && el?.attrs?.id === session.selfId));
+      list = startIdx === -1 ? [] : list.slice(startIdx);
     }
-  }
-  const elementArray = session.elements;
-  for (const element of elementArray) {
-    if (img && element?.type === "img") {
-      return element?.attrs?.src;
-    } else if (at && element?.type === "at" && element?.attrs?.id) {
-      return `https://q1.qlogo.cn/g?b=qq&nk=${element.attrs.id}&s=640`;
+    for (const el of list) {
+      if (img && el?.type === "img" && el?.attrs?.src) {
+        return el.attrs.src;
+      }
+      if (at && el?.type === "at" && el?.attrs?.id && el.attrs.id !== session.selfId) {
+        const avatar = await getHeadUrlById(session, el.attrs.id);
+        if (avatar) return avatar;
+      }
     }
+    return null;
+  }, "findSrcInElements");
+  if (quote) {
+    const avatar = await findSrcInElements(session?.quote?.elements);
+    if (avatar) return avatar;
   }
-  return "";
+  return await findSrcInElements(session?.elements, true) ?? "";
 }
 __name(getImageSrc, "getImageSrc");
+async function getHeadUrlById(session, id) {
+  switch (session.platform) {
+    case "onebot":
+      return `https://q1.qlogo.cn/g?b=qq&nk=${id}&s=640`;
+    case "qq":
+      return `https://thirdqq.qlogo.cn/qqapp/${session.selfId}/${id}/640`;
+    default:
+      return (await session.bot.getUser(id)).avatar || "";
+  }
+}
+__name(getHeadUrlById, "getHeadUrlById");
 async function getImageFromUrl(ctx, url) {
   if (!url) throw new Error("URL must be provided");
   const sharp = getSharpConstructor(ctx);
@@ -1432,7 +1448,7 @@ function apply(ctx, cfg) {
     });
   }
   if (cfg.bangdreamBorder) {
-    ctx.command("bdbd [param]").option("starNum", "-n <starNum: number>").option("color", "-c <color: string>").option("train", "-t <train: string>").option("band", "-b <band: string>").action(async ({ session, options }, param) => {
+    ctx.command("bdbd [param:text]").option("starNum", "-n <starNum: number>").option("color", "-c <color: string>").option("train", "-t <train: string>").option("band", "-b <band: string>").action(async ({ session, options }, param) => {
       if (ctx.QhzySharp && detectControl(featureControl, session.guildId, "bdbd")) {
         const drawConfig = await handleBanGDreamConfig(options);
         const imgSrc = await getImageSrc(session, param);

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.27.2",
+  "version": "0.27.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -133,3 +133,4 @@ StarFreedomX机器人的小功能，自用
 | `0.27.0`  | 新增监听车牌修改群名功能                      |
 | `0.27.1`  | 车牌监听权限设置                          |
 | `0.27.2`  | 车牌检测可以保留其他文字                      |
+| `0.27.3`  | 修复at机器人bdbd时无法识别参数的bug            |