#882

2 files changed, 4 insertions, 4 deletions

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index e1baf08191..a96906d291 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -13,13 +13,13 @@ import { Duplex } from 'stream';
 
 const log = debug('misskey:register-drive-file');
 
-const addToGridFS = (name, binary, metadata): Promise<any> => new Promise(async (resolve, reject) => {
+const addToGridFS = (name, binary, type, metadata): Promise<any> => new Promise(async (resolve, reject) => {
 	const dataStream = new Duplex();
 	dataStream.push(binary);
 	dataStream.push(null);
 
 	const bucket = await getGridFSBucket();
-	const writeStream = bucket.openUploadStream(name, { metadata });
+	const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
 	writeStream.once('finish', (doc) => { resolve(doc); });
 	writeStream.on('error', reject);
 	dataStream.pipe(writeStream);
@@ -144,10 +144,9 @@ export default (
 	}
 
 	// Create DriveFile document
-	const file = await addToGridFS(name, data, {
+	const file = await addToGridFS(name, data, mime, {
 		user_id: user._id,
 		folder_id: folder !== null ? folder._id : null,
-		type: mime,
 		comment: comment,
 		properties: properties
 	});
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 57b74cd975..3b76979a44 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -48,6 +48,7 @@ export default (
 	_target.id = _file._id;
 	_target.created_at = _file.uploadDate;
 	_target.name = _file.filename;
+	_target.type = _file.contentType;
 
 	_target = Object.assign(_target, _file.metadata);