Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 04:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(files): file data can be much more than buffer (#7238)

Browse Source
This commit is contained in:
ckohen
2022-01-11 03:29:48 -08:00
committed by GitHub
parent d8efba24e0
commit 86ab526d49
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rest/__tests__/REST.test.ts
View File

@@ -115,10 +115,10 @@ test('postFile empty', async () => {
}); });
}); });
test('postFile file', async () => { test('postFile file (string)', async () => {
expect( expect(
await api.post('/postFile', { await api.post('/postFile', {
files: [{ fileName: 'out.txt', rawBuffer: Buffer.from('Hello') }], files: [{ fileName: 'out.txt', fileData: 'Hello' }],
}), }),
).toStrictEqual({ ).toStrictEqual({
body: [ body: [
@@ -133,7 +133,7 @@ test('postFile file', async () => {
test('postFile file and JSON', async () => { test('postFile file and JSON', async () => {
expect( expect(
await api.post('/postFile', { await api.post('/postFile', {
files: [{ fileName: 'out.txt', rawBuffer: Buffer.from('Hello') }], files: [{ fileName: 'out.txt', fileData: Buffer.from('Hello') }],
body: { foo: 'bar' }, body: { foo: 'bar' },
}), }),
).toStrictEqual({ ).toStrictEqual({
@@ -153,8 +153,8 @@ test('postFile files and JSON', async () => {
expect( expect(
await api.post('/postFile', { await api.post('/postFile', {
files: [ files: [
{ fileName: 'out.txt', rawBuffer: Buffer.from('Hello') }, { fileName: 'out.txt', fileData: Buffer.from('Hello') },
{ fileName: 'out.txt', rawBuffer: Buffer.from('Hi') }, { fileName: 'out.txt', fileData: Buffer.from('Hi') },
], ],
body: { files: [{ id: 0, description: 'test' }] }, body: { files: [{ id: 0, description: 'test' }] },
}), }),
@@ -178,7 +178,7 @@ test('postFile files and JSON', async () => {
test('postFile sticker and JSON', async () => { test('postFile sticker and JSON', async () => {
expect( expect(
await api.post('/postFile', { await api.post('/postFile', {
files: [{ key: 'file', fileName: 'sticker.png', rawBuffer: Buffer.from('Sticker') }], files: [{ key: 'file', fileName: 'sticker.png', fileData: Buffer.from('Sticker') }],
body: { foo: 'bar' }, body: { foo: 'bar' },
appendToFormData: true, appendToFormData: true,
}), }),

4
packages/rest/src/lib/RequestManager.ts
View File

@@ -28,7 +28,7 @@ export interface RawFile {
/** /**
* The actual data for the file * The actual data for the file
*/ */
rawBuffer: Buffer; fileData: string | number | boolean | Buffer;
} }
/** /**
@@ -280,7 +280,7 @@ export class RequestManager extends EventEmitter {
// Attach all files to the request // Attach all files to the request
for (const [index, file] of request.files.entries()) { for (const [index, file] of request.files.entries()) {
formData.append(file.key ?? `files[${index}]`, file.rawBuffer, file.fileName); formData.append(file.key ?? `files[${index}]`, file.fileData, file.fileName);
} }
// If a JSON body was added as well, attach it to the form data, using payload_json unless otherwise specified // If a JSON body was added as well, attach it to the form data, using payload_json unless otherwise specified