Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

fix: wrong user_id in GroupRequestEvent

manifest.json

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

package.json

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

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.29';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/core/apis/user.ts

@@ -234,11 +234,6 @@ export class NTQQUserApi {
             ('NodeIKernelProfileService/getUserDetailInfoByUin', 5000, Uin);
     }
 
-    async getUserDetailInfoByUin(Uin: string) {
-        return this.core.eventWrapper.callNoListenerEvent<(Uin: string) => Promise<UserDetailInfoByUin>>
-            ('NodeIKernelProfileService/getUserDetailInfoByUin', 5000, Uin);
-    }
-
     async forceFetchClientKey() {
         return await this.context.session.getTicketService().forceFetchClientKey('');
     }

src/onebot/action/go-cqhttp/GetStrangerInfo.ts

@@ -21,20 +21,23 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
     async _handle(payload: Payload): Promise<OB11User> {
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const user_id = payload.user_id.toString();
-        const extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id);
+        const extendData = await NTQQUserApi.getUserDetailInfoByUinV2(user_id);
         const uid = (await NTQQUserApi.getUidByUinV2(user_id))!;
         if (!uid || uid.indexOf('*') != -1) {
             const ret = {
-                ...extendData,
-                user_id: parseInt(extendData.info.uin) || 0,
-                nickname: extendData.info.nick,
+                ...extendData.detail.simpleInfo.coreInfo,
+                ...extendData.detail.commonExt,
+                ...extendData.detail.simpleInfo.baseInfo,
+                ...extendData.detail.simpleInfo.relationFlags,
+                user_id: parseInt(extendData.detail.uin) || 0,
+                nickname: extendData.detail.simpleInfo.coreInfo.nick,
                 sex: OB11UserSex.unknown,
-                age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
-                qid: extendData.info.qid,
-                level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
+                age: extendData.detail.simpleInfo.baseInfo.age || 0,
+                qid: extendData.detail.simpleInfo.baseInfo.qid,
+                level: calcQQLevel(extendData.detail.commonExt.qqLevel) || 0,
                 login_days: 0,
-                uid: '',
-            };
+                uid: ''
+              };
             return ret;
         }
         const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) };

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.29 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.29 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/action/msg/SendMsg/index.ts

@@ -134,21 +134,17 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
             };
         }
-        // if (payload.message_type !== 'private' && payload.group_id && !(await getGroup(payload.group_id))) {
-        //   return { valid: false, message: `群${payload.group_id}不存在` };
-        // }
         if (payload.user_id && payload.message_type !== 'group') {
             const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
             const isBuddy = await NTQQFriendApi.isBuddy(uid!);
-            // 此处有问题
-            if (!isBuddy) {
-                //return { valid: false, message: '异常消息' };
-            }
+            if (!isBuddy) {}
         }
         return { valid: true };
     }
 
     async _handle(payload: OB11PostSendMsg): Promise<{ message_id: number }> {
+        if (payload.message_type === 'group') this.contextMode = ContextMode.Group;
+        if (payload.message_type === 'private') this.contextMode = ContextMode.Private;
         const peer = await createContext(this.CoreContext, payload, this.contextMode);
 
         const messages = normalize(

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.29 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),

src/onebot/index.ts

@@ -291,8 +291,8 @@ export class NapCatOneBot11Adapter {
                     await this.networkManager.emitEvent(new OB11FriendRequestEvent(
                         this.core,
                         parseInt(requesterUin!),
-                        req.friendUid + '|' + req.reqTime,
                         req.extWords,
+                        req.friendUid + '|' + req.reqTime,
                     ));
                 } catch (e) {
                     this.context.logger.logDebug('获取加好友者QQ号失败', e);
@@ -396,12 +396,12 @@ export class NapCatOneBot11Adapter {
                         } catch (e) {
                             this.context.logger.logError('获取加群人QQ号失败 Uid:', notify.user1.uid, e);
                         }
-                    } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+                    } else if (notify.type == GroupNotifyTypes.INVITE_ME && notify.status == 1) {
                         this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
                         const groupInviteEvent = new OB11GroupRequestEvent(
                             this.core,
                             parseInt(notify.group.groupCode),
-                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
+                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)),
                             'invite',
                             notify.postscript,
                             flag,

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.29', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

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.29", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([