From a83652bf3f4d167254b22eac9849649588fe8184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 18 May 2025 20:55:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E4=BC=98=E7=BE=8E=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/packet/context/operationContext.ts    | 10 ----------
 src/core/packet/transformer/action/SendPoke.ts | 17 +++++------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/core/packet/context/operationContext.ts b/src/core/packet/context/operationContext.ts
index b1fee47b..5a185299 100644
--- a/src/core/packet/context/operationContext.ts
+++ b/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);
diff --git a/src/core/packet/transformer/action/SendPoke.ts b/src/core/packet/transformer/action/SendPoke.ts
index d8b900d5..757c6ec4 100644
--- a/src/core/packet/transformer/action/SendPoke.ts
+++ b/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 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({
+        const payload = {
             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);
     }