Update SendMsg.ts

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.34",
+  "version": "4.7.33",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",

src/common/file.ts

@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
     }
-    const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
+    const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.34';
+export const napCatVersion = '4.7.33';

src/core/apis/friend.ts

@@ -86,31 +86,4 @@ export class NTQQFriendApi {
             accept,
         });
     }
-    async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
-        this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
-    }
-    async getDoubtFriendRequest(count: number) {
-        let date = Date.now().toString();
-        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
-            'NodeIKernelBuddyService/getDoubtBuddyReq',
-            'NodeIKernelBuddyListener/onDoubtBuddyReqChange',
-            [date, count, ''],
-            () => true,
-            (data) => data.reqId === date
-        );
-        let requests = Promise.all(ret.doubtList.map(async (item) => {
-            return {
-                flag: item.uid, //注意强制String 非isNumeric 不遵守则不符合设计
-                uin: await this.core.apis.UserApi.getUinByUidV2(item.uid) ?? 0,// 信息字段
-                nick: item.nick, // 信息字段 这个不是nickname 可能是来源的群内的昵称
-                source: item.source, // 信息字段
-                reason: item.reason, // 信息字段
-                msg: item.msg, // 信息字段
-                group_code: item.groupCode, // 信息字段
-                time: item.reqTime, // 信息字段
-                type: 'doubt' //保留字段
-            };
-        }))
-        return requests;
-    }
 }

src/core/external/appid.json

@@ -258,13 +258,5 @@
     "3.2.17-34467": {
         "appid": 537282292,
         "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
-    },
-    "9.9.19-34566": {
-        "appid": 537282307,
-        "qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
-    },
-    "3.2.17-34566": {
-        "appid": 537282343,
-        "qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
     }
 }

src/core/external/offset.json

@@ -327,16 +327,12 @@
         "send": "770CDC0",
         "recv": "77106F0"
     },
