Clean up

esek · Aug 17, 2022 · 49c067c · 49c067c
1 parent 941ba59
commit 49c067c
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/src/routes/file.routes.ts b/src/routes/file.routes.ts
@@ -56,9 +56,7 @@ filesRoute.post('/upload', upload(), verifyAuthenticated, async (req, res) => {
   // Check file size (file.size is in bytes)
   const maxSize = config.FILES.MAX_FILE_UPLOAD_SIZE_BYTES;
   if (file.size > maxSize) {
-    return res
-      .status(400)
-      .send(`File too big, max is ${maxSize / BYTES_PER_MB} MB`);
+    return res.status(400).send(`File too big, max is ${maxSize / BYTES_PER_MB} MB`);
   }
 
   const accessType = body?.accessType ?? AccessType.Public;
@@ -81,14 +79,9 @@ filesRoute.post('/upload/avatar', upload(), verifyAuthenticated, async (req, res
   // Check if file is too big (file.size is in bytes)
   const maxAvatarSize = config.FILES.MAX_AVATAR_SIZE_BYTES;
   const maxSize = config.FILES.MAX_FILE_UPLOAD_SIZE_BYTES;
-  if (file.size > maxAvatarSize || file.size > maxSize) {
-    return res
-      .status(400)
-      .send(
-        `Avatar too big, max is ${
-          (maxAvatarSize > maxSize ? maxSize : maxAvatarSize) / BYTES_PER_MB
-        } MB`,
-      );
+  const sizeConstraint = Math.min(maxAvatarSize, maxSize);
+  if (file.size > sizeConstraint) {
+    return res.status(400).send(`Avatar too big, max is ${sizeConstraint / BYTES_PER_MB} MB`);
   }
 
   const { user } = res.locals;