Refactor

1 files changed, 6 insertions, 23 deletions

diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index 2653eba655..3c334a7c1f 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -1,10 +1,8 @@
-import * as fs from 'fs';
 const ms = require('ms');
 import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
 import { validateFileName, pack } from '../../../../../models/drive-file';
 import create from '../../../../../services/drive/add-file';
-import { ILocalUser } from '../../../../../models/user';
-import getParams from '../../../get-params';
+import define from '../../../define';
 
 export const meta = {
 	desc: {
@@ -52,11 +50,7 @@ export const meta = {
 	}
 };
 
-export default async (file: any, params: any, user: ILocalUser): Promise<any> => {
-	if (file == null) {
-		throw 'file is required';
-	}
-
+export default define(meta, (ps, user, app, file, cleanup) => new Promise(async (res, rej) => {
 	// Get 'name' parameter
 	let name = file.originalname;
 	if (name !== undefined && name !== null) {
@@ -66,35 +60,24 @@ export default async (file: any, params: any, user: ILocalUser): Promise<any> =>
 		} else if (name === 'blob') {
 			name = null;
 		} else if (!validateFileName(name)) {
-			throw 'invalid name';
+			return rej('invalid name');
 		}
 	} else {
 		name = null;
 	}
 
-	function cleanup() {
-		fs.unlink(file.path, () => {});
-	}
-
-	const [ps, psErr] = getParams(meta, params);
-	if (psErr) {
-		cleanup();
-		throw psErr;
-	}
-
 	try {
 		// Create file
 		const driveFile = await create(user, file.path, name, null, ps.folderId, ps.force, false, null, null, ps.isSensitive);
 
 		cleanup();
 
-		// Serialize
-		return pack(driveFile);
+		res(pack(driveFile));
 	} catch (e) {
 		console.error(e);
 
 		cleanup();
 
-		throw e;
+		rej(e);
 	}
-};
+}));