Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(files): remove redundant file property names (#7340)

Browse Source
This commit is contained in:
ckohen
2022-01-25 06:35:04 -08:00
committed by GitHub
parent 5ccdb0ab26
commit 67250382f9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -17,7 +17,7 @@ export interface RawFile {
/**
* The name of the file
*/
fileName: string;
name: string;
/**
* An explicit key to use for key of the formdata field for this file.
* When not provided, the index of the file in the files array is used in the form `files[${index}]`.
@@ -27,7 +27,7 @@ export interface RawFile {
/**
* The actual data for the file
*/
fileData: string | number | boolean | Buffer;
data: string | number | boolean | Buffer;
}
/**
@@ -366,7 +366,7 @@ export class RequestManager extends EventEmitter {
// Attach all files to the request
for (const [index, file] of request.files.entries()) {
formData.append(file.key ?? `files[${index}]`, file.fileData, file.fileName);
formData.append(file.key ?? `files[${index}]`, file.data, file.name);
}
// If a JSON body was added as well, attach it to the form data, using payload_json unless otherwise specified