ghost 4.24.0 → 4.26.1

package/core/server/api/v3/session.js

@@ -42,7 +42,7 @@ const session = {
                 });
             });
         }).catch(async (err) => {
-            if (!errors.utils.isIgnitionError(err)) {
+            if (!errors.utils.isGhostError(err)) {
                 throw new errors.UnauthorizedError({
                     message: tpl(messages.accessDenied),
                     err

package/core/server/api/v3/slugs.js

@@ -39,7 +39,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({message: tpl(messages.couldNotGenerateSlug)}));
+                        return Promise.reject(new errors.InternalServerError({message: tpl(messages.couldNotGenerateSlug)}));
                     }
                     return slug;
                 });

package/core/server/api/v3/utils/permissions.js

@@ -66,11 +66,11 @@ const nonePublicAuth = (apiConfig, frame) => {
             return Promise.reject(err);
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new errors.GhostError({
+        return Promise.reject(new errors.InternalServerError({
             err: err
         }));
     });

package/core/server/data/db/state-manager.js

@@ -59,8 +59,8 @@ class DatabaseStateManager {
 
             // CASE: database connection errors, unknown cases
             let errorToThrow = error;
-            if (!errors.utils.isIgnitionError(errorToThrow)) {
-                errorToThrow = new errors.GhostError({message: errorToThrow.message, err: errorToThrow});
+            if (!errors.utils.isGhostError(errorToThrow)) {
+                errorToThrow = new errors.InternalServerError({message: errorToThrow.message, err: errorToThrow});
             }
 
             throw errorToThrow;
@@ -94,8 +94,8 @@ class DatabaseStateManager {
             }
         } catch (error) {
             let errorToThrow = error;
-            if (!errors.utils.isIgnitionError(error)) {
-                errorToThrow = new errors.GhostError({message: errorToThrow.message, err: errorToThrow});
+            if (!errors.utils.isGhostError(error)) {
+                errorToThrow = new errors.InternalServerError({message: errorToThrow.message, err: errorToThrow});
             }
 
             throw errorToThrow;

package/core/server/data/exporter/export-filename.js

@@ -26,7 +26,7 @@ const exportFileName = async function exportFileName(options) {
 
         return title + 'ghost.' + datetime + '.json';
     } catch (err) {
-        logging.error(new errors.GhostError({err: err}));
+        logging.error(new errors.InternalServerError({err: err}));
         return 'ghost.' + datetime + '.json';
     }
 };

package/core/server/data/importer/handlers/json.js

@@ -30,7 +30,7 @@ JSONHandler = {
                 // if importData follows JSON-API format `{ db: [exportedData] }`
                 if (_.keys(importData).length === 1) {
                     if (!importData.db || !Array.isArray(importData.db)) {
-                        throw new errors.GhostError({
+                        throw new errors.InternalServerError({
                             message: tpl(messages.invalidJsonFormat)
                         });
                     }

package/core/server/data/importer/import-manager.js

@@ -121,7 +121,7 @@ class ImportManager {
 
         fs.remove(self.fileToDelete, function (err) {
             if (err) {
-                logging.error(new errors.GhostError({
+                logging.error(new errors.InternalServerError({
                     err: err,
                     context: tpl(messages.couldNotCleanUpFile.error),
                     help: tpl(messages.couldNotCleanUpFile.context)

package/core/server/data/importer/importers/data/base.js

@@ -145,7 +145,7 @@ class Base {
                     });
                 }
             } else {
-                if (!errors.utils.isIgnitionError(err)) {
+                if (!errors.utils.isGhostError(err)) {
                     err = new errors.DataImportError({
                         message: err.message,
                         context: JSON.stringify(obj),

package/core/server/data/migrations/utils.js

@@ -143,7 +143,7 @@ function addPermissionToRole(config) {
             }).first();
 
             if (!permission) {
-                throw new errors.GhostError({
+                throw new errors.InternalServerError({
                     message: tpl(messages.permissionRoleActionError, {
                         action: 'add',
                         permission: config.permission,
@@ -158,7 +158,7 @@ function addPermissionToRole(config) {
             }).first();
 
             if (!role) {
-                throw new errors.GhostError({
+                throw new errors.InternalServerError({
                     message: tpl(messages.permissionRoleActionError, {
                         action: 'add',
                         permission: config.permission,

package/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.js

@@ -45,6 +45,7 @@ module.exports.up = function regenerateKoenigBetaHTML(options) {
                     || (mobiledoc && !mobiledocIsCompatibleWithV1(mobiledoc))
                 ) {
                     // change imagecard.payload.imageStyle to imagecard.payload.cardWidth
+                    // eslint-disable-next-line no-restricted-syntax
                     mobiledoc.cards.forEach((card) => {
                         if (card[0] === 'image') {
                             card[1].cardWidth = card[1].imageStyle;

package/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js

@@ -12,6 +12,7 @@ module.exports = {
 
         logging.info(`Adding uuid field value to ${membersWithoutUUID.length} members.`);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const member of membersWithoutUUID) {
             await conn('members').update('uuid', uuid.v4()).where('id', member.id);
         }

package/core/server/data/migrations/versions/3.22/02-settings-key-renames.js

@@ -35,6 +35,7 @@ module.exports = {
     },
 
     async up(options) {
+        // eslint-disable-next-line no-restricted-syntax
         for (const renameMapping of renameMappings) {
             const oldSetting = await options.transacting('settings')
                 .where('key', renameMapping.from)
@@ -61,6 +62,7 @@ module.exports = {
     },
 
     async down(options) {
+        // eslint-disable-next-line no-restricted-syntax
         for (const renameMapping of renameMappings) {
             const newSetting = await options.transacting('settings')
                 .where('key', renameMapping.to)

package/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js

@@ -24,6 +24,7 @@ module.exports = {
             key: 'stripe_plans'
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of defaultOperations) {
             logging.info(`Updating ${operation.key} setting group,type,flags`);
             await knex('settings')
@@ -86,6 +87,7 @@ module.exports = {
             value: JSON.stringify(stripePlans)
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of valueOperations) {
             logging.info(`Updating ${operation.key} setting value`);
             await knex('settings')
@@ -170,6 +172,7 @@ module.exports = {
             'stripe_secret_key'
         ];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const setting of settingsToDelete) {
             logging.info(`Deleting ${setting} setting`);
         }

package/core/server/data/migrations/versions/3.22/06-migrate-stripe-connect-settings.js

@@ -20,6 +20,7 @@ module.exports = {
             key: 'stripe_connect_account_id'
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of defaultOperations) {
             logging.info(`Updating ${operation.key} setting group,type,flags`);
             await knex('settings')
@@ -62,6 +63,7 @@ module.exports = {
             value: stripeConnectIntegration.account_id || ''
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of valueOperations) {
             logging.info(`Updating ${operation.key} setting value`);
             await knex('settings')

package/core/server/data/migrations/versions/3.23/01-migrate-bulk-email-settings.js

@@ -35,6 +35,7 @@ module.exports = {
             value: bulkEmailSettings.baseUrl
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of operations) {
             logging.info(`Updating ${operation.key} setting's value, group, type & flags.`);
             await knex('settings')

package/core/server/data/migrations/versions/3.29/01-remove-duplicate-subscriptions.js

@@ -23,6 +23,7 @@ module.exports = {
         }
 
         logging.info(`Found ${duplicates.length} duplicate stripe subscriptions`);
+        // eslint-disable-next-line no-restricted-syntax
         for (const duplicate of duplicates) {
             const subscriptions = await knex('members_stripe_customers_subscriptions')
                 .select()
@@ -36,6 +37,7 @@ module.exports = {
 
             logging.info(`Keeping newest subscription ${newestSubscription.id} - ${newestSubscription.subscription_id}, last updated at ${newestSubscription.updated_at}`);
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const subscriptionToDelete of olderSubscriptions) {
                 logging.info(`Deleting duplicate subscription ${subscriptionToDelete.id} - ${subscriptionToDelete.subscription_id}, last updated at ${subscriptionToDelete.updated_at}`);
                 await knex('members_stripe_customers_subscriptions')

package/core/server/data/migrations/versions/3.29/02-remove-duplicate-customers.js

@@ -23,6 +23,7 @@ module.exports = {
         }
 
         logging.info(`Found ${duplicates.length} duplicate stripe customers`);
+        // eslint-disable-next-line no-restricted-syntax
         for (const duplicate of duplicates) {
             const customers = await knex('members_stripe_customers')
                 .select()
@@ -36,6 +37,7 @@ module.exports = {
 
             logging.info(`Keeping newest customer ${newestCustomer.id} - ${newestCustomer.customer_id}, last updated at ${newestCustomer.updated_at}`);
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const customerToDelete of olderCustomers) {
                 logging.info(`Deleting duplicate customer ${customerToDelete.id} - ${customerToDelete.customer_id}, last updated at ${customerToDelete.updated_at}`);
                 await knex('members_stripe_customers')

package/core/server/data/migrations/versions/3.38/04-populate-recipient-filter-column.js

@@ -25,12 +25,14 @@ module.exports = createTransactionalMigration(
         const paidPostIdChunks = chunk(paidPostIds, chunkSize);
         const membersAndPublicPostIdChunks = chunk(membersPostIds.concat(publicPostIds), chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const paidPostIdsChunk of paidPostIdChunks) {
             await connection('emails')
                 .update('recipient_filter', 'paid')
                 .whereIn('post_id', paidPostIdsChunk);
         }
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const membersAndPublicPostIdsChunk of membersAndPublicPostIdChunks) {
             await connection('emails')
                 .update('recipient_filter', 'all')

package/core/server/data/migrations/versions/4.0/01-update-mobiledoc.js

@@ -15,6 +15,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
         // pushing all queries into the query builder buffer in parallel
         // https://stackoverflow.com/questions/54105280/how-to-loop-through-multi-line-sql-query-and-use-them-in-knex-transactions
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const postIdRow of postIdRows) {
             const {id} = postIdRow;
             const [{mobiledoc: mobiledocJson}] = await knex('posts')
@@ -31,6 +32,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
             }
 
             if (mobiledoc.cards) {
+                // eslint-disable-next-line no-restricted-syntax
                 mobiledoc.cards.forEach((card) => {
                     // card-markdown card was used in 1.0 and aliased to markdown in 2.0 onwards
                     // clean it up here whilst we're already modifying mobiledoc

package/core/server/data/migrations/versions/4.0/03-populate-status-column-for-members.js

@@ -5,6 +5,7 @@ const logging = require('@tryghost/logging');
 module.exports = createTransactionalMigration(
     async function up(knex) {
         logging.info('Updating members.status based on members_stripe_customers_subscriptions.status');
+        // eslint-disable-next-line no-restricted-syntax
         const paidMemberIds = (await knex('members')
             .select('members.id')
             .innerJoin(
@@ -24,6 +25,7 @@ module.exports = createTransactionalMigration(
                 }
             )).map(({id}) => id);
 
+        // eslint-disable-next-line no-restricted-syntax
         const compedMemberIds = (await knex('members')
             .select('members.id')
             .innerJoin(
@@ -54,6 +56,7 @@ module.exports = createTransactionalMigration(
 
         const paidMemberIdChunks = chunk(paidMemberIds, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const paidMemberIdsChunk of paidMemberIdChunks) {
             await knex('members')
                 .update('status', 'paid')
@@ -62,6 +65,7 @@ module.exports = createTransactionalMigration(
 
         const compedMemberIdChunks = chunk(compedMemberIds, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const compedMemberIdsChunk of compedMemberIdChunks) {
             await knex('members')
                 .update('status', 'comped')

package/core/server/data/migrations/versions/4.0/06-populate-members-subscribe-events-table.js

@@ -42,6 +42,7 @@ module.exports = createTransactionalMigration(
 
         const eventChunks = chunk(allEvents, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const events of eventChunks) {
             await knex.insert(events).into('members_subscribe_events');
         }

package/core/server/data/migrations/versions/4.0/17-populate-members-status-events-table.js

@@ -28,6 +28,7 @@ module.exports = createTransactionalMigration(
 
         const eventChunks = chunk(membersStatusEvents, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const events of eventChunks) {
             await knex.insert(events).into('members_status_events');
         }

package/core/server/data/migrations/versions/4.0/18-transform-urls-absolute-to-transform-ready.js

@@ -18,6 +18,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
         // pushing all queries into the query builder buffer in parallel
         // https://stackoverflow.com/questions/54105280/how-to-loop-through-multi-line-sql-query-and-use-them-in-knex-transactions
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const postIdRow of postIdRows) {
             const {id} = postIdRow;
             const [post] = await knex('posts')
@@ -80,6 +81,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
             .forUpdate()
             .select('id');
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const userIdRow of userIdRows) {
             const {id} = userIdRow;
             const [user] = await knex('users')
@@ -108,6 +110,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
             .forUpdate()
             .select('id');
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const tagIdRow of tagIdRows) {
             const {id} = tagIdRow;
             const [tag] = await knex('tags')
@@ -148,6 +151,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
             .forUpdate()
             .select('id');
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const snippetIdRow of snippetIdRows) {
             const {id} = snippetIdRow;
             const [snippet] = await knex('snippets')
@@ -180,6 +184,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
                 'twitter_image'
             ]);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const settingRow of settingsRows) {
             let {key, value} = settingRow;
 

package/core/server/data/migrations/versions/4.0/22-solve-orphaned-webhooks.js

@@ -77,6 +77,7 @@ module.exports = createIrreversibleMigration(
         };
         await knex('api_keys').insert(adminKey);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (let i = 0; i < orphanedWebhooks.length; i++) {
             const webhook = orphanedWebhooks[i];
 

package/core/server/data/migrations/versions/4.0/23-regenerate-posts-html.js

@@ -17,6 +17,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
         // pushing all queries into the query builder buffer in parallel
         // https://stackoverflow.com/questions/54105280/how-to-loop-through-multi-line-sql-query-and-use-them-in-knex-transactions
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const postIdRow of postIdRows) {
             const {id} = postIdRow;
             const [post] = await knex('posts')

package/core/server/data/migrations/versions/4.0/25-populate-members-paid-subscription-events-table.js

@@ -44,7 +44,7 @@ module.exports = createTransactionalMigration(
                 return amount * 30;
             }
 
-            throw new errors.GhostError({
+            throw new errors.InternalServerError({
                 message: tpl(messages.unknownSubscriptionIntervalError , {
                     interval
                 })
@@ -116,6 +116,7 @@ module.exports = createTransactionalMigration(
 
         const eventChunks = chunk(allEvents, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const events of eventChunks) {
             await knex.insert(events).into('members_paid_subscription_events');
         }

package/core/server/data/migrations/versions/4.12/02-fix-member-statuses.js

@@ -26,6 +26,7 @@ module.exports = createTransactionalMigration(
 
         const chunks = chunkArray(freeMembersIds, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const chunk of chunks) {
             await knex('members')
                 .update('status', 'free')

package/core/server/data/migrations/versions/4.14/01-fix-comped-member-statuses.js

@@ -3,6 +3,7 @@ const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 
 module.exports = createTransactionalMigration(async function up(knex) {
+    // eslint-disable-next-line no-restricted-syntax
     const compedMemberIds = (await knex('members')
         .select('members.id')
         .innerJoin(
@@ -44,12 +45,14 @@ module.exports = createTransactionalMigration(async function up(knex) {
 
     const compedMemberIdChunks = chunk(compedMemberIds, chunkSize);
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const compedMemberIdsChunk of compedMemberIdChunks) {
         await knex('members')
             .update('status', 'comped')
             .whereIn('id', compedMemberIdsChunk);
     }
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const memberId of compedMemberIds) {
         const mostRecentStatusEvent = await knex('members_status_events')
             .select('*')

package/core/server/data/migrations/versions/4.14/02-fix-free-members-status-events.js

@@ -49,6 +49,7 @@ module.exports = createTransactionalMigration(
         // and so we're left with 998 for our WHERE IN clause values
         const chunkedEventsToUpdate = _.chunk(eventsToUpdate, 998);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const chunk of chunkedEventsToUpdate) {
             logging.info(`Updating a chunk of ${chunk.length} member status events`);
             await knex('members_status_events')

package/core/server/data/migrations/versions/4.20/05-remove-not-null-constraint-from-portal-title.js

@@ -15,6 +15,7 @@ module.exports = createNonTransactionalMigration(
         });
 
         if (knex.client.config.client === 'sqlite3') {
+            // eslint-disable-next-line no-restricted-syntax
             for (const column of ['name', 'code', 'stripe_coupon_id']) {
                 await addUnique('offers', column, knex);
             }
@@ -32,6 +33,7 @@ module.exports = createNonTransactionalMigration(
         });
 
         if (knex.client.config.client === 'sqlite3') {
+            // eslint-disable-next-line no-restricted-syntax
             for (const column of ['name', 'code', 'stripe_coupon_id']) {
                 await addUnique('offers', column, knex);
             }

package/core/server/data/migrations/versions/4.23/01-truncate-offer-names.js

@@ -47,6 +47,7 @@ module.exports = createTransactionalMigration(
             return offers.concat(updatedRow);
         }, []);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const truncatedOffer of truncatedOffers) {
             await knex('offers')
                 .update('name', truncatedOffer.name)

package/core/server/data/migrations/versions/4.3/04-attach-members-to-product.js

@@ -38,6 +38,7 @@ module.exports = createTransactionalMigration(
         const chunkSize = 333;
         const memberProductRelationsChunks = chunk(memberProductRelations, chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const relations of memberProductRelationsChunks) {
             await knex.insert(relations).into('members_products');
         }

package/core/server/data/migrations/versions/4.4/01-restore-free-members-signup-setting-from-backup.js

@@ -63,6 +63,7 @@ module.exports = createTransactionalMigration(
 
         let hasRestored = false;
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const backupFile of backupFiles) {
             try {
                 const backup = require(path.join(dataPath, backupFile));

package/core/server/data/migrations/versions/4.6/01-remove-comped-status.js

@@ -9,6 +9,7 @@ module.exports = createTransactionalMigration(
             .where('status', 'comped');
     },
     async function down(knex) {
+        // eslint-disable-next-line no-restricted-syntax
         const compedMemberIds = (await knex('members')
             .select('members.id')
             .innerJoin(

package/core/server/data/migrations/versions/4.8/04-migrate-show-newsletter-header-setting.js

@@ -27,6 +27,7 @@ module.exports = createTransactionalMigration(
             const newSettingKeys = ['newsletter_show_header_title', 'newsletter_show_header_icon'];
             const now = connection.raw('CURRENT_TIMESTAMP');
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const settingKey of newSettingKeys) {
                 const existingSetting = await connection('settings').where('key', settingKey).first();
 

package/core/server/data/migrations/versions/4.9/05-fix-missed-mobiledoc-url-transforms.js

@@ -33,6 +33,7 @@ module.exports = createTransactionalMigration(
                 .forUpdate()
                 .select('id');
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const postIdRow of postIdRows) {
                 const {id} = postIdRow;
                 const [post] = await knex('posts')

package/core/server/data/migrations/versions/4.9/06-add-comped-status.js

@@ -3,6 +3,7 @@ const {createTransactionalMigration} = require('../../utils.js');
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
+        // eslint-disable-next-line no-restricted-syntax
         const compedMemberIds = (await knex('members')
             .select('members.id')
             .innerJoin(

package/core/server/data/migrations/versions/4.9/07-update-comped-members-status-events.js

@@ -15,6 +15,7 @@ module.exports = createTransactionalMigration(
             logging.info(`Found ${compedMembers.length} comped members - checking members_status_events`);
         }
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const member of compedMembers) {
             const mostRecentStatusEvent = await knex('members_status_events')
                 .select('*')

package/core/server/data/schema/commands.js

@@ -139,7 +139,7 @@ async function hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, trans
     const client = knex.client.config.client;
 
     if (client !== 'sqlite3') {
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.hasForeignSQLite3)
         });
     }
@@ -265,7 +265,7 @@ async function hasPrimaryKeySQLite(tableName, transaction) {
     const client = knex.client.config.client;
 
     if (client !== 'sqlite3') {
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.hasPrimaryKeySQLiteError)
         });
     }

package/core/server/ghost-server.js

@@ -107,13 +107,13 @@ class GhostServer {
                 let ghostError;
 
                 if (error.code === 'EADDRINUSE') {
-                    ghostError = new errors.GhostError({
+                    ghostError = new errors.InternalServerError({
                         message: tpl(messages.addressInUse.error),
                         context: tpl(messages.addressInUse.context, {port: config.get('server').port}),
                         help: tpl(messages.addressInUse.help)
                     });
                 } else {
-                    ghostError = new errors.GhostError({
+                    ghostError = new errors.InternalServerError({
                         message: tpl(messages.otherError.error, {errorNumber: error.errno}),
                         context: tpl(messages.otherError.context),
                         help: tpl(messages.otherError.help)

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

@@ -177,7 +177,7 @@ class ImageSize {
                 context: err.url || imagePath
             }));
         }).catch(function (err) {
-            if (errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isGhostError(err)) {
                 return Promise.reject(err);
             }
 
@@ -241,7 +241,7 @@ class ImageSize {
                     }
                 }));
             }).catch((err) => {
-                if (errors.utils.isIgnitionError(err)) {
+                if (errors.utils.isGhostError(err)) {
                     return Promise.reject(err);
                 }
 

package/core/server/models/base/listeners.js

@@ -69,13 +69,13 @@ events.on('settings.timezone.edited', function (settingModel, options) {
                 try {
                     await models.Post.edit(post.toJSON(), _.merge({id: post.id}, options));
                 } catch (err) {
-                    logging.error(new errors.GhostError({
+                    logging.error(new errors.InternalServerError({
                         err
                     }));
                 }
             });
         } catch (err) {
-            logging.error(new errors.GhostError({
+            logging.error(new errors.InternalServerError({
                 err: err,
                 level: 'critical'
             }));

package/core/server/models/member-email-change-event.js

@@ -9,11 +9,11 @@ const MemberEmailChangeEvent = ghostBookshelf.Model.extend({
     }
 }, {
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberEmailChangeEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot edit MemberEmailChangeEvent'});
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberEmailChangeEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberEmailChangeEvent'});
     }
 });
 

package/core/server/models/member-login-event.js

@@ -9,11 +9,11 @@ const MemberLoginEvent = ghostBookshelf.Model.extend({
     }
 }, {
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberLoginEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot edit MemberLoginEvent'});
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberLoginEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberLoginEvent'});
     }
 });