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

fix: #1018

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.63",
+  "version": "4.6.65",
   "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.7.63';
+export const napCatVersion = '4.6.65';

src/core/packet/context/operationContext.ts

@@ -30,16 +30,6 @@ export class PacketOperationContext {
         return await this.context.client.sendOidbPacket(pkt, rsp);
     }
 
-    async GroupPoke(peer: number, uin: number) {
-        const req = trans.SendPoke.build(true, peer, uin);
-        await this.context.client.sendOidbPacket(req);
-    }
-
-    async FriendPoke(peer: number, target?: number) {
-        const req = trans.SendPoke.build(false, peer, target ?? peer);
-        await this.context.client.sendOidbPacket(req);
-    }
-
     async SendPoke(is_group: boolean, peer: number, target?: number) {
         const req = trans.SendPoke.build(is_group, peer, target ?? peer);
         await this.context.client.sendOidbPacket(req);

src/core/packet/transformer/action/SendPoke.ts

@@ -9,19 +9,12 @@ class SendPoke extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
     }
 
     build(is_group: boolean, peer: number, target: number): OidbPacket {
-        if (is_group) {
+        const payload = {
-            const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
-                uin: target,
-                groupUin: peer,
-                ext: 0
-            });
-            return OidbBase.build(0xED3, 1, data);
-        }
-        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
             uin: target,
-            friendUin: peer,
+            ext: 0,
-            ext: 0
+            ...(is_group ? { groupUin: peer } : { friendUin: peer })
-        });
+        };
+        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode(payload);
         return OidbBase.build(0xED3, 1, data);
     }
 

src/onebot/action/packet/SendPoke.ts

@@ -13,12 +13,15 @@ export class SendPokeBase extends GetPacketStatusDepends<Payload, void> {
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const target_id = payload.target_id ?? payload.user_id;
+        // 这里的 !! 可以传入空字符串 忽略这些数据有利用接口统一接口
-        const peer_id = payload.group_id ?? payload.user_id;
+        const target_id = !!payload.target_id ? payload.target_id : payload.user_id;
+        const peer_id = !!payload.group_id ? payload.group_id : payload.user_id;
+
         const is_group = !!payload.group_id;
         if (!target_id || !peer_id) {
             throw new Error('请检查参数，缺少 user_id 或 group_id');
         }
+
         await this.core.apis.PacketApi.pkt.operation.SendPoke(is_group, +peer_id, +target_id);
     }
 }