merged with new version of master

1 files changed, 14 insertions, 12 deletions

diff --git a/src/client/util/request-image-size.ts b/src/client/util/request-image-size.ts
index 57e8516ac..0f98a2710 100644
--- a/src/client/util/request-image-size.ts
+++ b/src/client/util/request-image-size.ts
@@ -14,19 +14,17 @@ const imageSize = require('image-size');
 const HttpError = require('standard-http-error');
 
 module.exports = function requestImageSize(options: any) {
-    let opts = {
+    let opts: any = {
         encoding: null,
     };
 
     if (options && typeof options === 'object') {
         opts = Object.assign(options, opts);
     } else if (options && typeof options === 'string') {
-        opts = Object.assign(
-            {
-                uri: options,
-            },
-            opts
-        );
+        opts = {
+            uri: options,
+            ...opts,
+        };
     } else {
         return Promise.reject(new Error('You should provide an URI string or a "request" options object.'));
     }
@@ -38,7 +36,8 @@ module.exports = function requestImageSize(options: any) {
 
         req.on('response', (res: any) => {
             if (res.statusCode >= 400) {
-                return reject(new HttpError(res.statusCode, res.statusMessage));
+                reject(new HttpError(res.statusCode, res.statusMessage));
+                return;
             }
 
             let buffer = Buffer.from([]);
@@ -51,20 +50,23 @@ module.exports = function requestImageSize(options: any) {
                     size = imageSize(buffer);
                     if (size) {
                         resolve(size);
-                        return req.abort();
+                        req.abort();
                     }
-                } catch (err) {}
+                } catch (err) {
+                    /* empty */
+                }
             });
 
             res.on('error', reject);
 
             res.on('end', () => {
                 if (!size) {
-                    return reject(new Error('Image has no size'));
+                    reject(new Error('Image has no size'));
+                    return;
                 }
 
                 size.downloaded = buffer.length;
-                return resolve(size);
+                resolve(size);
             });
         });