From 46ec3f716880a18c88e1fd15bf90b3e4ba185bc6 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Thu, 7 Jan 2021 17:11:01 +0900
Subject: fix: normalize url and thumbnail response

---
 src/api/routes/uploads/uploadPOST.js | 7 +++++--
 src/api/utils/Util.js                | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/api')

diff --git a/src/api/routes/uploads/uploadPOST.js b/src/api/routes/uploads/uploadPOST.js
index 6d81221..bba7989 100644
--- a/src/api/routes/uploads/uploadPOST.js
+++ b/src/api/routes/uploads/uploadPOST.js
@@ -277,15 +277,18 @@ class uploadPOST extends Route {
 		if (!result) return;
 
 		if (albumId) await Util.saveFileToAlbum(db, albumId, result.id);
+
+		result.file = Util.constructFilePublicLink(result.file);
 		result.deleteUrl = `${process.env.DOMAIN}/api/file/${result.id[0]}`;
 
 		return res.status(201).send({
 			message: 'Sucessfully uploaded the file.',
-			url: result.url,
+			url: result.file.url,
 			name: result.file.name,
 			hash: result.file.hash,
 			deleteUrl: result.deleteUrl,
-			size: result.file.size
+			size: result.file.size,
+			thumb: result.file.thumb
 		});
 	}
 }
diff --git a/src/api/utils/Util.js b/src/api/utils/Util.js
index 2b8a722..ae13eb5 100644
--- a/src/api/utils/Util.js
+++ b/src/api/utils/Util.js
@@ -214,7 +214,8 @@ class Util {
 			name: exists.name,
 			hash: exists.hash,
 			size: exists.size,
-			url: `${process.env.DOMAIN}/${exists.name}`,
+			url: exists.url,
+			thumb: exists.thumb,
 			deleteUrl: `${process.env.DOMAIN}/api/file/${exists.id}`,
 			repeated: true
 		});
-- 
cgit v1.2.3