Merge branch 'master' into aarav_edit

1 files changed, 6 insertions, 8 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index a2747257a..ed109d8f7 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -450,14 +450,12 @@ export namespace DashUploadUtils {
      * 3) the size of the image, in bytes (4432130)
      * 4) the content type of the image, i.e. image/(jpeg | png | ...)
      */
-    export const UploadImage = async (source: string, filename?: string, prefix: string = ''): Promise<Upload.ImageInformation | Error> => {
-        const result = await InspectImage(source);
-        if (result instanceof Error) {
-            return { name: result.name, message: result.message };
-        }
-        const outputFile = filename || result.filename || '';
-        return UploadInspectedImage(result, outputFile, prefix, isLocal().exec(source) || source.startsWith('data:') ? true : false);
-    };
+    export const UploadImage = (source: string, filename?: string, prefix: string = ''): Promise<Upload.ImageInformation | Error> =>
+        InspectImage(source).then(async result =>
+            result instanceof Error
+                ? ({ name: result.name, message: result.message } as Error) //
+                : UploadInspectedImage(result, filename || result.filename || '', prefix, isLocal().exec(source) || source.startsWith('data:') ? true : false)
+        );
 
     type md5 = 'md5';
     type falsetype = false;