diff --git a/packages/onebot/src/event-converter/to-notice.ts b/packages/onebot/src/event-converter/to-notice.ts index b66899f1..a5e0788d 100644 --- a/packages/onebot/src/event-converter/to-notice.ts +++ b/packages/onebot/src/event-converter/to-notice.ts @@ -32,10 +32,15 @@ export function convertGroupMemberJoin(ctx: ConverterContext, event: GroupMember export function convertGroupMemberLeave(ctx: ConverterContext, event: GroupMemberLeave): JsonObject { let subType: string; - if (event.isKick) { - subType = event.userUin === ctx.selfId ? 'kick_me' : 'kick'; - } else { - subType = 'leave'; + switch (event.leaveType) { + case 'disband': + subType = 'disband'; + break; + case 'kick': + subType = event.userUin === ctx.selfId ? 'kick_me' : 'kick'; + break; + default: + subType = 'leave'; } return { time: event.time, diff --git a/packages/onebot/tests/event-converter.test.ts b/packages/onebot/tests/event-converter.test.ts index 5269da2b..c3618047 100644 --- a/packages/onebot/tests/event-converter.test.ts +++ b/packages/onebot/tests/event-converter.test.ts @@ -144,27 +144,34 @@ describe('convertEvent — notice kinds', () => { expect(invite!.sub_type).toBe('invite'); }); - it('group_member_leave: leave / kick / kick_me', async () => { + it('group_member_leave: leave / kick / kick_me / disband', async () => { const leave = await convertEvent(bareCtx(), { kind: 'group_member_leave', time: 1, selfUin: SELF_ID, groupId: GROUP_ID, - userUin: PEER_UIN, operatorUin: 0, isKick: false, + userUin: PEER_UIN, operatorUin: 0, leaveType: 'leave', } as QQEventVariant); expect(leave!.sub_type).toBe('leave'); const kick = await convertEvent(bareCtx(), { kind: 'group_member_leave', time: 1, selfUin: SELF_ID, groupId: GROUP_ID, - userUin: PEER_UIN, operatorUin: 33333, isKick: true, + userUin: PEER_UIN, operatorUin: 33333, leaveType: 'kick', } as QQEventVariant); expect(kick!.sub_type).toBe('kick'); const kickMe = await convertEvent(bareCtx(), { kind: 'group_member_leave', time: 1, selfUin: SELF_ID, groupId: GROUP_ID, - userUin: SELF_ID, operatorUin: 33333, isKick: true, + userUin: SELF_ID, operatorUin: 33333, leaveType: 'kick', } as QQEventVariant); expect(kickMe!.sub_type).toBe('kick_me'); + + const disband = await convertEvent(bareCtx(), { + kind: 'group_member_leave', + time: 1, selfUin: SELF_ID, groupId: GROUP_ID, + userUin: SELF_ID, operatorUin: 33333, leaveType: 'disband', + } as QQEventVariant); + expect(disband!.sub_type).toBe('disband'); }); it('group_mute: ban vs lift_ban driven by duration', async () => { diff --git a/packages/protocol/src/events.ts b/packages/protocol/src/events.ts index 8eada526..948d8308 100644 --- a/packages/protocol/src/events.ts +++ b/packages/protocol/src/events.ts @@ -153,7 +153,12 @@ export interface GroupMemberLeave extends QQEvent { operatorUin: number; userUid?: string; operatorUid?: string; - isKick: boolean; + /** + * Protocol-level reason the member left, derived from + * GroupChange.decreaseType. `kick` is split into kick / kick_me + * downstream (OneBot converter) by comparing against selfId. + */ + leaveType: 'leave' | 'kick' | 'disband'; } export interface GroupMuteEvent extends QQEvent { diff --git a/packages/protocol/src/format.ts b/packages/protocol/src/format.ts index f6f641e3..04d53ed0 100644 --- a/packages/protocol/src/format.ts +++ b/packages/protocol/src/format.ts @@ -182,8 +182,10 @@ export function formatEvent(identity: IdentityService, event: QQEventVariant): s return `私聊撤回 ${formatUser(identity, undefined, event.userUin)} 撤回了消息`; case 'group_member_join': return `入群 ${formatUser(identity, event.groupId, event.userUin, event.userUid)} 加入 ${formatGroup(identity, event.groupId)}`; - case 'group_member_leave': - return `退群 ${formatUser(identity, event.groupId, event.userUin, event.userUid)} ${event.isKick ? '被踢出' : '退出'} ${formatGroup(identity, event.groupId)}`; + case 'group_member_leave': { + const leaveAction = event.leaveType === 'disband' ? '随群解散' : event.leaveType === 'kick' ? '被踢出' : '退出'; + return `退群 ${formatUser(identity, event.groupId, event.userUin, event.userUid)} ${leaveAction} ${formatGroup(identity, event.groupId)}`; + } case 'group_mute': return `禁言 ${formatGroup(identity, event.groupId)} | ${formatUser(identity, event.groupId, event.userUin)} ${event.duration}秒`; case 'group_admin': diff --git a/packages/protocol/src/msg-push/decoders/group-member-change.ts b/packages/protocol/src/msg-push/decoders/group-member-change.ts index e9aa3736..12d11391 100644 --- a/packages/protocol/src/msg-push/decoders/group-member-change.ts +++ b/packages/protocol/src/msg-push/decoders/group-member-change.ts @@ -23,6 +23,26 @@ export const decodeGroupMemberJoin: MsgPushDecoder = (ctx) => { return [ev]; }; +// QQ's GroupChange.decreaseType (proto field 4) on a member-decrease push: +// 3 → the bot itself was kicked +// 129 → the group was disbanded +// 130 → voluntary leave +// 131 → another member was kicked +// 0 / absent → treat as voluntary leave (defensive default) +// The kick → kick_me distinction (was it us?) is decided downstream in the +// OneBot converter via selfId; here we only resolve the protocol-level reason. +function leaveTypeFromDecreaseType(dt: number): GroupMemberLeave['leaveType'] { + switch (dt) { + case 129: + return 'disband'; + case 0: + case 130: + return 'leave'; + default: + return 'kick'; + } +} + export const decodeGroupMemberLeave: MsgPushDecoder = (ctx) => { const change = protobuf_decode(ctx.content); if (!change) return []; @@ -39,7 +59,7 @@ export const decodeGroupMemberLeave: MsgPushDecoder = (ctx) => { operatorUin: resolveUidToUin(ctx.identity, groupId, operatorUid, 0), userUid, operatorUid, - isKick: dt !== 0 && dt !== 130, + leaveType: leaveTypeFromDecreaseType(dt), }; return [ev]; };