onebots 0.4.14 → 0.4.15

package/lib/onebot.js

@@ -182,13 +182,13 @@ class OneBot extends events_1.EventEmitter {
                     case 'group':
                         data.message.unshift({
                             type: 'reply',
-                            message_id: (0, icqq_2.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time)
+                            id: (0, icqq_2.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;
                     case 'private':
                         data.message.unshift({
                             type: 'reply',
-                            message_id: (0, icqq_2.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
+                            id: (0, icqq_2.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;
                 }

package/lib/service/V11/index.js

@@ -196,7 +196,19 @@ class V11 extends events_1.EventEmitter {
         if (data.post_type === 'system') {
         }
         if (data.message && data.post_type === 'message') {
-            data.message = this.config.post_message_format === 'array' ? (0, icqq_cq_enable_1.toSegment)(data.message) : (0, icqq_cq_enable_1.toCqcode)(data);
+            if (this.config.post_message_format === 'array') {
+                data.message = (0, icqq_cq_enable_1.toSegment)(data.message);
+            }
+            else {
+                if (data.source) {
+                    this.db.set(`KVMap.${data.source.seq}`, data.message[0].id);
+                    data.message.shift();
+                    data.message = (0, icqq_cq_enable_1.toCqcode)(data).replace(/^(\[CQ:reply,id=)(.+?)\]/, `$1${data.source.seq}]`);
+                }
+                else {
+                    data.message = (0, icqq_cq_enable_1.toCqcode)(data);
+                }
+            }
         }
         if (data.message_id) {
             this.db.set(`KVMap.${data.seq}`, data.message_id);
@@ -377,6 +389,9 @@ class V11 extends events_1.EventEmitter {
      */
     async apply(req) {
         let { action, params, echo } = req;
+        if (typeof params.message_id == 'number' || /^\d+$/.test(params.message_id)) {
+            params.message_id = this.db.get(`KVMap.${params.message_id}`);
+        }
         action = (0, utils_1.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
@@ -448,6 +463,12 @@ class V11 extends events_1.EventEmitter {
             }
             if (result.data instanceof Map)
                 result.data = [...result.data.values()];
+            if (result.data?.message)
+                result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
+            if (result.data?.message_id && result.data?.seq) {
+                this.db.set(`KVMap.${result.data.seq}`, result.data.message_id);
+                result.data.message_id = result.data.seq;
+            }
             if (echo) {
                 result.echo = echo;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"