diff --git a/packages/mcp/src/generated/catalog.json b/packages/mcp/src/generated/catalog.json index 521b44ab..2b63ff4a 100644 --- a/packages/mcp/src/generated/catalog.json +++ b/packages/mcp/src/generated/catalog.json @@ -7421,7 +7421,7 @@ "name": "get_stranger_info", "aliases": [], "summary": "获取陌生人信息", - "returns": "用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级。", + "returns": "用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级与企点标志。", "returnsSchema": { "type": "object", "properties": { @@ -7481,6 +7481,18 @@ "customStatusDescInfo": { "type": "string", "description": "自定义状态说明" + }, + "qidian_master_flag": { + "type": "integer", + "description": "企点主号标志,0 或 1;普通账号为 0" + }, + "qidian_crew_flag": { + "type": "integer", + "description": "企点员工标志,0 或 1;普通账号为 0" + }, + "qidian_crew_flag_2": { + "type": "integer", + "description": "企点保留标志,0 或 1;普通账号为 0" } }, "required": [ diff --git a/packages/mcp/src/generated/catalog.ts b/packages/mcp/src/generated/catalog.ts index 1aaf8257..5b5209dd 100644 --- a/packages/mcp/src/generated/catalog.ts +++ b/packages/mcp/src/generated/catalog.ts @@ -7424,7 +7424,7 @@ export const ACTIONS: CatalogAction[] = [ "name": "get_stranger_info", "aliases": [], "summary": "获取陌生人信息", - "returns": "用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级。", + "returns": "用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级与企点标志。", "returnsSchema": { "type": "object", "properties": { @@ -7484,6 +7484,18 @@ export const ACTIONS: CatalogAction[] = [ "customStatusDescInfo": { "type": "string", "description": "自定义状态说明" + }, + "qidian_master_flag": { + "type": "integer", + "description": "企点主号标志,0 或 1;普通账号为 0" + }, + "qidian_crew_flag": { + "type": "integer", + "description": "企点员工标志,0 或 1;普通账号为 0" + }, + "qidian_crew_flag_2": { + "type": "integer", + "description": "企点保留标志,0 或 1;普通账号为 0" } }, "required": [ diff --git a/packages/onebot/src/actions/friend.ts b/packages/onebot/src/actions/friend.ts index 92e4a7b7..69e303c2 100644 --- a/packages/onebot/src/actions/friend.ts +++ b/packages/onebot/src/actions/friend.ts @@ -32,7 +32,7 @@ export const actions = [ name: 'get_stranger_info', summary: '获取陌生人信息', readOnly: true, - returns: '用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级。', + returns: '用户资料:QQ 号、昵称、好友备注、性别、年龄与个性签名,命中资料时另含等级与企点标志。', returnsSchema: { type: 'object', properties: { @@ -50,6 +50,9 @@ export const actions = [ batteryStatus: { type: 'integer', description: '电量状态' }, customStatus: { type: 'object', description: '自定义状态', nullable: true }, customStatusDescInfo: { type: 'string', description: '自定义状态说明' }, + qidian_master_flag: { type: 'integer', description: '企点主号标志,0 或 1;普通账号为 0' }, + qidian_crew_flag: { type: 'integer', description: '企点员工标志,0 或 1;普通账号为 0' }, + qidian_crew_flag_2: { type: 'integer', description: '企点保留标志,0 或 1;普通账号为 0' }, }, required: ['user_id', 'nickname', 'remark', 'sex', 'age', 'long_nick'], }, diff --git a/packages/onebot/src/modules/contact-actions.ts b/packages/onebot/src/modules/contact-actions.ts index c3d82572..373e1fd9 100644 --- a/packages/onebot/src/modules/contact-actions.ts +++ b/packages/onebot/src/modules/contact-actions.ts @@ -296,9 +296,9 @@ function formatStrangerInfo(p: UserProfileInfo): JsonObject { batteryStatus: p.batteryStatus ?? 0, customStatus: p.customStatus ?? null, customStatusDescInfo: p.customStatusDesc ?? '', - qidian_master_flag: p.qidianMasterFlag, - qidian_crew_flag: p.qidianCrewFlag, - qidian_crew_flag_2: p.qidianCrewFlag2, + qidian_master_flag: p.qidianMasterFlag ?? 0, + qidian_crew_flag: p.qidianCrewFlag ?? 0, + qidian_crew_flag_2: p.qidianCrewFlag2 ?? 0, }; } diff --git a/packages/onebot/tests/friend-actions.test.ts b/packages/onebot/tests/friend-actions.test.ts index b26885c0..910075d7 100644 --- a/packages/onebot/tests/friend-actions.test.ts +++ b/packages/onebot/tests/friend-actions.test.ts @@ -31,6 +31,9 @@ describe('get_stranger_info action', () => { properties: { remark: { type: 'string', description: '好友备注;非好友或未设置时为空字符串' }, long_nick: { type: 'string', description: '个性签名' }, + qidian_master_flag: { type: 'integer' }, + qidian_crew_flag: { type: 'integer' }, + qidian_crew_flag_2: { type: 'integer' }, }, }); expect(schema?.required).toContain('remark'); diff --git a/packages/onebot/tests/instance-context.test.ts b/packages/onebot/tests/instance-context.test.ts index f6f92120..ed0a20f7 100644 --- a/packages/onebot/tests/instance-context.test.ts +++ b/packages/onebot/tests/instance-context.test.ts @@ -817,6 +817,9 @@ describe('buildApiContext contact reads', () => { batteryStatus: 0, customStatus: null, customStatusDescInfo: '', + qidian_master_flag: 0, + qidian_crew_flag: 0, + qidian_crew_flag_2: 0, }); }); diff --git a/packages/protocol/tests/oidb-services/contacts/fetch-user-profile-by-uid.test.ts b/packages/protocol/tests/oidb-services/contacts/fetch-user-profile-by-uid.test.ts index 3100d552..49842dcb 100644 --- a/packages/protocol/tests/oidb-services/contacts/fetch-user-profile-by-uid.test.ts +++ b/packages/protocol/tests/oidb-services/contacts/fetch-user-profile-by-uid.test.ts @@ -46,6 +46,41 @@ describe('FetchUserProfileByUid namespace (UID form)', () => { const keys = env.body?.keys?.map(k => k.key); expect(keys).toContain(20002); // nickname — the whole point expect(keys).toContain(105); // QQ level + expect(keys).toContain(40410); + expect(keys).toContain(42031); + }); + + it('decodes qidian flags from number-properties (0 when absent)', async () => { + const qidian = makeSender({ + body: { + uin: 3004251964, uid: 'u', + properties: { + bytesProperties: [], + numberProperties: [ + { number1: 40410, number2: 1 }, + { number1: 42031, number2: 1 }, + ], + }, + } as any, + }); + const out = await FetchUserProfileByUid.invoke(qidian, { uid: 'u' }); + expect(out.qidianMasterFlag).toBe(1); + expect(out.qidianCrewFlag).toBe(1); + expect(out.qidianCrewFlag2).toBe(0); + + const normal = makeSender({ + body: { + uin: 10001, uid: 'u', + properties: { + bytesProperties: [], + numberProperties: [{ number1: 20009, number2: 1 }], + }, + } as any, + }); + const out2 = await FetchUserProfileByUid.invoke(normal, { uid: 'u' }); + expect(out2.qidianMasterFlag).toBe(0); + expect(out2.qidianCrewFlag).toBe(0); + expect(out2.qidianCrewFlag2).toBe(0); }); it('decodes nickname + uin from the response so the pipeline can fill them into the event', async () => { diff --git a/packages/protocol/tests/packet-pipeline-roster-refresh.test.ts b/packages/protocol/tests/packet-pipeline-roster-refresh.test.ts index dd1ce164..d5191964 100644 --- a/packages/protocol/tests/packet-pipeline-roster-refresh.test.ts +++ b/packages/protocol/tests/packet-pipeline-roster-refresh.test.ts @@ -16,7 +16,10 @@ afterEach(() => { }); function makeProfile(uin: number, uid = ''): UserProfileInfo { - return { uin, uid, nickname: '', remark: '', qid: '', sex: 'unknown', age: 0, sign: '', avatar: '', level: 0 }; + return { + uin, uid, nickname: '', remark: '', qid: '', sex: 'unknown', age: 0, sign: '', avatar: '', level: 0, + qidianMasterFlag: 0, qidianCrewFlag: 0, qidianCrewFlag2: 0, + }; } function makeMember(uin: number, uid: string): GroupMemberInfo { diff --git a/packages/protocol/tests/packet-pipeline-stranger-resolve.test.ts b/packages/protocol/tests/packet-pipeline-stranger-resolve.test.ts index 77a3e440..93c9ecdc 100644 --- a/packages/protocol/tests/packet-pipeline-stranger-resolve.test.ts +++ b/packages/protocol/tests/packet-pipeline-stranger-resolve.test.ts @@ -17,7 +17,10 @@ import type { GroupMemberInfo, QQGroupInfo, UserProfileInfo } from '@snowluma/pr import type { PacketInfo } from '@snowluma/common/protocol-types'; function makeProfile(uin: number, uid = '', nickname = ''): UserProfileInfo { - return { uin, uid, nickname, remark: '', qid: '', sex: 'unknown', age: 0, sign: '', avatar: '', level: 0 }; + return { + uin, uid, nickname, remark: '', qid: '', sex: 'unknown', age: 0, sign: '', avatar: '', level: 0, + qidianMasterFlag: 0, qidianCrewFlag: 0, qidianCrewFlag2: 0, + }; } function makePipeline(opts: { diff --git a/packages/protocol/tests/packet-pipeline-trace.test.ts b/packages/protocol/tests/packet-pipeline-trace.test.ts index 5e5f3420..b565abb5 100644 --- a/packages/protocol/tests/packet-pipeline-trace.test.ts +++ b/packages/protocol/tests/packet-pipeline-trace.test.ts @@ -76,7 +76,11 @@ function msgPushContext( function makePipeline(opts: { fetchGroupList?: () => Promise; fetchGroupMemberList?: (groupId: number) => Promise; - fetchProfileByUid?: () => Promise<{ uin: number; uid: string; nickname: string; remark: string; qid: string; sex: string; age: number; sign: string; avatar: string; level: number }>; + fetchProfileByUid?: () => Promise<{ + uin: number; uid: string; nickname: string; remark: string; qid: string; + sex: string; age: number; sign: string; avatar: string; level: number; + qidianMasterFlag: number; qidianCrewFlag: number; qidianCrewFlag2: number; + }>; } = {}) { const identity = IdentityService.memory('10001'); if (opts.fetchProfileByUid) { @@ -84,6 +88,7 @@ function makePipeline(opts: { fetchProfile: async () => ({ uin: 0, uid: '', nickname: '', remark: '', qid: '', sex: 'unknown', age: 0, sign: '', avatar: '', level: 0, + qidianMasterFlag: 0, qidianCrewFlag: 0, qidianCrewFlag2: 0, }), fetchProfileByUid: opts.fetchProfileByUid, }); @@ -327,6 +332,9 @@ describe('IncomingPacketPipeline TRACE lifecycle', () => { sign: '', avatar: '', level: 0, + qidianMasterFlag: 0, + qidianCrewFlag: 0, + qidianCrewFlag2: 0, }; }, });