From 93290e4d0ce58e016a9a3c8068a4cfa4cde1cd74 Mon Sep 17 00:00:00 2001
From: DrSmoothl <1787882683@qq.com>
Date: Sat, 31 Oct 2026 23:25:45 +0800
Subject: [PATCH] fix(protocol): allow clearing group member cards

Refs #620
---
 packages/proto-defs/src/oidb-actions/base.ts  |  3 ++-
 .../group-admin/set-member-card.test.ts       | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/proto-defs/src/oidb-actions/base.ts b/packages/proto-defs/src/oidb-actions/base.ts
index cfeb91ba..a7547ba6 100644
--- a/packages/proto-defs/src/oidb-actions/base.ts
+++ b/packages/proto-defs/src/oidb-actions/base.ts
@@ -192,7 +192,8 @@ export interface OidbSetAdmin {
 //   dev/napcatQQInside/…/proto/oidb/Oidb.0x8FC_2.ts    (body=3, targetName=8)
 export interface OidbRenameMemberBody {
     targetUid?: pb<1, string>;
-    targetName?: pb<8, string>;
+    // Clearing a card requires sending an empty string in field 8 (#620).
+    targetName?: pb_optional<8, string>;
 }
 export interface OidbRenameMember {
     groupUin?: pb<1, uint_32>;
diff --git a/packages/protocol/tests/oidb-services/group-admin/set-member-card.test.ts b/packages/protocol/tests/oidb-services/group-admin/set-member-card.test.ts
index 0ec8db9a..d1d1c69e 100644
--- a/packages/protocol/tests/oidb-services/group-admin/set-member-card.test.ts
+++ b/packages/protocol/tests/oidb-services/group-admin/set-member-card.test.ts
@@ -1,10 +1,8 @@
 import { describe, expect, it, vi } from 'vitest';
-import { protobuf_decode } from '@snowluma/proton';
-import type { OidbBase } from '@snowluma/proto-defs/oidb';
-import type { OidbRenameMember } from '@snowluma/proto-defs/oidb-actions/base';
 import type { SendPacketResult } from '@snowluma/common/packet-sender';
 
 import { SetMemberCard } from '../../../src/oidb-services/group-admin/set-member-card';
+import { env, m, s, v } from '../_pb-oracle';
 
 function makeDeps() {
     const r: SendPacketResult = {
@@ -15,7 +13,7 @@ function makeDeps() {
         responseData: Buffer.alloc(0),
     };
     return {
-        sendRawPacket: vi.fn(async () => r),
+        sendRawPacket: vi.fn<SetMemberCard.Deps['sendRawPacket']>().mockResolvedValue(r),
         resolveUserUid: vi.fn(async () => 'resolved-uid'),
     };
 }
@@ -26,16 +24,15 @@ describe('SetMemberCard namespace', () => {
         expect(SetMemberCard.subCommand).toBe(3);
     });
 
-    it('routes to 0x8fc_3 with targetUid + targetName', async () => {
+    it.each(['', 'newCard', '群名片'])('sends card %j in field 8', async (card) => {
         const deps = makeDeps();
-        await SetMemberCard.invoke(deps, { groupId: 12345, userId: 67890, card: 'newCard' });
+        await SetMemberCard.invoke(deps, { groupId: 12345, userId: 67890, card });
         expect(deps.resolveUserUid).toHaveBeenCalledWith(67890, 12345);
         const [wire, bytes] = deps.sendRawPacket.mock.calls[0]!;
         expect(wire).toBe('OidbSvcTrpcTcp.0x8fc_3');
-        const env = protobuf_decode<OidbBase<OidbRenameMember>>(bytes);
-        expect(env.body).toMatchObject({
-            groupUin: 12345,
-            body: { targetUid: 'resolved-uid', targetName: 'newCard' },
-        });
+
+        const member = [...s(1, 'resolved-uid'), ...s(8, card)];
+        const body = [...v(1, 12345), ...m(3, member)];
+        expect(Buffer.from(bytes).toString('hex')).toBe(env(0x8fc, 3, body, false));
     });
 });