koishi-plugin-echo-cave 1.8.0 → 1.9.1

package/lib/index.cjs

@@ -34,7 +34,9 @@ var require_zh_CN = __commonJS({
   "src/locales/zh-CN.json"(exports2, module2) {
     module2.exports = {
       config: {
-        adminMessageProtection: "\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u5F00\u542F\u540E\u7BA1\u7406\u5458\u53D1\u5E03\u7684\u6D88\u606F\u53EA\u80FD\u7531\u7BA1\u7406\u5458\u5220\u9664"
+        adminMessageProtection: "\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u5F00\u542F\u540E\u7BA1\u7406\u5458\u53D1\u5E03\u7684\u6D88\u606F\u53EA\u80FD\u7531\u7BA1\u7406\u5458\u5220\u9664",
+        allowContributorDelete: "\u5141\u8BB8\u6295\u7A3F\u8005\u5220\u9664\u81EA\u5DF1\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E",
+        allowSenderDelete: "\u5141\u8BB8\u539F\u59CB\u53D1\u9001\u8005\u5220\u9664\u88AB\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E"
       },
       general: {
         privateChatReminder: "\u274C \u8BF7\u5728\u7FA4\u804A\u4E2D\u4F7F\u7528\u8BE5\u547D\u4EE4\uFF01",
@@ -61,9 +63,17 @@ var require_zh_CN = __commonJS({
           messages: {
             noIdProvided: "\u274C \u8BF7\u63D0\u4F9B\u8981\u5220\u9664\u7684\u56DE\u58F0\u6D1E\u6D88\u606F ID\uFF01",
             adminOnly: "\u26D4 \u8BE5\u6D88\u606F\u7531\u7BA1\u7406\u5458\u53D1\u5E03\uFF0C\u5DF2\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u53EA\u6709\u7BA1\u7406\u5458\u53EF\u4EE5\u5220\u9664\u3002",
-            permissionDenied: "\u26D4 \u60A8\u6CA1\u6709\u6743\u9650\u5220\u9664\u6B64\u6D88\u606F\uFF01\u53EA\u6709\u6D88\u606F\u7684\u5B58\u50A8\u8005\u3001\u539F\u59CB\u53D1\u9001\u8005\u6216\u7BA1\u7406\u5458\u53EF\u4EE5\u5220\u9664\u3002",
+            permissionDenied: "\u26D4 \u60A8\u6CA1\u6709\u6743\u9650\u5220\u9664\u6B64\u6D88\u606F\uFF01\u53EA\u6709\u7BA1\u7406\u5458\u53EF\u4EE5\u5220\u9664\u3002",
+            contributorDeleteDenied: "\u26D4 \u60A8\u6CA1\u6709\u6743\u9650\u5220\u9664\u6B64\u6D88\u606F\uFF01\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u6295\u7A3F\u8005\u5220\u9664\u56DE\u58F0\u6D1E\u3002",
+            senderDeleteDenied: "\u26D4 \u60A8\u6CA1\u6709\u6743\u9650\u5220\u9664\u6B64\u6D88\u606F\uFF01\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u539F\u59CB\u53D1\u9001\u8005\u5220\u9664\u56DE\u58F0\u6D1E\u3002",
             msgDeleted: "\u2705 \u5DF2\u6210\u529F\u62B9\u53BB\u56DE\u58F0\u6D1E\u6D88\u606F ID\uFF1A{0}"
           }
+        },
+        "cave.listen": {
+          description: "\u83B7\u5F97\u7531\u81EA\u5DF1\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E\u5217\u8868",
+          messages: {
+            noMsgContributed: '\u{1F680} \u60A8\u5728\u56DE\u58F0\u6D1E\u4E2D\u6682\u65E0\u6295\u7A3F\uFF0C\u5FEB\u4F7F\u7528 "cave.echo" \u547D\u4EE4\u6DFB\u52A0\u7B2C\u4E00\u6761\u6D88\u606F\u5427\uFF01'
+          }
         }
       }
     };
@@ -296,20 +306,25 @@ async function processForwardMessageContent(ctx, msg) {
 
 // src/msg-helper.ts
 async function processMessageContent(ctx, msg) {
-  return Promise.all(
-    msg.map(async (element) => {
-      if (element.type === "image") {
-        return {
-          ...element,
-          data: {
-            ...element.data,
-            url: await saveImages(ctx, element.data)
-          }
-        };
-      }
-      return element;
-    })
-  );
+  const result = [];
+  for (const element of msg) {
+    if (element.type === "reply") {
+      continue;
+    }
+    if (element.type === "image") {
+      const newUrl = await saveImages(ctx, element.data);
+      result.push({
+        ...element,
+        data: {
+          ...element.data,
+          url: newUrl
+        }
+      });
+    } else {
+      result.push(element);
+    }
+  }
+  return result;
 }
 
 // src/index.ts
@@ -320,7 +335,9 @@ var import_node_path2 = __toESM(require("node:path"), 1);
 var name = "echo-cave";
 var inject = ["database"];
 var Config = import_koishi.Schema.object({
-  adminMessageProtection: import_koishi.Schema.boolean().default(false)
+  adminMessageProtection: import_koishi.Schema.boolean().default(false),
+  allowContributorDelete: import_koishi.Schema.boolean().default(true),
+  allowSenderDelete: import_koishi.Schema.boolean().default(true)
 }).i18n({
   "zh-CN": require_zh_CN().config
 });
@@ -354,9 +371,7 @@ function apply(ctx, cfg) {
   ctx.command("cave.wipe <id:number>").action(
     async ({ session }, id) => await deleteCave(ctx, session, cfg, id)
   );
-  ctx.command("cave.listen", "\u83B7\u5F97\u7531\u81EA\u5DF1\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E\u5217\u8868").action(
-    async ({ session }) => await getCaveListByUser(ctx, session)
-  );
+  ctx.command("cave.listen").action(async ({ session }) => await getCaveListByUser(ctx, session));
   ctx.command("cave.trace", "\u83B7\u5F97\u81EA\u5DF1\u53D1\u8A00\u7684\u56DE\u58F0\u6D1E\u5217\u8868").action(
     async ({ session }) => await getCaveListByOriginUser(ctx, session)
   );
@@ -371,7 +386,7 @@ async function getCaveListByUser(ctx, session) {
     channelId
   });
   if (caves.length === 0) {
-    return '\u{1F680} \u60A8\u5728\u56DE\u58F0\u6D1E\u4E2D\u6682\u65E0\u6295\u7A3F\uFF0C\u5FEB\u4F7F\u7528 "cave.echo" \u547D\u4EE4\u6DFB\u52A0\u7B2C\u4E00\u6761\u6D88\u606F\u5427\uFF01';
+    return session.text(".noMsgContributed");
   }
   let response = `\u{1F4DC} \u60A8\u5728\u672C\u9891\u9053\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E\u6D88\u606F\u5217\u8868\uFF1A
 `;
@@ -450,8 +465,18 @@ async function deleteCave(ctx, session, cfg, id) {
       return session.text(".adminOnly");
     }
   }
-  if (currentUserId !== caveMsg.userId && currentUserId !== caveMsg.originUserId && !isCurrentUserAdmin) {
-    return session.text(".permissionDenied");
+  if (!isCurrentUserAdmin) {
+    if (currentUserId === caveMsg.userId) {
+      if (!cfg.allowContributorDelete) {
+        return session.text(".contributorDeleteDenied");
+      }
+    } else if (currentUserId === caveMsg.originUserId) {
+      if (!cfg.allowSenderDelete) {
+        return session.text(".senderDeleteDenied");
+      }
+    } else {
+      return session.text(".permissionDenied");
+    }
   }
   await ctx.database.remove("echo_cave", id);
   return session.text(".msgDeleted", [id]);

package/lib/index.d.ts

@@ -4,6 +4,8 @@ export declare const name = "echo-cave";
 export declare const inject: string[];
 export interface Config {
     adminMessageProtection?: boolean;
+    allowContributorDelete?: boolean;
+    allowSenderDelete?: boolean;
 }
 export declare const Config: Schema<Config>;
 export interface EchoCave {

package/package.json

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