diff --git a/packages/onebot/src/actions/extended.ts b/packages/onebot/src/actions/extended.ts index d5216e42..7959a237 100644 --- a/packages/onebot/src/actions/extended.ts +++ b/packages/onebot/src/actions/extended.ts @@ -82,18 +82,30 @@ function essenceContentToSegment(content: GroupEssenceContent): JsonObject { url: essenceString(content.image_url, 'msg_content.image_url', false), }, }; - case 4: + case 4: { + const fileName = essenceString(content.file_name, 'msg_content.file_name', false); + const fileId = essenceString(content.file_id, 'msg_content.file_id', false); + const fileSize = essenceNonNegativeNumber( + content.file_size, + 'msg_content.file_size', + ); + const busId = essenceNonNegativeNumber( + content.file_bus_id, + 'msg_content.file_bus_id', + ); return { - type: 'video', + type: 'file', data: { - file: '', - url: essenceString( - content.file_thumbnail_url, - 'msg_content.file_thumbnail_url', - false, - ), + file: fileName, + file_id: fileId, + file_size: fileSize, + name: fileName, + id: fileId, + size: fileSize, + busid: busId, }, }; + } default: throw new Error(`unsupported group essence content type: ${content.msg_type}`); } diff --git a/packages/onebot/tests/extended-actions.test.ts b/packages/onebot/tests/extended-actions.test.ts index ec63f2e0..dd8c2c2d 100644 --- a/packages/onebot/tests/extended-actions.test.ts +++ b/packages/onebot/tests/extended-actions.test.ts @@ -277,6 +277,21 @@ describe('extended-actions / get_essence_msg_list', () => { }); it('converts every documented digest content type into OneBot segments', async () => { + const plainFile = { + msg_type: 4, + file_name: 'notes.txt', + file_bus_id: 102, + file_id: 'plain-file-id', + file_size: '1234', + }; + const previewableFile = { + msg_type: 4, + file_name: 'clip.mp4', + file_bus_id: 102, + file_id: 'video-file-id', + file_thumbnail_url: 'https://example.test/video.jpg', + file_size: '5678', + }; const getEssenceAll = vi.fn(async () => [{ retcode: 0, data: { @@ -285,7 +300,8 @@ describe('extended-actions / get_essence_msg_list', () => { msg_content: [ { msg_type: 2, face_index: 66 }, { msg_type: 3, image_url: 'https://example.test/image.jpg' }, - { msg_type: 4, file_thumbnail_url: 'https://example.test/video.jpg' }, + plainFile, + previewableFile, ], })], }, @@ -299,7 +315,30 @@ describe('extended-actions / get_essence_msg_list', () => { expect((response.data as JsonObject[])[0]?.content).toEqual([ { type: 'face', data: { id: '66' } }, { type: 'image', data: { file: '', url: 'https://example.test/image.jpg' } }, - { type: 'video', data: { file: '', url: 'https://example.test/video.jpg' } }, + { + type: 'file', + data: { + file: 'notes.txt', + file_id: 'plain-file-id', + file_size: 1234, + name: 'notes.txt', + id: 'plain-file-id', + size: 1234, + busid: 102, + }, + }, + { + type: 'file', + data: { + file: 'clip.mp4', + file_id: 'video-file-id', + file_size: 5678, + name: 'clip.mp4', + id: 'video-file-id', + size: 5678, + busid: 102, + }, + }, ]); }); @@ -496,7 +535,30 @@ describe('extended-actions / get_essence_msg_list', () => { [{ msg_type: 1 }, 'msg_content.text'], [{ msg_type: 2 }, 'msg_content.face_index'], [{ msg_type: 3 }, 'msg_content.image_url'], - [{ msg_type: 4 }, 'msg_content.file_thumbnail_url'], + [{ + msg_type: 4, + file_bus_id: 102, + file_id: 'file-id', + file_size: '1', + }, 'msg_content.file_name'], + [{ + msg_type: 4, + file_name: 'file.txt', + file_bus_id: 102, + file_size: '1', + }, 'msg_content.file_id'], + [{ + msg_type: 4, + file_name: 'file.txt', + file_bus_id: 102, + file_id: 'file-id', + }, 'msg_content.file_size'], + [{ + msg_type: 4, + file_name: 'file.txt', + file_id: 'file-id', + file_size: '1', + }, 'msg_content.file_bus_id'], ])('rejects digest content missing its required field: %s', async (content, field) => { const getEssenceAll = vi.fn(async () => [{ retcode: 0, @@ -521,6 +583,43 @@ describe('extended-actions / get_essence_msg_list', () => { expect(cacheMessageMetas).not.toHaveBeenCalled(); }); + it.each([ + [{ + msg_type: 4, + file_name: 'file.txt', + file_bus_id: 102, + file_id: 'file-id', + file_size: '-1', + }, 'msg_content.file_size'], + [{ + msg_type: 4, + file_name: 'file.txt', + file_bus_id: 'not-a-number', + file_id: 'file-id', + file_size: '1', + }, 'msg_content.file_bus_id'], + ])('rejects digest content with an invalid file field: %s', async (content, field) => { + const getEssenceAll = vi.fn(async () => [{ + retcode: 0, + data: { + is_end: true, + msg_list: [fakeEssenceMessage({ msg_content: [content] })], + }, + }]); + const bridge = fakeBridge({ apis: { web: { getEssenceAll } } }); + const cacheMessageMetas = vi.fn(); + + const response = await makeHandler(fakeCtx(bridge, { cacheMessageMetas })) + .handle('get_essence_msg_list', { group_id: 123456789 }); + + expect(response).toMatchObject({ + status: 'failed', + retcode: 100, + wording: expect.stringContaining(field), + }); + expect(cacheMessageMetas).not.toHaveBeenCalled(); + }); + it('rejects blank numeric fields instead of coercing them to zero', async () => { const getEssenceAll = vi.fn(async () => [{ retcode: 0, diff --git a/packages/protocol/src/web/group-essence.ts b/packages/protocol/src/web/group-essence.ts index 190f84b4..0a34f24d 100644 --- a/packages/protocol/src/web/group-essence.ts +++ b/packages/protocol/src/web/group-essence.ts @@ -9,7 +9,11 @@ export interface GroupEssenceContent { text?: string; face_index?: number; image_url?: string; + file_name?: string; + file_bus_id?: number | string; + file_id?: string; file_thumbnail_url?: string; + file_size?: number | string; } export interface GroupEssenceMessage {