Merge branch 'master' into aarav_edit

1 files changed, 2 insertions, 5 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index ed109d8f7..f76371b0d 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -221,9 +221,7 @@ export namespace DashUploadUtils {
     const parseExifData = async (source: string) => {
         const image = await request.get(source, { encoding: null });
         const { /* data, */ error } = await new Promise<{ data: ExifData; error: string | undefined }>(resolve => {
-            new ExifImage({ image }, (exifError, data) => {
-                resolve({ data, error: exifError?.message });
-            });
+            new ExifImage({ image }, (exifError, data) => resolve({ data, error: exifError?.message }));
         });
         return error ? { data: undefined, error } : { data: await exifr.parse(image), error };
     };
@@ -295,7 +293,7 @@ export namespace DashUploadUtils {
 
         try {
             // Compute the native width and height ofthe image with an npm module
-            const { width: nativeWidth, height: nativeHeight } = await requestImageSize(resolvedUrl);
+            const { width: nativeWidth, height: nativeHeight } = await requestImageSize(resolvedUrl).catch(() => ({ width: 0, height: 0 }));
             // Bundle up the information into an object
             return {
                 source,
@@ -307,7 +305,6 @@ export namespace DashUploadUtils {
                 ...results,
             };
         } catch (e: unknown) {
-            console.log(e);
             return new Error(e ? e.toString?.() : 'unkown error');
         }
     };