ghost 5.53.4 → 5.54.1

package/core/server/models/user.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const ObjectId = require('bson-objectid').default;
 const ghostBookshelf = require('./base');
@@ -204,7 +203,7 @@ User = ghostBookshelf.Model.extend({
 
         // If the user's email is set & has changed & we are not importing
         if (self.hasChanged('email') && self.get('email') && !options.importing) {
-            tasks.gravatar = (function lookUpGravatar() {
+            tasks.push((function lookUpGravatar() {
                 const {gravatar} = require('../lib/image');
 
                 return gravatar.lookup({
@@ -214,11 +213,11 @@ User = ghostBookshelf.Model.extend({
                         self.set('profile_image', response.image);
                     }
                 });
-            })();
+            })());
         }
 
         if (this.hasChanged('slug') || !this.get('slug')) {
-            tasks.slug = (function generateSlug() {
+            tasks.push((function generateSlug() {
                 return ghostBookshelf.Model.generateSlug(
                     User,
                     self.get('slug') || self.get('name'),
@@ -230,7 +229,7 @@ User = ghostBookshelf.Model.extend({
                     .then(function then(slug) {
                         self.set({slug: slug});
                     });
-            })();
+            })());
         }
 
         /**
@@ -274,15 +273,15 @@ User = ghostBookshelf.Model.extend({
                 }
             }
 
-            tasks.hashPassword = (function hashPassword() {
+            tasks.push((function hashPassword() {
                 return security.password.hash(self.get('password'))
                     .then(function (hash) {
                         self.set('password', hash);
                     });
-            })();
+            })());
         }
 
-        return Promise.props(tasks);
+        return Promise.all(tasks);
     },
 
     toJSON: function toJSON(unfilteredOptions) {

package/core/server/models/webhook.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const ghostBookshelf = require('./base');
 const ghostVersion = require('@tryghost/version');
 let Webhook;

package/core/server/services/collections/intercept-events.js

@@ -0,0 +1,10 @@
+module.exports = () => {
+    const DomainEvents = require('@tryghost/domain-events/lib/DomainEvents');
+    const {ModelToDomainEventInterceptor} = require('@tryghost/model-to-domain-event-interceptor');
+    const events = require('../../lib/common/events');
+    const eventInterceptor = new ModelToDomainEventInterceptor({
+        ModelEvents: events,
+        DomainEvents: DomainEvents
+    });
+    eventInterceptor.init();
+};

package/core/server/services/collections/service.js

@@ -1,7 +1,7 @@
 const {
-    CollectionsService,
-    CollectionsRepositoryInMemory
+    CollectionsService
 } = require('@tryghost/collections');
+const BookshelfCollectionsRepository = require('./BookshelfCollectionsRepository');
 const labs = require('../../../shared/labs');
 
 class CollectionsServiceWrapper {
@@ -9,9 +9,10 @@ class CollectionsServiceWrapper {
     api;
 
     constructor() {
-        const postsRepository = require('./PostsRepository').getInstance();
-        const collectionsRepositoryInMemory = new CollectionsRepositoryInMemory();
         const DomainEvents = require('@tryghost/domain-events');
+        const postsRepository = require('./PostsRepository').getInstance();
+        const models = require('../../models');
+        const collectionsRepositoryInMemory = new BookshelfCollectionsRepository(models.Collection);
 
         const collectionsService = new CollectionsService({
             collectionsRepository: collectionsRepositoryInMemory,
@@ -19,7 +20,7 @@ class CollectionsServiceWrapper {
             DomainEvents: DomainEvents,
             slugService: {
                 async generate(input) {
-                    return input.toLowerCase().trim().replace(/^[^a-z0-9A-Z_]+/, '').replace(/[^a-z0-9A-Z_]+$/, '').replace(/[^a-z0-9A-Z_]+/g, '-');
+                    return models.Collection.generateSlug(models.Collection, input, {});
                 }
             }
         });
@@ -32,7 +33,6 @@ class CollectionsServiceWrapper {
             return;
         }
 
-        const translateModelEventsToDomainEvents = require('./model-to-domain-events-bridge');
         const existingBuiltins = await this.api.getAll({filter: 'slug:featured'});
 
         if (!existingBuiltins.data.length) {
@@ -56,7 +56,7 @@ class CollectionsServiceWrapper {
         }
 
         this.api.subscribeToEvents();
-        translateModelEventsToDomainEvents();
+        require('./intercept-events')();
     }
 }
 

package/core/server/services/notifications/Notifications.js

@@ -1,6 +1,5 @@
 const moment = require('moment-timezone');
 const semver = require('semver');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const ghostVersion = require('@tryghost/version');

package/core/server/services/permissions/can-this.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const models = require('../../models');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');

package/core/server/services/permissions/providers.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const models = require('../../models');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');

package/core/server/services/route-settings/DefaultSettingsManager.js

@@ -1,5 +1,4 @@
 const fs = require('fs-extra');
-const Promise = require('bluebird');
 const path = require('path');
 const debug = require('@tryghost/debug')('frontend:services:settings:ensure-settings');
 const tpl = require('@tryghost/tpl');

package/core/server/services/route-settings/RouteSettings.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const fs = require('fs-extra');
 const crypto = require('crypto');
 const urlService = require('../url');
@@ -120,7 +119,9 @@ class RouteSettings {
 
         function isBlogRunning() {
             debug('waiting for blog running');
-            return Promise.delay(1000)
+            return new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            })
                 .then(() => {
                     debug('waited for blog running');
                     if (!urlService.hasFinished()) {

package/core/server/services/webhooks/payload.js

@@ -1,5 +1,4 @@
 const serialize = require('./serialize');
-const Promise = require('bluebird');
 
 module.exports = (event, model) => {
     const payload = {};

package/core/server/web/shared/middleware/api/spam-prevention.js

@@ -202,7 +202,7 @@ const membersAuthEnumeration = () => {
                 attachResetToRequest: true,
                 failCallback(req, res, next, nextValidRequestDate) {
                     return next(new errors.TooManyRequestsError({
-                        message: `Too many different sign-in attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
+                        message: `Too many different sign-in attempts, try again in ${moment(nextValidRequestDate).fromNow(true)}`,
                         context: tpl(messages.tooManySigninAttempts.context),
                         help: tpl(messages.tooManySigninAttempts.context)
                     }));

package/core/shared/labs.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
@@ -39,7 +38,11 @@ const ALPHA_FEATURES = [
     'emailCustomization',
     'collections',
     'adminXSettings',
-    'mailEvents'
+    'pageImprovements',
+    'flatUrls',
+    'mailEvents',
+    'collectionsCard',
+    'headerUpgrade'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];