ghost 4.23.0 → 4.26.0

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'});
     }
 });
 

package/core/server/models/member-paid-subscription-event.js

@@ -11,7 +11,7 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
     customQuery(qb, options) {
         if (options.aggregateMRRDeltas) {
             if (options.limit || options.filter) {
-                throw new errors.IncorrectUsageError('aggregateMRRDeltas does not work when passed a filter or limit');
+                throw new errors.IncorrectUsageError({message: 'aggregateMRRDeltas does not work when passed a filter or limit'});
             }
             const knex = ghostBookshelf.knex;
             return qb.clear('select')
@@ -33,11 +33,11 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
         return options;
     },
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberPaidSubscriptionEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot edit MemberPaidSubscriptionEvent'});
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberPaidSubscriptionEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberPaidSubscriptionEvent'});
     }
 });
 

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

@@ -11,7 +11,7 @@ const MemberPaymentEvent = ghostBookshelf.Model.extend({
     customQuery(qb, options) {
         if (options.aggregatePaymentVolume) {
             if (options.limit || options.filter) {
-                throw new errors.IncorrectUsageError('aggregatePaymentVolume does not work when passed a filter or limit');
+                throw new errors.IncorrectUsageError({message: 'aggregatePaymentVolume does not work when passed a filter or limit'});
             }
             const knex = ghostBookshelf.knex;
             return qb.clear('select')
@@ -33,11 +33,11 @@ const MemberPaymentEvent = ghostBookshelf.Model.extend({
         return options;
     },
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberPaymentEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot edit MemberPaymentEvent'});
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberPaymentEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberPaymentEvent'});
     }
 });
 

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

@@ -19,15 +19,15 @@ const MemberProductEvent = ghostBookshelf.Model.extend({
 
 }, {
     async edit() {
-        throw new errors.IncorrectUsageError(
-            tpl(messages.cannotPerformAction, 'edit')
-        );
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.cannotPerformAction, 'edit')
+        });
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError(
-            tpl(messages.cannotPerformAction, 'destroy')
-        );
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.cannotPerformAction, 'destroy')
+        });
     }
 });
 

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

