koishi-plugin-echo-cave 1.16.12 → 1.16.14

package/lib/index.cjs

@@ -157,6 +157,7 @@ module.exports = __toCommonJS(index_exports);
 var import_koishi_plugin_adapter_onebot = require("@pynickle/koishi-plugin-adapter-onebot");
 
 // src/cqcode-helper.ts
+var import_koishi = require("koishi");
 function createTextMsg(content) {
   return {
     type: "text",
@@ -168,7 +169,23 @@ function createTextMsg(content) {
 function parseUserIds(userIds) {
   const parsedUserIds = [];
   for (const userId of userIds) {
-    if (userId) {
+    try {
+      const element = import_koishi.h.parse(userId);
+      if (element.length === 1 && element[0].type === "at") {
+        const userId2 = element[0].attrs.id;
+        if (userId2 === "all") {
+          return {
+            parsedUserIds: [],
+            error: "invalid_all_mention"
+          };
+        }
+        parsedUserIds.push(userId2);
+      }
+    } catch (e) {
+      const num = Number(userId);
+      if (Number.isNaN(num)) {
+        parsedUserIds.push(userId);
+      }
     }
   }
   return {
@@ -523,20 +540,20 @@ async function processMessageContent(ctx, msg, cfg) {
 
 // src/index.ts
 var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 var name = "echo-cave";
 var inject = ["database"];
-var Config = import_koishi.Schema.object({
-  adminMessageProtection: import_koishi.Schema.boolean().default(false),
-  allowContributorDelete: import_koishi.Schema.boolean().default(true),
-  allowSenderDelete: import_koishi.Schema.boolean().default(true),
-  deleteMediaWhenDeletingMsg: import_koishi.Schema.boolean().default(true),
-  enableSizeLimit: import_koishi.Schema.boolean().default(false),
-  maxImageSize: import_koishi.Schema.number().default(2048),
-  maxVideoSize: import_koishi.Schema.number().default(512),
-  maxFileSize: import_koishi.Schema.number().default(512),
-  maxRecordSize: import_koishi.Schema.number().default(512),
-  useBase64ForMedia: import_koishi.Schema.boolean().default(false)
+var Config = import_koishi2.Schema.object({
+  adminMessageProtection: import_koishi2.Schema.boolean().default(false),
+  allowContributorDelete: import_koishi2.Schema.boolean().default(true),
+  allowSenderDelete: import_koishi2.Schema.boolean().default(true),
+  deleteMediaWhenDeletingMsg: import_koishi2.Schema.boolean().default(true),
+  enableSizeLimit: import_koishi2.Schema.boolean().default(false),
+  maxImageSize: import_koishi2.Schema.number().default(2048),
+  maxVideoSize: import_koishi2.Schema.number().default(512),
+  maxFileSize: import_koishi2.Schema.number().default(512),
+  maxRecordSize: import_koishi2.Schema.number().default(512),
+  useBase64ForMedia: import_koishi2.Schema.boolean().default(false)
 }).i18n({
   "zh-CN": require_zh_CN()._config
 });
@@ -574,11 +591,6 @@ function apply(ctx, cfg) {
   );
   ctx.command("cave.bind <id:number> <...userIds>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => {
-      ctx.logger.info(`Binding users ${JSON.stringify(userIds)} to cave ID ${id}`);
-      for (const uid of userIds) {
-        ctx.logger.info(`User ID to bind: ${uid}`);
-        ctx.logger.info(`userid type: ${typeof uid}`);
-      }
       await bindUsersToCave(ctx, session, id, userIds);
     }
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.16.12",
+  "version": "1.16.14",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",