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 { } 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); }