koishi-plugin-starfx-bot 0.27.0 → 0.27.2

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export declare const inject: {
 declare module 'koishi' {
     interface Channel {
         pickupLength: number;
+        pickupGrant: boolean;
     }
 }
 export declare let baseDir: string;

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: "拾取状态: 已关闭", 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.0",
+  version: "0.27.2",
   main: "lib/index.js",
   typings: "lib/index.d.ts",
   files: [
@@ -1355,8 +1355,9 @@ var Config = import_koishi5.Schema.intersect([
 ]);
 function apply(ctx, cfg) {
   ctx.model.extend("channel", {
-    pickupLength: "unsigned"
+    pickupLength: "unsigned",
     // 无符号整数
+    pickupGrant: "boolean"
   });
   ctx.i18n.define("zh-CN", require_zh_CN());
   baseDir = ctx.baseDir;
@@ -1683,40 +1684,61 @@ function apply(ctx, cfg) {
       }
     });
   }
+  const canTogglePickup = /* @__PURE__ */ __name(async (session) => {
+    if (await canGrant(session)) return true;
+    const channel = await session.observeChannel(["pickupGrant"]);
+    return !!channel.pickupGrant;
+  }, "canTogglePickup");
   if (cfg.roomNumToName) {
-    ctx.command("打开拾取 [length:number]").alias("开启拾取", "设置拾取", "开启车牌检测").channelFields(["pickupLength"]).action(async ({ session }, length) => {
+    ctx.command("车牌检测权限 [allow:text]").channelFields(["pickupGrant"]).action(async ({ session }, allow) => {
       if (!detectControl(featureControl, session.guildId, "pickup")) return;
       if (!session.guildId) return session.text(".noGuild");
       if (!await canGrant(session)) return session.text(".noPermission");
+      if (!allow) {
+        return session.channel.pickupGrant ? session.text(".status.enabled") : session.text(".status.disabled");
+      }
+      const normalized = String(allow).trim().toLowerCase();
+      if (["1", "true", "yes", "y", "on", "开", "开启", "允许"].includes(normalized)) {
+        session.channel.pickupGrant = true;
+        return session.text(".enabled");
+      }
+      if (["0", "false", "no", "n", "off", "关", "关闭", "禁止"].includes(normalized)) {
+        session.channel.pickupGrant = false;
+        return session.text(".disabled");
+      }
+      return session.text(".invalid");
+    });
+    ctx.command("开启车牌检测 [length:number]").alias("打开车牌检测", "打开拾取").channelFields(["pickupLength", "pickupGrant"]).action(async ({ session }, length) => {
+      if (!detectControl(featureControl, session.guildId, "pickup")) return;
+      if (!session.guildId) return session.text(".noGuild");
+      if (!await canTogglePickup(session)) return session.text(".noPermission");
+      if (!await canBotManage(session)) return session.text("middleware.messages.notManager");
       const finalLength = length || cfg.roomNumLength || 5;
       if (finalLength < 1 || finalLength > 20) return session.text(".invalidLength");
       session.channel.pickupLength = finalLength;
       return session.text(".success", { length: finalLength });
     });
-    ctx.command("关闭拾取").channelFields(["pickupLength"]).action(async ({ session }) => {
+    ctx.command("关闭车牌检测").alias("关闭拾取").channelFields(["pickupLength", "pickupGrant"]).action(async ({ session }) => {
       if (!detectControl(featureControl, session.guildId, "pickup")) return;
       if (!session.guildId) return session.text(".noGuild");
-      if (!await canGrant(session)) return session.text(".noPermission");
-      if (!await canBotManage(session)) return session.text("middleware.messages.notManager");
+      if (!await canTogglePickup(session)) return session.text(".noPermission");
       session.channel.pickupLength = 0;
       return session.text(".success");
     });
-    ctx.command("拾取状态").channelFields(["pickupLength"]).action(async ({ session }) => {
+    ctx.command("车牌检测状态").channelFields(["pickupLength", "pickupGrant"]).action(async ({ session }) => {
       if (!detectControl(featureControl, session.guildId, "pickup")) return;
       if (!session.guildId) return session.text(".noGuild");
-      if (!await canGrant(session)) return session.text(".noPermission");
-      if (!await canBotManage(session)) return session.text("middleware.messages.notManager");
-      return session.channel.pickupLength > 0 ? session.text(".enabled", { length: session.channel.pickupLength }) : session.text(".disabled");
+      return `${session.channel.pickupLength > 0 ? session.text(".enabled", { length: session.channel.pickupLength }) : session.text(".disabled")}
+${!!await canBotManage(session) ? session.text(".managerEnabled") : session.text(".managerDisabled")}`;
     });
   }
   ctx.middleware(async (session, next) => {
     const elements = session.elements;
     if (cfg.roomNumToName && session.guildId && detectControl(featureControl, session.guildId, "pickup")) {
-      const channel = await session.observeChannel(["pickupLength"]);
+      const channel = await session.observeChannel(["pickupLength", "pickupGrant"]);
       const targetLength = channel.pickupLength;
       const content = session.content?.trim();
       if (targetLength > 0 && new RegExp(`^\\d{${targetLength}}$`).test(content)) {
-        if (!await canBotManage(session)) return session.text("middleware.messages.notManager");
         const setGroupName = /* @__PURE__ */ __name(async (name2) => {
           const internal = session.bot.internal;
           if (typeof internal?._request === "function" && session.platform === "onebot") {
@@ -1737,19 +1759,61 @@ function apply(ctx, cfg) {
           }
           throw new Error(session.text("middleware.messages.editFuncNotFound"));
         }, "setGroupName");
+        const getCurrentGroupName = /* @__PURE__ */ __name(async () => {
+          const channel2 = await session.bot.getChannel(session.channelId);
+          return channel2?.name;
+        }, "getCurrentGroupName");
         try {
-          await setGroupName(content);
-          await session.send(session.text("middleware.messages.editGroupNameSuccess", { content }));
+          const replaceNumberInName = /* @__PURE__ */ __name((name2, digits) => {
+            if (!name2 || !name2.length) return digits;
+            const targetLen = digits.replace(/\s+/g, "").length;
+            const n = name2.length;
+            for (let i = 0; i < n; i++) {
+              for (let j = i + 1; j <= n; j++) {
+                const sub = name2.slice(i, j);
+                const compact = sub.replace(/\s+/g, "");
+                if (compact.length === targetLen && /^\d+$/.test(compact)) {
+                  return name2.slice(0, i) + digits + name2.slice(j);
+                }
+              }
+            }
+            return digits + " " + name2;
+          }, "replaceNumberInName");
+          const currentName = await getCurrentGroupName();
+          const contentDigits = String(content).replace(/\s+/g, "");
+          let newName;
+          if (currentName) {
+            newName = replaceNumberInName(currentName, contentDigits);
+          } else {
+            newName = contentDigits;
+          }
+          await setGroupName(newName);
+          await session.send(session.text("middleware.messages.editGroupNameSuccess", { content: newName }));
           return;
         } catch (e) {
           starfxLogger.warn(`纯数字修改失败，尝试添加空格重试: ${content}`);
           try {
             const spacedContent = content.replace(/(\d{3})(?=\d)/g, "$1 ");
-            await setGroupName(spacedContent);
-            await session.send(session.text("middleware.messages.editGroupNameRetrySuccess", { content, spacedContent }));
+            const currentName = await getCurrentGroupName();
+            const finalName = currentName ? (() => {
+              const targetLen = spacedContent.replace(/\s+/g, "").length;
+              const n = currentName.length;
+              for (let i = 0; i < n; i++) {
+                for (let j = i + 1; j <= n; j++) {
+                  const sub = currentName.slice(i, j);
+                  const compact = sub.replace(/\s+/g, "");
+                  if (compact.length === targetLen && /^\d+$/.test(compact)) {
+                    return currentName.slice(0, i) + spacedContent + currentName.slice(j);
+                  }
+                }
+              }
+              return spacedContent + " " + currentName;
+            })() : spacedContent;
+            await setGroupName(finalName);
+            await session.send(session.text("middleware.messages.editGroupNameRetrySuccess", { content, spacedContent: finalName }));
             return;
           } catch (retryError) {
-            starfxLogger.error(`尝试添加空格修改群名依然失败: ${retryError}`);
+            starfxLogger.error(`尝试添加空格修改群名仍失败: ${retryError}`);
           }
         }
       }
@@ -1776,7 +1840,6 @@ function apply(ctx, cfg) {
   });
   if (process.env.NODE_ENV === "development") {
     ctx.command("test [params]").action(async ({ session }) => {
-      await session.send("test");
     });
     ctx.middleware(async (session, next) => {
       await session.send("");

package/lib/plugins/drawHead.d.ts

@@ -17,14 +17,14 @@ export declare function handleBanGDreamConfig(options: any): Promise<{
  * @param baseImage 被封印的图片url
  * @return 画完的图片 h对象
  */
-export declare function drawLock(ctx: Context, baseImage: string): Promise<"发生错误" | "输入无效" | h>;
+export declare function drawLock(ctx: Context, baseImage: string): Promise<h | "输入无效" | "发生错误">;
 /**
  * "卖掉了"绘图函数
  * @param ctx
  * @param baseImage
  * @return 画完的图片 h对象
  */
-export declare function drawSold(ctx: Context, baseImage: string): Promise<"发生错误" | "输入无效" | h>;
+export declare function drawSold(ctx: Context, baseImage: string): Promise<h | "输入无效" | "发生错误">;
 /**
  * BanG Dream!边框绘制功能
  * @param ctx Koishi上下文

package/package.json

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

package/readme.md

@@ -70,6 +70,7 @@ StarFreedomX机器人的小功能，自用
 | `forward`        | 消息转发功能                                |
 | `exchangeRate`   | 汇率播报功能                                |
 | `myId`           | 我的会话信息                                |
+| `pickup`         | 车牌检测                                  |
 
 ---
 
@@ -130,3 +131,5 @@ StarFreedomX机器人的小功能，自用
 | `0.26.6`  | 修正roll扔骰子的判断错误                    |
 | `0.26.8`  | 修复sharp库传回参数改为对象的错误               |
 | `0.27.0`  | 新增监听车牌修改群名功能                      |
+| `0.27.1`  | 车牌监听权限设置                          |
+| `0.27.2`  | 车牌检测可以保留其他文字                      |