fix: #667

fix: wrong notice_type sub_type

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   
-  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
+![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
   
 </div>
 
@@ -32,6 +32,8 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Server.Other](https://docs.napcat.cyou/)
 
+[Qbot.News](https://neko.qbot.news)
+
 ## 回家旅途
 [QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
 

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.16-29927",
-  "verHash": "3e273e30",
-  "linuxVersion": "3.2.13-29927",
-  "linuxVerHash": "833d113c",
+  "version": "9.9.17-30899",
+  "verHash": "ececf273",
+  "linuxVersion": "3.2.15-30899",
+  "linuxVerHash": "63c751e8",
   "type": "module",
   "private": true,
   "description": "QQ",
@@ -18,7 +18,7 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "29927",
+  "buildVersion": "30899",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.38",
+  "version": "4.2.42",
   "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/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.38';
+export const napCatVersion = '4.2.42';

src/core/external/appid.json

@@ -146,5 +146,17 @@
     "6.9.63-30851": {
         "appid": 537263820,
         "qua": "V1_MAC_NQ_6.9.63_30851_GW_B"
+    },
+    "9.9.17-30899": {
+        "appid": 537263796,
+        "qua": "V1_WIN_NQ_9.9.17_30899_GW_B"
+    },
+    "3.2.15-30899": {
+        "appid": 537263831,
+        "qua": "V1_LNX_NQ_3.2.15_30899_GW_B"
+    },
+    "6.9.63-30899": {
+        "appid": 537263820,
+        "qua": "V1_MAC_NQ_6.9.63_30899_GW_B"
     }
 }

src/core/external/offset.json

@@ -166,5 +166,41 @@
     "9.9.17-30851-x64": {
         "send": "395C150",
         "recv": "3960584"
+    },
+    "3.2.15-30851-x64": {
+        "send": "A4A03E0",
+        "recv": "A4A3CE0"
+    },
+    "3.2.15-30851-arm64": {
+        "send": "713A318",
+        "recv": "713DB50"
+    },
+    "6.9.63.30851-x64": {
+        "send": "46C8040",
+        "recv": "46CA8AC"
+    },
+    "6.9.63-30851-arm64": {
+        "send": "41DCBD8",
+        "recv": "41DF3F0"
+    },
+    "9.9.17-30899-x64": {
+        "send": "395C150",
+        "recv": "3960584"
+    },
+    "3.2.15-30899-x64": {
+        "send": "A4A03E0",
+        "recv": "A4A3CE0"
+    },
+    "3.2.15-30899-arm64": {
+        "send": "713A318",
+        "recv": "713DB50"
+    },
+    "6.9.63.30899-x64": {
+        "send": "46C8040",
+        "recv": "46CA8AC"
+    },
+    "6.9.63-30899-arm64": {
+        "send": "41DCBD8",
+        "recv": "41DF3F0"
     }
 }

src/core/packet/clientSession.ts

@@ -23,7 +23,9 @@ export class PacketClientSession {
     get operation() {
         return this.context.operation;
     }
-
+    get client() {
+        return this.context.client;
+    }
     // TODO: global message element adapter (?
     get msgConverter() {
         return this.context.msgConverter;

src/onebot/action/extends/GetClientkey.ts

@@ -0,0 +1,14 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '../OneBotAction';
+
+interface GetClientkeyResponse {
+    clientkey?: string;
+}
+
+export class GetClientkey extends OneBotAction<void, GetClientkeyResponse> {
+    actionName = ActionName.GetClientkey;
+
+    async _handle() {
+        return { clientkey: (await this.core.apis.UserApi.forceFetchClientKey()).clientKey };
+    }
+}

src/onebot/action/extends/SendPacket.ts

@@ -0,0 +1,21 @@
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    cmd: Type.String(),
+    data: Type.String(),
+    rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SendPacket extends GetPacketStatusDepends<Payload, any> {
+    payloadSchema = SchemaData;
+    actionName = ActionName.SendPacket;
+    async _handle(payload: Payload) {
+        const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
+        const data = await this.core.apis.PacketApi.pkt.client.sendOidbPacket({ cmd: payload.cmd, data: payload.data as any }, rsp);
+        return typeof data === 'object' ? data.toString('hex') : undefined;
+    }
+}

src/onebot/action/index.ts

@@ -102,6 +102,9 @@ import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord";
 import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters";
 import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
+import { GetClientkey } from './extends/GetClientkey';
+import { SendPacket } from './extends/SendPacket';
+import { SendPoke } from "@/onebot/action/packet/SendPoke";
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
@@ -123,6 +126,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupRootFiles(obContext, core),
         new SetGroupSign(obContext, core),
         new SendGroupSign(obContext, core),
+        new GetClientkey(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),
@@ -216,6 +220,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetAiRecord(obContext, core),
         new SendGroupAiRecord(obContext, core),
         new GetAiCharacters(obContext, core),
+        new SendPacket(obContext, core),
+        new SendPoke(obContext, core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/packet/SendPoke.ts

@@ -0,0 +1,23 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    user_id: Type.Union([Type.Number(), Type.String()]),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SendPoke extends GetPacketStatusDepends<Payload, any> {
+    actionName = ActionName.SendPoke;
+    payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        if (payload.group_id) {
+            this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        } else {
+            this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+        }
+    }
+}

src/onebot/action/router.ts

@@ -137,10 +137,14 @@ export const ActionName =  {
 
     SetGroupSign: "set_group_sign",
     SendGroupSign: "send_group_sign",
-
+    SendPacket: "send_packet",
     GetMiniAppArk: "get_mini_app_ark",
     // UploadForwardMsg : "upload_forward_msg",
     GetAiRecord: "get_ai_record",
     GetAiCharacters: "get_ai_characters",
     SendGroupAiRecord: "send_group_ai_record",
+
+    GetClientkey: "get_clientkey",
+    
+    SendPoke: 'send_poke',
 } as const;

src/onebot/api/group.ts

@@ -8,6 +8,8 @@ import {
     NapCatCore,
     NTGrayTipElementSubTypeV2,
     RawMessage,
+    TipGroupElement,
+    TipGroupElementType,
 } from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11GroupBanEvent } from '@/onebot/event/notice/OB11GroupBanEvent';
@@ -19,6 +21,7 @@ import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
 import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
 import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent';
+import { OB11GroupNameEvent } from '../event/notice/OB11GroupNameEvent';
 import { pathToFileURL } from 'node:url';
 import { FileNapCatOneBotUUID } from '@/common/helper';
 
@@ -204,11 +207,25 @@ export class OneBotGroupApi {
         );
     }
 
+    async parseGroupElement(msg: RawMessage, element: TipGroupElement, elementWrapper: GrayTipElement) {
+        if (element.type === TipGroupElementType.KGROUPNAMEMODIFIED) {
+            this.core.context.logger.logDebug('收到群名称变更事件', element);
+            return new OB11GroupNameEvent(
+                this.core,
+                parseInt(msg.peerUid),
+                parseInt(await this.core.apis.UserApi.getUinByUidV2(element.memberUid)),
+                element.groupName,
+            );
+        } else if (element.type === TipGroupElementType.KSHUTUP) {
+            let event = await this.parseGroupBanEvent(msg.peerUid, elementWrapper);
+            return event;
+        }
+    }
+
     async parseGrayTipElement(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_GROUP) {
             // 解析群组事件 由sysmsg解析
-            // return await this.parseGroupElement(msg, grayTipElement.groupElement, grayTipElement);
-
+            return await this.parseGroupElement(msg, grayTipElement.groupElement, grayTipElement);
         } else if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
             // 筛选出表情回应 事件
             if (grayTipElement.xmlElement?.templId === '10382') {

src/onebot/api/msg.ts

@@ -990,7 +990,7 @@ export class OneBotMsgApi {
         if (SysMessage.contentHead.type == 33 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
             this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString()).then().catch();
-            const operatorUid = groupChange.operatorInfo?.toString();
+            const operatorUid = groupChange.operatorInfo ? Buffer.from(groupChange.operatorInfo).toString() : '';
             return new OB11GroupIncreaseEvent(
                 this.core,
                 groupChange.groupUin,

src/onebot/event/notice/OB11GroupNameEvent.ts

@@ -0,0 +1,13 @@
+import { OB11GroupNoticeEvent } from './OB11GroupNoticeEvent';
+import { NapCatCore } from '@/core';
+
+export class OB11GroupNameEvent extends OB11GroupNoticeEvent {
+    notice_type = 'notify';
+    sub_type = 'group_name';
+    name_new: string;
+
+    constructor(core: NapCatCore, groupId: number, userId: number, nameNew: string) {
+        super(core, groupId, userId);
+        this.name_new = nameNew;
+    }
+}