@@ -11,7 +11,9 @@ const MemberStatusEvent = ghostBookshelf.Model.extend({
     customQuery(qb, options) {
         if (options.aggregateStatusCounts) {
             if (options.limit || options.filter) {
-                throw new errors.IncorrectUsageError('aggregateStatusCounts does not work when passed a filter or limit');
+                throw new errors.IncorrectUsageError({
+                    message: 'aggregateStatusCounts does not work when passed a filter or limit'
+                });
             }
             const knex = ghostBookshelf.knex;
             return qb.clear('select')
@@ -46,11 +48,11 @@ const MemberStatusEvent = ghostBookshelf.Model.extend({
         return options;
     },
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberStatusEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot edit MemberStatusEvent'});
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberStatusEvent');
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberStatusEvent'});
     }
 });
 

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

@@ -11,7 +11,9 @@ const MemberSubscribeEvent = ghostBookshelf.Model.extend({
     customQuery(qb, options) {
         if (options.aggregateSubscriptionDeltas) {
             if (options.limit || options.filter) {
-                throw new errors.IncorrectUsageError('aggregateSubscriptionDeltas does not work when passed a filter or limit');
+                throw new errors.IncorrectUsageError({
+                    message: 'aggregateSubscriptionDeltas does not work when passed a filter or limit'
+                });
             }
             const knex = ghostBookshelf.knex;
             return qb.clear('select')
@@ -32,11 +34,15 @@ const MemberSubscribeEvent = ghostBookshelf.Model.extend({
         return options;
     },
     async edit() {
-        throw new errors.IncorrectUsageError('Cannot edit MemberSubscribeEvent');
+        throw new errors.IncorrectUsageError({
+            message: 'Cannot edit MemberSubscribeEvent'
+        });
     },
 
     async destroy() {
-        throw new errors.IncorrectUsageError('Cannot destroy MemberSubscribeEvent');
+        throw new errors.IncorrectUsageError({
+            message: 'Cannot destroy MemberSubscribeEvent'
+        });
     }
 });
 

package/core/server/models/relations/authors.js

@@ -324,7 +324,7 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
                             .then(() => response);
                     })
                     .catch((err) => {
-                        throw new errors.GhostError({err: err});
+                        throw new errors.InternalServerError({err: err});
                     });
             });
 

package/core/server/models/settings.js

@@ -346,7 +346,7 @@ Settings = ghostBookshelf.Model.extend({
             );
 
             if (validationErrors.length) {
-                throw new errors.ValidationError(validationErrors.join('\n'));
+                throw new errors.ValidationError({message: validationErrors.join('\n')});
             }
         },
         async labs(model) {

package/core/server/notify.js

@@ -8,7 +8,6 @@
 
 // Required Ghost internals
 const config = require('../shared/config');
-const logging = require('@tryghost/logging');
 
 let notified = {
     started: false,
@@ -53,7 +52,7 @@ async function notify(type, error = null) {
     let socketAddress = config.get('bootstrap-socket');
     if (socketAddress) {
         const bootstrapSocket = require('@tryghost/bootstrap-socket');
-        return bootstrapSocket.connectAndSend(socketAddress, logging, message);
+        return bootstrapSocket.connectAndSend(socketAddress, message);
     }
 
     return Promise.resolve();

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

@@ -148,7 +148,7 @@ function doReset(options, tokenParts, settingsAPI) {
             return Promise.reject(err);
         })
         .catch((err) => {
-            if (errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isGhostError(err)) {
                 return Promise.reject(err);
             }
             return Promise.reject(new errors.UnauthorizedError({err: err}));

package/core/server/services/auth/setup.js

@@ -59,7 +59,7 @@ async function setupUser(userData) {
     const owner = await models.User.findOne({role: 'Owner', status: 'all'});
 
     if (!owner) {
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.setupUnableToRun)
         });
     }

package/core/server/services/email-analytics/jobs/index.js

@@ -12,7 +12,7 @@ module.exports = {
             !hasScheduled &&
             config.get('emailAnalytics') &&
             config.get('backgroundJobs:emailAnalytics') &&
-            !process.env.NODE_ENV.match(/^testing/)
+            !process.env.NODE_ENV.startsWith('test')
         ) {
             // Don't register email analytics job if we have no emails,
             // processor usage from many sites spinning up threads can be high.

package/core/server/services/mega/mega.js

@@ -131,7 +131,7 @@ const transformEmailRecipientFilter = (emailRecipientFilter, {errorProperty = 'e
     // `paid` and `free` were swapped out for NQL filters in 4.5.0, we shouldn't see them here now
     case 'paid':
     case 'free':
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.unexpectedFilterError, {
                 property: errorProperty,
                 value: emailRecipientFilter
@@ -140,7 +140,7 @@ const transformEmailRecipientFilter = (emailRecipientFilter, {errorProperty = 'e
     case 'all':
         return 'subscribed:true';
     case 'none':
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.noneFilterError, {
                 property: errorProperty
             })
@@ -352,7 +352,7 @@ async function sendEmailJob({emailModel, options}) {
             error: errorMessage
         }, {patch: true});
 
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             err: error,
             context: tpl(messages.sendEmailRequestFailed)
         });
@@ -416,7 +416,9 @@ function partitionMembersBySegment(memberRows, segments) {
             segmentedMemberRows = memberRows.filter(member => member.status !== 'free');
             memberRows = memberRows.filter(member => member.status === 'free');
         } else {
-            throw new errors.ValidationError(tpl(messages.invalidSegment));
+            throw new errors.ValidationError({
+                message: tpl(messages.invalidSegment)
+            });
         }
 
         partitions[memberSegment] = segmentedMemberRows;