GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #1018

Browse Source
This commit is contained in:
手瓜一十雪
2025-05-18 20:15:38 +08:00
parent 3a1d1f2e59
commit 20d1ac9d01
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/packet/context/operationContext.ts
View File

@@ -31,12 +31,12 @@ export class PacketOperationContext {
} }
async GroupPoke(groupUin: number, uin: number) { async GroupPoke(groupUin: number, uin: number) {
const req = trans.SendPoke.build(uin, groupUin); const req = trans.SendPoke.build(true, uin, groupUin);
await this.context.client.sendOidbPacket(req); await this.context.client.sendOidbPacket(req);
} }
async FriendPoke(uin: number) { async FriendPoke(uin: number, target?: number) {
const req = trans.SendPoke.build(uin); const req = trans.SendPoke.build(false, uin, target ?? uin);
await this.context.client.sendOidbPacket(req); await this.context.client.sendOidbPacket(req);
} }

2
src/core/packet/transformer/action/SendPoke.ts
View File

@@ -8,7 +8,7 @@ class SendPoke extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
super(); super();
} }
build(peer: number, group?: number): OidbPacket { build(is_group: boolean, peer: number, group?: number): OidbPacket {
const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({ const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
uin: peer, uin: peer,
groupUin: group, groupUin: group,

2
src/core/packet/transformer/oidb/oidbBase.ts
View File

@@ -7,7 +7,7 @@ class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
super(); super();
} }
build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, isLafter: boolean = false): OidbPacket { build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, _isLafter: boolean = false): OidbPacket {
const data = new NapProtoMsg(proto.OidbSvcTrpcTcpBase).encode({ const data = new NapProtoMsg(proto.OidbSvcTrpcTcpBase).encode({
command: cmd, command: cmd,
subCommand: subCmd, subCommand: subCmd,

3
src/onebot/action/packet/SendPoke.ts
View File

@@ -5,6 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
const SchemaData = Type.Object({ const SchemaData = Type.Object({
group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])), group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
user_id: Type.Union([Type.Number(), Type.String()]), user_id: Type.Union([Type.Number(), Type.String()]),
target_id: Type.Union([Type.Number(), Type.String()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = Static<typeof SchemaData>;
@@ -17,7 +18,7 @@ export class SendPoke extends GetPacketStatusDepends<Payload, void> {
if (payload.group_id) { if (payload.group_id) {
await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id); await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
} else { } else {
await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id); await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id, payload.target_id ? +payload.target_id : undefined);
} }
} }
} }

5
src/onebot/action/user/FriendPoke.ts
View File

@@ -3,7 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
import { Static, Type } from '@sinclair/typebox'; import { Static, Type } from '@sinclair/typebox';
const SchemaData = Type.Object({ const SchemaData = Type.Object({
user_id: Type.Union([Type.Number(), Type.String()]) user_id: Type.Number(),
target_id: Type.Union([Type.Number(), Type.String()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = Static<typeof SchemaData>;
@@ -13,6 +14,6 @@ export class FriendPoke extends GetPacketStatusDepends<Payload, void> {
override payloadSchema = SchemaData; override payloadSchema = SchemaData;
async _handle(payload: Payload) { async _handle(payload: Payload) {
await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id); await this.core.apis.PacketApi.pkt.operation.FriendPoke(payload.user_id, payload.target_id ? +payload.target_id : undefined);
} }
} }