From 67250382f99872a9edff99ebaa482ffa895b0c37 Mon Sep 17 00:00:00 2001
From: ckohen <chaikohen@gmail.com>
Date: Tue, 25 Jan 2022 06:35:04 -0800
Subject: [PATCH] refactor(files): remove redundant file property names (#7340)

---
 packages/rest/__tests__/REST.test.ts    | 10 +++++-----
 packages/rest/src/lib/RequestManager.ts |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/rest/__tests__/REST.test.ts b/packages/rest/__tests__/REST.test.ts
index 05bd36f5bd5b..e72a1f16fbae 100644
--- a/packages/rest/__tests__/REST.test.ts
+++ b/packages/rest/__tests__/REST.test.ts
@@ -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,
 		}),
diff --git a/packages/rest/src/lib/RequestManager.ts b/packages/rest/src/lib/RequestManager.ts
index 2bb4c7ed892c..ecb664121da0 100644
--- a/packages/rest/src/lib/RequestManager.ts
+++ b/packages/rest/src/lib/RequestManager.ts
@@ -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