From f5e8ede847c5d8a9a417df5435e80846fa8d0fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Fri, 16 Aug 2024 10:49:22 +0800
Subject: [PATCH] release: 2.0.27

---
 manifest.json                                      |  2 +-
 package.json                                       |  2 +-
 src/common/framework/napcat.ts                     |  2 +-
 .../action/msg/SendMsg/create-send-elements.ts     |  4 ++--
 src/onebot/helper/data.ts                          | 14 ++++----------
 src/webui/ui/NapCat.ts                             |  2 +-
 static/assets/renderer.js                          |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/manifest.json b/manifest.json
index 13b4efc93..f185169dd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "icon": "./logo.png",
   "authors": [
     {
diff --git a/package.json b/package.json
index 71b37b9f3..f014ca2c3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
diff --git a/src/common/framework/napcat.ts b/src/common/framework/napcat.ts
index 3df3f678b..1e71e224f 100644
--- a/src/common/framework/napcat.ts
+++ b/src/common/framework/napcat.ts
@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.0.26';
+export const napcat_version = '2.0.27';
 
 export class NapCatPathWrapper {
     binaryPath: string;
diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts
index 1bd31df98..c8cf13ce4 100644
--- a/src/onebot/action/msg/SendMsg/create-send-elements.ts
+++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts
@@ -56,7 +56,7 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.26 Refactor Todo
+        // Mlikiowa V2.0.27 Refactor Todo
         const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`);
         if (!uid) throw new Error('Get Uid Error');
         return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
         } else {
             postData = data;
         }
-        // Mlikiowa V2.0.26 Refactor Todo
+        // Mlikiowa V2.0.27 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {
diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts
index bbbf1ab1f..c7df87d63 100644
--- a/src/onebot/helper/data.ts
+++ b/src/onebot/helper/data.ts
@@ -417,7 +417,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.26 Refactor Todo
+        // Mlikiowa V2.0.27 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {
@@ -535,19 +535,13 @@ export class OB11Constructor {
                             guildId: '',
                             peerUid: msg.peerUid
                         }
-                        // const replyMsgList = (await NTQQMsgApi.getMsgsBySeqAndCount({
-                        //     chatType: ChatType.group,
-                        //     guildId: '',
-                        //     peerUid: msg.peerUid,
-                        // }, msgSeq, 1, true, true)).msgList;
                         const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, msgSeq)).msgList;
-                        //console.log("表情回应消息长度检测", replyMsgList.length)
                         if (replyMsgList.length < 1) {
                             return;
                         }
-
-                        const replyMsg = replyMsgList.reverse()[0];//获取最顶层消息
-                        //console.log('表情回应消息', msgSeq, ' 结算ID', replyMsg.msgId);
+                        const replyMsg = replyMsgList.filter(e => e.msgSeq == msgSeq).sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
+                        //console.log("表情回应消息长度检测", msgSeq, replyMsg.elements);
+                        if (!replyMsg) throw new Error('找不到回应消息');
                         return new OB11GroupMsgEmojiLikeEvent(
                             core,
                             parseInt(msg.peerUid),
diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts
index 477394c0d..393a034a1 100644
--- a/src/webui/ui/NapCat.ts
+++ b/src/webui/ui/NapCat.ts
@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.0.26', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.27', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([
diff --git a/static/assets/renderer.js b/static/assets/renderer.js
index c464d6c52..ab9872766 100644
--- a/static/assets/renderer.js
+++ b/static/assets/renderer.js
@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.0.26", "napcat-update-button", "secondary")
+          SettingButton("V2.0.27", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([