diff --git a/packages/sdk/src/messages/chain.ts b/packages/sdk/src/messages/chain.ts index 607d4c41..20dc8fd3 100644 --- a/packages/sdk/src/messages/chain.ts +++ b/packages/sdk/src/messages/chain.ts @@ -1,6 +1,7 @@ import type { AnyMessageSegment, ContactSegment, + FaceSegment, ImageSegment, JsonObject, LocationSegment, @@ -51,8 +52,8 @@ export class MessageChain implements MessageC return this.text('\n'); } - face(id: number | string): MessageChain { - return this.addSegment(segments.face(id)); + face(id: number | string, options: Omit = {}): MessageChain { + return this.addSegment(segments.face(id, options)); } at(qq: number | 'all', options: { name?: string; uid?: string } = {}): MessageChain { @@ -203,8 +204,8 @@ export function br(): MessageChain { return chain().br(); } -export function face(id: number | string): MessageChain { - return chain().face(id); +export function face(id: number | string, options: Omit = {}): MessageChain { + return chain().face(id, options); } export function at(qq: number | 'all', options: { name?: string; uid?: string } = {}): MessageChain { diff --git a/packages/sdk/src/messages/cq.ts b/packages/sdk/src/messages/cq.ts index 0e47ecba..03c7b060 100644 --- a/packages/sdk/src/messages/cq.ts +++ b/packages/sdk/src/messages/cq.ts @@ -70,7 +70,10 @@ function segmentFromCq(type: string, data: Record): AnyMessageSe case 'text': return segments.text(data.text ?? ''); case 'face': - return segments.face(data.id ?? '0'); + if (data.large === undefined) return segments.face(data.id ?? '0'); + if (data.large === 'true' || data.large === '1') return segments.face(data.id ?? '0', { large: true }); + if (data.large === 'false' || data.large === '0') return segments.face(data.id ?? '0', { large: false }); + throw new Error('face.large must be true, false, 1, or 0'); case 'at': if (data.qq === 'all') return segments.at('all'); { diff --git a/packages/sdk/src/messages/segments.ts b/packages/sdk/src/messages/segments.ts index ad3ac16b..e3f3020a 100644 --- a/packages/sdk/src/messages/segments.ts +++ b/packages/sdk/src/messages/segments.ts @@ -29,8 +29,8 @@ export const segments = { return seg('text', { text }); }, - face(id: number | string): FaceSegment { - return seg('face', { id: String(id) }); + face(id: number | string, options: Omit = {}): FaceSegment { + return seg('face', { id: String(id), ...options }); }, at(qq: number | 'all', options: { name?: string; uid?: string } = {}): AtSegment { diff --git a/packages/sdk/src/types/messages.ts b/packages/sdk/src/types/messages.ts index 9ef837b9..6a62bbd7 100644 --- a/packages/sdk/src/types/messages.ts +++ b/packages/sdk/src/types/messages.ts @@ -9,7 +9,7 @@ export interface MessageSegment< } export type TextSegment = MessageSegment<'text', { text: string }>; -export type FaceSegment = MessageSegment<'face', { id: string }>; +export type FaceSegment = MessageSegment<'face', { id: string; large?: boolean }>; export type AtSegment = MessageSegment<'at', { qq: string; name?: string; uid?: string }>; export type ReplySegment = MessageSegment<'reply', { id: string }>; export type ImageSegment = MessageSegment<'image', { diff --git a/packages/sdk/tests/messages.test.ts b/packages/sdk/tests/messages.test.ts index 0749e4cb..a4541b21 100644 --- a/packages/sdk/tests/messages.test.ts +++ b/packages/sdk/tests/messages.test.ts @@ -1,6 +1,8 @@ import { describe, expect, it, vi } from 'vitest'; import { atAll, + chain, + face, fromCQString, message, parseSegments, @@ -9,6 +11,20 @@ import { } from '../src'; describe('MessageChain', () => { + it.each([false, true])('preserves face animation selection through builders and CQ, large=%s', (large) => { + const expected = [{ type: 'face', data: { id: '451', large } }]; + const built = face(451, { large }); + expect(built.toSegments()).toEqual(expected); + expect(chain().face(451, { large }).toSegments()).toEqual(expected); + expect(message.face(451, { large })).toEqual(expected[0]); + expect(parseSegments(toCQString(built))).toEqual(expected); + expect(parseSegments(`[CQ:face,id=451,large=${large ? 1 : 0}]`)).toEqual(expected); + }); + + it('rejects an invalid face animation choice instead of discarding it', () => { + expect(() => parseSegments('[CQ:face,id=451,large=invalid]')).toThrow('face.large'); + }); + it('builds fluent segment chains', () => { const chain = text('hello').at(10001).br().image('/tmp/a.png');