fix: #444

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "3.4.0",
+  "version": "3.4.3",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.4.0",
+  "version": "3.4.3",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/qq-basic-info.ts

@@ -85,7 +85,10 @@ export class QQBasicInfoWrapper {
         // 通过Major拉取 性能差
         try {
             let majorAppid = this.getAppidV2ByMajor(fullVersion);
-            if (majorAppid) { return { appid: majorAppid, qua: this.getQUAFallback() }; }
+            if (majorAppid) {
+                this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`);
+                return { appid: majorAppid, qua: this.getQUAFallback() };
+            }
         } catch (error) {
             this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`);
         }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.4.0';
+export const napCatVersion = '3.4.3';

src/core/apis/group.ts

@@ -54,7 +54,9 @@ export class NTQQGroupApi {
         }, pskey);
     }
     async getGroupShutUpMemberList(groupCode: string) {
-        return this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        let data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', 1, 1000, (group_id) => group_id === groupCode);
+        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        return (await data)[1];
     }
     async clearGroupNotifiesUnreadCount(uk: boolean) {
         return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);

src/core/entities/msg.ts

@@ -822,6 +822,8 @@ export interface RawMessage {
     elements: MessageElement[];
 
     sourceType: MsgSourceType;
+
+    isOnlineMsg: boolean;
 }
 export interface QueryMsgsParams {
     chatInfo: Peer;

src/core/entities/notify.ts

@@ -43,6 +43,50 @@ export enum GroupInviteType {
     BYGROUPMEMBER,
     BYDISCUSSMEMBER
 }
+export interface ShutUpGroupHonor {
+    [key: string]: number;
+}
+
+export interface ShutUpGroupMember {
+    uid: string;
+    qid: string;
+    uin: string;
+    nick: string;
+    remark: string;
+    cardType: number;
+    cardName: string;
+    role: number;
+    avatarPath: string;
+    shutUpTime: number;
+    isDelete: boolean;
+    isSpecialConcerned: boolean;
+    isSpecialShield: boolean;
+    isRobot: boolean;
+    groupHonor: ShutUpGroupHonor;
+    memberRealLevel: number;
+    memberLevel: number;
+    globalGroupLevel: number;
+    globalGroupPoint: number;
+    memberTitleId: number;
+    memberSpecialTitle: string;
+    specialTitleExpireTime: string;
+    userShowFlag: number;
+    userShowFlagNew: number;
+    richFlag: number;
+    mssVipType: number;
+    bigClubLevel: number;
+    bigClubFlag: number;
+    autoRemark: string;
+    creditLevel: number;
+    joinTime: number;
+    lastSpeakTime: number;
+    memberFlag: number;
+    memberFlagExt: number;
+    memberMobileFlag: number;
+    memberFlagExt2: number;
+    isSpecialShielded: boolean;
+    cardNameId: number;
+}
 
 export interface GroupNotify {
     seq: string; // 通知序列号

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,4 +1,4 @@
-import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
+import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/entities';
 
 export class NodeIKernelGroupListener {
     onGroupListInited(listEmpty: boolean): void { }
@@ -80,6 +80,6 @@ export class NodeIKernelGroupListener {
     onSearchMemberChange(...args: unknown[]) {
     }
 
-    onShutUpMemberListChanged(...args: unknown[]) {
+    onShutUpMemberListChanged(groupCode: string, members: Array<ShutUpGroupMember>) {
     }
 }

src/onebot/action/group/GetGroupShutList.ts

@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupShutList extends BaseAction<Payload, OB11Group> {
+export class GetGroupShutList extends BaseAction<Payload, any> {
     actionName = ActionName.GetGroupShutList;
     payloadSchema = SchemaData;
 

src/onebot/index.ts

@@ -311,33 +311,51 @@ export class NapCatOneBot11Adapter {
             }
         };
 
-        const msgIdSend = new LRUCache<string, boolean>(100);
+        //const msgIdSend = new LRUCache<string, boolean>(100);
         const recallMsgs = new LRUCache<string, boolean>(100);
+        msgListener.onAddSendMsg = async msg => {
+            if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS) {
+                this.apis.MsgApi.parseMessage(msg)
+                    .then((ob11Msg) => {
+                        if (!ob11Msg) return;
+                        ob11Msg.target_id = parseInt(msg.peerUin);
+                        if (this.configLoader.configData.reportSelfMessage) {
+                            msg.id = MessageUnique.createUniqueMsgId({
+                                chatType: msg.chatType,
+                                peerUid: msg.peerUid,
+                                guildId: '',
+                            }, msg.msgId);
+                            this.emitMsg(msg);
+                        } else {
+                            // logOB11Message(this.core, ob11Msg);
+                        }
+                    });
+            }
+        };
         msgListener.onMsgInfoListUpdate = async msgList => {
             this.emitRecallMsg(msgList, recallMsgs)
                 .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));
-
-            for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
-                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSend.get(msg.msgId)) {
-                    msgIdSend.put(msg.msgId, true);
-                    // 完成后再post
-                    this.apis.MsgApi.parseMessage(msg)
-                        .then((ob11Msg) => {
-                            if (!ob11Msg) return;
-                            ob11Msg.target_id = parseInt(msg.peerUin);
-                            if (this.configLoader.configData.reportSelfMessage) {
-                                msg.id = MessageUnique.createUniqueMsgId({
-                                    chatType: msg.chatType,
-                                    peerUid: msg.peerUid,
-                                    guildId: '',
-                                }, msg.msgId);
-                                this.emitMsg(msg);
-                            } else {
-                                // logOB11Message(this.core, ob11Msg);
-                            }
-                        });
-                }
-            }
+            // for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
+            //     if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSend.get(msg.msgId)) {
+            //         msgIdSend.put(msg.msgId, true);
+            //         // 完成后再post
+            //         this.apis.MsgApi.parseMessage(msg)
+            //             .then((ob11Msg) => {
+            //                 if (!ob11Msg) return;
+            //                 ob11Msg.target_id = parseInt(msg.peerUin);
+            //                 if (this.configLoader.configData.reportSelfMessage) {
+            //                     msg.id = MessageUnique.createUniqueMsgId({
+            //                         chatType: msg.chatType,
+            //                         peerUid: msg.peerUid,
+            //                         guildId: '',
+            //                     }, msg.msgId);
+            //                     this.emitMsg(msg);
+            //                 } else {
+            //                     // logOB11Message(this.core, ob11Msg);
+            //                 }
+            //             });
+            //     }
+            // }
         };
 
         this.context.session.getMsgService().addKernelMsgListener(
@@ -523,7 +541,7 @@ export class NapCatOneBot11Adapter {
         );
     }
 
-    private async emitMsg(message: RawMessage) {
+    private async emitMsg(message: RawMessage, parseEvent: boolean = true) {
         const { debug, reportSelfMessage, messagePostFormat } = this.configLoader.configData;
         this.context.logger.logDebug('收到新消息 RawMessage', message);
         this.apis.MsgApi.parseMessage(message, messagePostFormat).then((ob11Msg) => {

src/onebot/network/passive-websocket.ts

@@ -143,7 +143,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     private registerHeartBeat() {
         this.heartbeatIntervalId = setInterval(() => {
             this.wsClientsMutex.runExclusive(async () => {
-                this.wsClients.forEach((wsClient) => {
+                this.wsClientWithEvent.forEach((wsClient) => {
                     if (wsClient.readyState === WebSocket.OPEN) {
                         wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.core, this.heartbeatInterval, this.core.selfInfo.online, true)));
                     }

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.4.0", "napcat-update-button", "secondary")
+          SettingButton("V3.4.3", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([