Removed all remaining bluebird catch predicates

refs: https://github.com/TryGhost/Ghost/issues/14882

- The use of predicates is deprecated, and we're working to remove them from everywhere, so that we can remove bluebird
- This should be the final piece of the puzzle in terms of predicates, from here we can start removing bluebird without concern that a predicate somewhere will explode
- Note: some of this code is poorly tested, but the refactors are very straightforward and minimal

ghost/core/core/server/lib/image/gravatar.js

@@ -40,12 +40,13 @@ class Gravatar {
                     image: imageUrl
                 };
             })
-            .catch({statusCode: 404}, function () {
+            .catch(function (err) {
+                if (err.statusCode === 404) {
                     return {
                         image: undefined
                     };
-            })
-            .catch(function () {
+                }
+
                 // ignore error, just resolve with no image url
             });
     }

ghost/core/core/server/lib/image/image-size.js

@@ -163,28 +163,29 @@ class ImageSize {
                 width: dimensions.width,
                 height: dimensions.height
             };
-        }).catch({code: 'URL_MISSING_INVALID'}, (err) => {
+        }).catch((err) => {
+            if (err.code === 'URL_MISSING_INVALID') {
                 return Promise.reject(new errors.InternalServerError({
                     message: err.message,
                     code: 'IMAGE_SIZE_URL',
                     statusCode: err.statusCode,
                     context: err.url || imagePath
                 }));
-        }).catch({code: 'ETIMEDOUT'}, {code: 'ESOCKETTIMEDOUT'}, {code: 'ECONNRESET'}, {statusCode: 408}, (err) => {
+            } else if (err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT' || err.code === 'ECONNRESET' || err.statusCode === 408) {
                 return Promise.reject(new errors.InternalServerError({
                     message: 'Request timed out.',
                     code: 'IMAGE_SIZE_URL',
                     statusCode: err.statusCode,
                     context: err.url || imagePath
                 }));
-        }).catch({code: 'ENOENT'}, {code: 'ENOTFOUND'}, {statusCode: 404}, (err) => {
+            } else if (err.code === 'ENOENT' || err.code === 'ENOTFOUND' || err.statusCode === 404) {
                 return Promise.reject(new errors.NotFoundError({
                     message: 'Image not found.',
                     code: 'IMAGE_SIZE_URL',
                     statusCode: err.statusCode,
                     context: err.url || imagePath
                 }));
-        }).catch(function (err) {
+            } else {
                 if (errors.utils.isGhostError(err)) {
                     return Promise.reject(err);
                 }
@@ -196,6 +197,7 @@ class ImageSize {
                     context: err.url || imagePath,
                     err: err
                 }));
+            }
         });
     }
 
@@ -237,7 +239,8 @@ class ImageSize {
                     height: dimensions.height
                 };
             })
-            .catch({code: 'ENOENT'}, (err) => {
+            .catch((err) => {
+                if (err.code === 'ENOENT') {
                     return Promise.reject(new errors.NotFoundError({
                         message: err.message,
                         code: 'IMAGE_SIZE_STORAGE',
@@ -248,7 +251,7 @@ class ImageSize {
                             reqFilePath: filePath
                         }
                     }));
-            }).catch((err) => {
+                } else {
                     if (errors.utils.isGhostError(err)) {
                         return Promise.reject(err);
                     }
@@ -263,6 +266,7 @@ class ImageSize {
                             reqFilePath: filePath
                         }
                     }));
+                }
             });
     }
 

ghost/core/core/server/services/auth/passwordreset.js

@@ -144,9 +144,6 @@ function doReset(options, tokenParts, settingsAPI) {
             updatedUser.set('status', 'active');
             return updatedUser.save(options);
         })
-        .catch(errors.ValidationError, (err) => {
-            return Promise.reject(err);
-        })
         .catch((err) => {
             if (errors.utils.isGhostError(err)) {
                 return Promise.reject(err);

ghost/core/core/server/services/route-settings/default-settings-manager.js

@@ -38,7 +38,8 @@ class DefaultSettingsManager {
         const defaultFilePath = path.join(this.sourceFolderPath, defaultFileName);
 
         return Promise.resolve(fs.readFile(destinationFilePath, 'utf8'))
-            .catch({code: 'ENOENT'}, () => {
+            .catch((err) => {
+                if (err.code === 'ENOENT') {
                     // CASE: file doesn't exist, copy it from our defaults
                     return fs.copy(
                         defaultFilePath,
@@ -46,15 +47,16 @@ class DefaultSettingsManager {
                     ).then(() => {
                         debug(`'${defaultFileName}' copied to ${this.destinationFolderPath}.`);
                     });
-            }).catch((error) => {
+                } else {
                     // CASE: we might have a permission error, as we can't access the directory
                     throw new errors.InternalServerError({
                         message: tpl(messages.ensureSettings, {
                             path: this.destinationFolderPath
                         }),
-                    err: error,
-                    context: error.path
+                        err: err,
+                        context: err.path
                     });
+                }
             });
     }
 }