-    "9.9.19-34362-x64": {
+    "9.9.19-34362-x64":{
         "send": "3BD80D0",
         "recv": "3BDC8D0"
     },
     "9.9.19-34467-x64": {
         "send": "3BD8690",
         "recv": "3BDCE90"
-    },
-    "9.9.19-34566-x64": {
-        "send": "3BDA110",
-        "recv": "3BDE910"
     }
 }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -40,30 +40,12 @@ export class NodeIKernelBuddyListener {
     }
 
     onDelBatchBuddyInfos(arg: unknown): any {
-        console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
-    onDoubtBuddyReqChange(_arg:
-        {
-            reqId: string;
-            cookie: string;
-            doubtList: Array<{
-                uid: string;
-                nick: string;
-                age: number,
-                sex: number;
-                commFriendNum: number;
-                reqTime: string;
-                msg: string;
-                source: string;
-                reason: string;
-                groupCode: string;
-                nameMore?: null;
-            }>;
-        }): void | Promise<void> {
+    onDoubtBuddyReqChange(arg: unknown): any {
     }
 
-    onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
+    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
     }
 
     onNickUpdated(arg: unknown): any {

src/core/services/NodeIKernelBuddyService.ts

@@ -106,15 +106,15 @@ export interface NodeIKernelBuddyService {
 
     getAddMeSetting(): unknown;
 
-    getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
+    getDoubtBuddyReq(): unknown;
 
     getDoubtBuddyUnreadNum(): number;
 
-    approvalDoubtBuddyReq(uid: string, str1: string, str2: string): void;
+    approvalDoubtBuddyReq(uid: number, isAgree: boolean): void;
 
     delDoubtBuddyReq(uid: number): void;
 
-    delAllDoubtBuddyReq(): Promise<GeneralCallResult>;
+    delAllDoubtBuddyReq(): void;
 
     reportDoubtBuddyReqUnread(): void;
 

src/onebot/action/index.ts

@@ -115,16 +115,10 @@ import { RenameGroupFile } from './extends/RenameGroupFile';
 import { GetRkeyServer } from './packet/GetRkeyServer';
 import { GetRkeyEx } from './packet/GetRkeyEx';
 import { CleanCache } from './system/CleanCache';
-import SetFriendRemark from './user/SetFriendRemark';
-import { SetDoubtFriendsAddRequest } from './new/SetDoubtFriendsAddRequest';
-import { GetDoubtFriendsAddRequest } from './new/GetDoubtFriendsAddRequest';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
-        new SetDoubtFriendsAddRequest(obContext, core),
-        new GetDoubtFriendsAddRequest(obContext, core),
-        new SetFriendRemark(obContext, core),
         new GetRkeyEx(obContext, core),
         new GetRkeyServer(obContext, core),
         new SetGroupRemark(obContext, core),

src/onebot/action/msg/SendMsg.ts

@@ -1,6 +1,7 @@
 import {
     OB11MessageData,
     OB11MessageDataType,
+    OB11MessageForward,
     OB11MessageMixType,
     OB11MessageNode,
     OB11PostContext,
@@ -12,7 +13,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
-import { stringifyWithBigInt } from '@/common/helper';
+import { isNumeric, stringifyWithBigInt } from '@/common/helper';
 import { PacketMsg } from '@/core/packet/message/message';
 import { rawMsgWithSendMsg } from '@/core/packet/message/converter';
 
@@ -152,21 +153,25 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
             } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) {
                 throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`);
             }
-        } else {
-            // if (getSpecialMsgNum(payload, OB11MessageDataType.music)) {
-            //   const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic;
-            //   if (music) {
-            //   }
-            // }
+        } else if (await this.getIsFowardOneMsg(messages)) {
+            let onebot_inner_forward = await this.getIsFowardOneMsg(messages);
+            if (!onebot_inner_forward) throw Error('转发消息失败，未找到消息');
+            const real_msgid = MessageUnique.getMsgIdAndPeerByShortId(+onebot_inner_forward.data.id)?.MsgId || onebot_inner_forward.data.id;
+            await this.core.apis.MsgApi.forwardMsg(peer,
+                peer,
+                [real_msgid]
+            );
+            // 暂时没办法筛选的委屈办法
+            return { message_id: +onebot_inner_forward.data.id };
         }
-        // log("send msg:", peer, sendElements)
-
         const { sendElements, deleteAfterSentFiles } = await this.obContext.apis.MsgApi
             .createSendElements(messages, peer);
         const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles);
         return { message_id: returnMsg.id! };
     }
-
+    private async getIsFowardOneMsg(message: OB11MessageData[]): Promise<OB11MessageForward | undefined> {
+        return message.find(msg => msg.type === OB11MessageDataType.forward && isNumeric(msg.data.id)) as OB11MessageForward | undefined;
+    }
     private async uploadForwardedNodesPacket(msgPeer: Peer, messageNodes: OB11MessageNode[], source?: string, news?: {
         text: string
     }[], summary?: string, prompt?: string, parentMeta?: {

src/onebot/action/new/GetDoubtFriendsAddRequest.ts

@@ -1,18 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    count: Type.Number({ default: 50 }),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class GetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
-    override actionName = ActionName.GetDoubtFriendsAddRequest;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        return await this.core.apis.FriendApi.getDoubtFriendRequest(payload.count);
-    }
-}

src/onebot/action/new/SetDoubtFriendsAddRequest.ts

@@ -1,21 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    flag: Type.String(),
-    //注意强制String 非isNumeric 不遵守则不符合设计
-    approve: Type.Boolean({ default: true }),
-    //该字段没有语义 仅做保留 强制为True
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class SetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
-    override actionName = ActionName.SetDoubtFriendsAddRequest;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        return await this.core.apis.FriendApi.handleDoubtFriendRequest(payload.flag);
-    }
-}

src/onebot/action/router.ts

@@ -10,10 +10,6 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
-    // new extends 完全差异OneBot类别
-    GetDoubtFriendsAddRequest: 'get_doubt_friends_add_request',
-    SetDoubtFriendsAddRequest: 'set_doubt_friends_add_request',
-    // napcat
     GetRkeyEx: 'get_rkey',
     GetRkeyServer: 'get_rkey_server',
     SetGroupRemark: 'set_group_remark',
@@ -39,7 +35,6 @@ export const ActionName = {
     SetGroupLeave: 'set_group_leave',
     SetSpecialTitle: 'set_group_special_title',
     SetFriendAddRequest: 'set_friend_add_request',
-    SetFriendRemark: 'set_friend_remark',
     SetGroupAddRequest: 'set_group_add_request',
     GetLoginInfo: 'get_login_info',
     GoCQHTTP_GetStrangerInfo: 'get_stranger_info',

src/onebot/action/user/SetFriendRemark.ts

@@ -1,25 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    user_id: Type.String(),
-    remark: Type.String()
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetFriendRemark extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetFriendRemark;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload): Promise<null> {
-        let friendUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id);
-        let is_friend = await this.core.apis.FriendApi.isBuddy(friendUid);
-        if (!is_friend) {
-            throw new Error(`用户 ${payload.user_id} 不是好友`);
-        }
-        await this.core.apis.FriendApi.setBuddyRemark(friendUid, payload.remark);
-        return null;
-    }
-}

src/onebot/api/group.ts

@@ -250,34 +250,7 @@ export class OneBotGroupApi {
             'invite'
         );
     }
-    async parse51TypeEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
-        // 神经腾讯 没了妈妈想出来的
-        // Warn 下面存在高并发危险
-        if (grayTipElement.jsonGrayTipElement.jsonStr) {
-            const json: {
-                align: string,
-                items: Array<{ txt: string, type: string }>
-            } = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
-            if (json.items.length === 1 && json.items[0]?.txt.endsWith('加入群')) {
-                let old_members = structuredClone(this.core.apis.GroupApi.groupMemberCache.get(msg.peerUid));
-                if (!old_members) return;
-                let new_members_map = await this.core.apis.GroupApi.refreshGroupMemberCache(msg.peerUid, true);
-                if (!new_members_map) return;
-                let new_members = Array.from(new_members_map.values());
-                // 对比members查找新成员
-                let new_member = new_members.find((member) => old_members.get(member.uid) == undefined);
-                if (!new_member) return;
-                return new OB11GroupIncreaseEvent(
-                    this.core,
-                    +msg.peerUid,
-                    +new_member.uin,
-                    0,
-                    'invite',
-                );
-            }
-        }
-        return;
-    }
+
     async parseGrayTipElement(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_GROUP) {
             // 解析群组事件 由sysmsg解析
@@ -309,9 +282,6 @@ export class OneBotGroupApi {
                 return await this.parsePaiYiPai(msg, grayTipElement.jsonGrayTipElement.jsonStr);
             } else if (grayTipElement.jsonGrayTipElement.busiId == JsonGrayBusiId.AIO_GROUP_ESSENCE_MSG_TIP) {
                 return await this.parseEssenceMsg(msg, grayTipElement.jsonGrayTipElement.jsonStr);
-            } else if (+(grayTipElement.jsonGrayTipElement.busiId ?? 0) == 51) {
-                // 51是什么？{"align":"center","items":[{"txt":"下一秒起床通过王者荣耀加入群","type":"nor"}]
-                return await this.parse51TypeEvent(msg, grayTipElement);
             } else {
                 return await this.parseOtherJsonEvent(msg, grayTipElement.jsonGrayTipElement.jsonStr, this.core.context);
             }