ghost 5.52.2 → 5.53.0

package/core/built/admin/assets/{vendor-2e4b0ccaa065f6709f955c29ec9e18a3.js → vendor-c85ef50819caa584c404a0e3dcaa4e69.js}

@@ -14093,4 +14093,4 @@ return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStor
 r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=s,Object.setPrototypeOf(s.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}})}))
 
-//# sourceMappingURL=vendor-2e4b0ccaa065f6709f955c29ec9e18a3.map
+//# sourceMappingURL=vendor-c85ef50819caa584c404a0e3dcaa4e69.map

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.52%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.53%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-2e4b0ccaa065f6709f955c29ec9e18a3.js"></script>
-<script src="assets/chunk.658.4548e702d296a29726d6.js"></script>
-<script src="assets/chunk.143.954795f438685a17c91b.js"></script>
-    <script src="assets/ghost-b73f018429dcbc18d6d47037187d6a81.js"></script>
+    <script src="assets/vendor-c85ef50819caa584c404a0e3dcaa4e69.js"></script>
+<script src="assets/chunk.658.015cf0d0dfedc206ac34.js"></script>
+<script src="assets/chunk.143.bde70b283feb96f5da5f.js"></script>
+    <script src="assets/ghost-9138adfcfe7ef4611bca06d60f1df85e.js"></script>
 </body>
 </html>

package/core/frontend/helpers/comments.js

@@ -50,7 +50,7 @@ module.exports = async function comments(options) {
     }
 
     const frontendKey = await getFrontendKey();
-    const {scriptUrl, stylesUrl, appVersion} = getFrontendAppConfig('comments');
+    const {scriptUrl, stylesUrl} = getFrontendAppConfig('comments');
 
     const data = {
         'ghost-comments': urlUtils.getSiteUrl(),
@@ -61,11 +61,9 @@ module.exports = async function comments(options) {
         title: title,
         count: count,
         'post-id': this.id,
-        'sentry-dsn': '', /* todo: insert sentry dsn key here */
         'color-scheme': colorScheme,
         'avatar-saturation': avatarSaturation,
         'accent-color': accentColor,
-        'app-version': appVersion,
         'comments-enabled': commentsEnabled,
         publication: settingsCache.get('title')
     };

package/core/frontend/helpers/ghost_head.js

@@ -76,6 +76,11 @@ function getMembersHelper(data, frontendKey) {
 function getSearchHelper(frontendKey) {
     const adminUrl = urlUtils.getAdminUrl() || urlUtils.getSiteUrl();
     const {scriptUrl, stylesUrl} = getFrontendAppConfig('sodoSearch');
+
+    if (!scriptUrl) {
+        return '';
+    }
+
     const attrs = {
         key: frontendKey,
         styles: stylesUrl,

package/core/frontend/services/apps/index.js

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('services:apps');
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
@@ -15,8 +14,8 @@ module.exports = {
     init: function () {
         debug('init begin');
         const appsToLoad = config.get('apps:internal');
-
-        return Promise.map(appsToLoad, appName => loader.activateAppByName(appName))
+        const appPromises = appsToLoad.map(appName => loader.activateAppByName(appName));
+        return Promise.all(appPromises)
             .catch(function (err) {
                 logging.error(new errors.InternalServerError({
                     err: err,

package/core/frontend/src/cards/css/signup.css

@@ -1,3 +1,7 @@
+.kg-signup-card {
+    position: relative;
+}
+
 .kg-signup-card,
 .kg-signup-card * {
     box-sizing: border-box;
@@ -8,12 +12,16 @@
     color: currentColor;
 }
 
-.kg-signup-card.kg-layout-split {
+.kg-signup-card.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-layout-split .kg-signup-card-content {
     display: grid;
     grid-template-columns: 1fr 1fr;
 }
 
-.kg-signup-card-container {
+.kg-signup-card-text {
     position: relative;
     display: flex;
     flex-direction: column;
@@ -26,41 +34,58 @@
     text-align: left;
 }
 
-.kg-width-wide .kg-signup-card-container {
+.kg-width-wide .kg-signup-card-text {
     padding: 6.4vmax;
 }
 
-.kg-width-full .kg-signup-card-container {
-    padding: 9.6vmax 7.2vmax;
+.kg-width-full .kg-signup-card-text {
+    padding: 9.6vmax 0;
 }
 
-.kg-layout-split .kg-signup-card-container {
+.kg-layout-split .kg-signup-card-text {
     padding: 9.6vmax 4vmax;
 }
 
-.kg-signup-card-container.align-center {
-    align-items: center;
-    text-align: center;
+.kg-layout-split.kg-content-wide .kg-signup-card-text {
+    padding: 9.6vmax 0 9.6vmax 4vmax;
 }
 
-.kg-signup-card-container.kg-style-accent {
-    background-color: var(--ghost-accent-color);
+.kg-layout-split.kg-content-wide.kg-swapped .kg-signup-card-text {
+    padding: 9.6vmax 4vmax 9.6vmax 0;
 }
 
-.kg-signup-card.kg-swapped .kg-signup-card-container {
+.kg-swapped .kg-signup-card-text {
     grid-row: 1;
 }
 
+.kg-signup-card-text.kg-align-center {
+    align-items: center;
+    text-align: center;
+}
+
 .kg-signup-card.kg-style-image h2.kg-signup-card-heading,
 .kg-signup-card.kg-style-image h3.kg-signup-card-subheading,
 .kg-signup-card.kg-style-image .kg-signup-card-button {
     z-index: 999;
 }
 
+/* Background image */
+
+.kg-signup-card > picture > .kg-signup-card-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    object-position: center;
+    background-color: #FFFFFF;
+    pointer-events: none;
+}
 
 /* Split layout image */
 
-.kg-signup-card-image {
+.kg-signup-card-content .kg-signup-card-image {
     /* this will force the image to follow the signup card height */
     height: 0;
     min-height: 100%;
@@ -69,38 +94,36 @@
     object-position: center;
 }
 
-.kg-background-size-contain .kg-signup-card-image {
+.kg-content-wide .kg-signup-card-content .kg-signup-card-image {
+    height: 100%;
+    padding: 8rem 0;
     object-fit: contain;
 }
 
-.kg-signup-card-image.kg-style-accent {
-    background-color: var(--ghost-accent-color);
-}
-
 /* Heading */
 
 .kg-signup-card h2.kg-signup-card-heading {
     margin: 0;
-    font-size: 4.8vmin;
+    font-size: clamp(2.8rem, 4vw, 4rem);
     font-weight: 700;
     line-height: 1em;
     letter-spacing: -0.01em;
 }
 
-.kg-signup-card h2.kg-signup-card-heading strong {
-    font-weight: 800;
-}
-
 .kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
-    font-size: 5.6vmin;
+    font-size: clamp(2.8rem, 5vw, 5.2rem);
 }
 
 .kg-signup-card.kg-width-full h2.kg-signup-card-heading {
-    font-size: 7.4vmin;
+    font-size: clamp(3.6rem, 5.6vw, 6.4rem);
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split h2.kg-signup-card-heading {
-    font-size: 6.4vmin;
+    font-size: clamp(3.2rem, 4vw, 5.6rem);
+}
+
+.kg-signup-card.kg-width-full.kg-layout-split.kg-content-wide h2.kg-signup-card-heading {
+    font-size: clamp(2.8rem, 4vw, 5.2rem);
 }
 
 /* Subheading */
@@ -112,13 +135,13 @@
 .kg-signup-card h3.kg-signup-card-subheading {
     max-width: 40em;
     margin: 0;
-    font-size: 1.25em;
+    font-size: clamp(1.05em, 2vw, 2rem);
     font-weight: 500;
     line-height: 1.4em;
 }
 
 .kg-signup-card h2 + h3.kg-signup-card-subheading {
-    margin: 0.35em 0 0;
+    margin: 0.6em 0 0;
 }
 
 .kg-signup-card h3.kg-signup-card-subheading strong {
@@ -126,16 +149,16 @@
 }
 
 .kg-signup-card.kg-width-wide h3.kg-signup-card-subheading {
-    font-size: 1.5em;
+    font-size: clamp(1.05em, 2vw, 2.4rem);
 }
 
 .kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
     max-width: 65vmax;
-    font-size: 1.75em;
+    font-size: clamp(1.05em, 2vw, 2.6rem);
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split h3.kg-signup-card-subheading {
-    font-size: 1.5em;
+    font-size: clamp(1.05em, 2vw, 2.4rem);
 }
 
 /* Subscribe form */
@@ -147,7 +170,7 @@
     width: 100%;
 }
 
-.align-center .kg-signup-card-form {
+.kg-align-center .kg-signup-card-form {
     justify-content: center;
 }
 
@@ -309,24 +332,37 @@
 /* Responsive styles */
 
 @media (max-width: 640px) {
-    .kg-signup-card.kg-layout-split {
+    .kg-layout-split .kg-signup-card-content {
         grid-template-columns: 1fr;
     }
 
-    .kg-width-wide .kg-signup-card-container {
+    .kg-width-wide .kg-signup-card-text {
         padding: 6.4vmax 4vmax;
     }
 
-    .kg-width-full .kg-signup-card-container {
-        padding: 9.6vmax 4vmax;
+    .kg-layout-split.kg-content-wide .kg-signup-card-text,
+    .kg-layout-split.kg-content-wide.kg-swapped .kg-signup-card-text {
+        padding: 9.6vmax 0;
+    }
+
+    .kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
+        max-width: unset;
     }
 
-    .kg-signup-card-image {
+    .kg-signup-card-content .kg-signup-card-image:not(.kg-content-wide .kg-signup-card-content .kg-signup-card-image) {
         height: auto;
         min-height: unset;
         aspect-ratio: 1 / 1;
     }
 
+    .kg-content-wide .kg-signup-card-content .kg-signup-card-image {
+        padding: 2.4rem 0 0;
+    }
+
+    .kg-content-wide.kg-swapped .kg-signup-card-content .kg-signup-card-image {
+        padding: 0 0 2.4rem;
+    }
+
     .kg-signup-card-input {
         height: 4.2rem;
         padding: 6px 12px;
@@ -341,11 +377,4 @@
     .kg-signup-card.kg-width-full .kg-signup-card-button {
         font-size: 1em;
     }
-
-    .kg-signup-card h3.kg-signup-card-subheading,
-    .kg-signup-card.kg-width-wide h3.kg-signup-card-subheading,
-    .kg-signup-card.kg-width-full.kg-layout-split h3.kg-signup-card-subheading,
-    .kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
-        font-size: 1em;
-    }
 }

package/core/frontend/utils/frontend-apps.js

@@ -4,10 +4,10 @@ function getFrontendAppConfig(app) {
     const appVersion = config.get(`${app}:version`);
     let scriptUrl = config.get(`${app}:url`);
     let stylesUrl = config.get(`${app}:styles`);
-    if (scriptUrl.includes('{version}')) {
+    if (typeof scriptUrl === 'string' && scriptUrl.includes('{version}')) {
         scriptUrl = scriptUrl.replace('{version}', appVersion);
     }
-    if (stylesUrl?.includes('{version}')) {
+    if (typeof stylesUrl === 'string' && stylesUrl?.includes('{version}')) {
         stylesUrl = stylesUrl.replace('{version}', appVersion);
     }
     return {

package/core/frontend/web/middleware/handle-image-sizes.js

@@ -13,6 +13,9 @@ const FORMAT_PATH_REGEX = /^\/format\/([^./]+)\//;
 const TRAILING_SLASH_REGEX = /\/+$/;
 
 module.exports = function (req, res, next) {
+    // In admin we need to read images and calculate the average color (blocked by CORS otherwise)
+    res.setHeader('Access-Control-Allow-Origin', '*');
+
     if (!SIZE_PATH_REGEX.test(req.url)) {
         return next();
     }

package/core/server/adapters/scheduling/post-scheduling/index.js

@@ -1,8 +1,8 @@
-const Promise = require('bluebird');
 const events = require('../../../lib/common/events');
 const localUtils = require('../utils');
 const PostScheduler = require('./PostScheduler');
 const getSchedulerIntegration = require('./scheduler-intergation');
+const {sequence} = require('@tryghost/promise');
 
 /**
  * @description Load all scheduled posts/pages from database.
@@ -13,7 +13,7 @@ const loadScheduledResources = async function () {
     const SCHEDULED_RESOURCES = ['post', 'page'];
 
     // Fetches all scheduled resources(posts/pages) with default API
-    const results = await Promise.mapSeries(SCHEDULED_RESOURCES, async (resourceType) => {
+    const results = await sequence(SCHEDULED_RESOURCES.map(resourceType => async () => {
         const result = await api.schedules.getScheduled.query({
             options: {
                 resource: resourceType
@@ -21,7 +21,7 @@ const loadScheduledResources = async function () {
         });
 
         return result[resourceType] || [];
-    });
+    }));
 
     return SCHEDULED_RESOURCES.reduce(function (obj, entry, index) {
         return Object.assign(obj, {

package/core/server/api/endpoints/index.js

@@ -201,6 +201,10 @@ module.exports = {
         return apiFramework.pipeline(require('./links'), localUtils);
     },
 
+    get mailEvents() {
+        return apiFramework.pipeline(require('./mail-events'), localUtils);
+    },
+
     /**
      * Content API Controllers
      *

package/core/server/api/endpoints/mail-events.js

@@ -0,0 +1,14 @@
+const mailEvents = require('../../services/mail-events');
+
+module.exports = {
+    docName: 'mail_events',
+    add: {
+        headers: {
+            cacheInvalidate: false
+        },
+        permissions: false,
+        async query(frame) {
+            return mailEvents.service.processPayload(frame.data);
+        }
+    }
+};

package/core/server/api/endpoints/pages.js

@@ -140,6 +140,7 @@ module.exports = {
             'formats',
             'source',
             'force_rerender',
+            'save_revision',
             // NOTE: only for internal context
             'forUpdate',
             'transacting'

package/core/server/api/endpoints/utils/serializers/output/index.js

@@ -139,5 +139,9 @@ module.exports = {
 
     get links() {
         return require('./links');
+    },
+
+    get mail_events() {
+        return require('./mail-events');
     }
 };

package/core/server/api/endpoints/utils/serializers/output/mail-events.js

@@ -0,0 +1,9 @@
+const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:mail-events');
+
+module.exports = {
+    add(response, apiConfig, frame) {
+        debug('add');
+
+        frame.response = {};
+    }
+};

package/core/server/api/endpoints/utils/validators/input/index.js

@@ -75,5 +75,9 @@ module.exports = {
 
     get snippets() {
         return require('./snippets');
+    },
+
+    get mail_events() {
+        return require('./mail-events');
     }
 };

package/core/server/api/endpoints/utils/validators/input/mail-events.js

@@ -0,0 +1,7 @@
+const mailEvents = require('../../../../../services/mail-events');
+
+module.exports = {
+    add(apiConfig, frame) {
+        mailEvents.service.validatePayload(frame.data);
+    }
+};

package/core/server/data/exporter/exporter.js

@@ -1,10 +1,10 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const db = require('../../data/db');
 const commands = require('../schema').commands;
 const ghostVersion = require('@tryghost/version');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const {sequence} = require('@tryghost/promise');
 
 const messages = {
     errorExportingData: 'Error exporting data'
@@ -36,9 +36,9 @@ const doExport = async function doExport(options) {
     try {
         const tables = await commands.getTables(options.transacting);
 
-        const tableData = await Promise.mapSeries(tables, function (tableName) {
+        const tableData = await sequence(tables.map(tableName => async () => {
             return exportTable(tableName, options);
-        });
+        }));
 
         const exportData = {
             meta: {

package/core/server/data/exporter/table-lists.js

@@ -47,7 +47,9 @@ const BACKUP_TABLES = [
     'members_feedback',
     'suppressions',
     'email_spam_complaint_events',
-    'milestones'
+    'milestones',
+    'collections',
+    'collections_posts'
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file

package/core/server/data/migrations/init/1-create-tables.js

@@ -1,8 +1,8 @@
-const Promise = require('bluebird');
 const commands = require('../../schema').commands;
 const schema = require('../../schema').tables;
 const logging = require('@tryghost/logging');
 const schemaTables = Object.keys(schema);
+const {sequence} = require('@tryghost/promise');
 
 module.exports.up = async (options) => {
     const connection = options.connection;
@@ -10,10 +10,10 @@ module.exports.up = async (options) => {
     const existingTables = await commands.getTables(connection);
     const missingTables = schemaTables.filter(t => !existingTables.includes(t));
 
-    await Promise.mapSeries(missingTables, async (table) => {
+    await sequence(missingTables.map(table => async () => {
         logging.info('Creating table: ' + table);
         await commands.createTable(table, connection);
-    });
+    }));
 };
 
 /**
@@ -24,9 +24,9 @@ module.exports.up = async (options) => {
 
         // Reference between tables!
         schemaTables.reverse();
-        await Promise.mapSeries(schemaTables, async (table) => {
+        await sequence(schemaTables.map(table => async () => {
             logging.info('Drop table: ' + table);
             await commands.deleteTable(table, connection);
-        });
+        }));
     };
  */

package/core/server/data/migrations/versions/5.53/2023-06-13-12-24-add-temp-mail-events-table.js

@@ -0,0 +1,9 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('temp_mail_events', {
+    id: {type: 'string', maxlength: 100, nullable: false, primary: true},
+    type: {type: 'string', maxlength: 50, nullable: false},
+    message_id: {type: 'string', maxlength: 150, nullable: false},
+    recipient: {type: 'string', maxlength: 191, nullable: false},
+    occurred_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/migrations/versions/5.53/2023-06-20-10-18-add-collections-posts-table.js

@@ -0,0 +1,10 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {addTable} = require('../../utils');
+
+module.exports = addTable('collections_posts', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    collection_id: {type: 'string', maxlength: 24, nullable: false, references: 'collections.id', cascadeDelete: true},
+    post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+    sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+});

package/core/server/data/migrations/versions/5.53/2023-06-20-10-18-add-collections-table.js

@@ -0,0 +1,15 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {addTable} = require('../../utils');
+
+module.exports = addTable('collections', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    title: {type: 'string', maxlength: 191, nullable: false},
+    slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    description: {type: 'string', maxlength: 2000, nullable: true},
+    type: {type: 'string', maxlength: 50, nullable: false},
+    filter: {type: 'text', maxlength: 1000000000, nullable: true},
+    feature_image: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});

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

@@ -1021,5 +1021,29 @@ module.exports = {
         currency: {type: 'string', maxlength: 24, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         email_sent_at: {type: 'dateTime', nullable: true}
+    },
+    temp_mail_events: {
+        id: {type: 'string', maxlength: 100, nullable: false, primary: true},
+        type: {type: 'string', maxlength: 50, nullable: false},
+        message_id: {type: 'string', maxlength: 150, nullable: false},
+        recipient: {type: 'string', maxlength: 191, nullable: false},
+        occurred_at: {type: 'dateTime', nullable: false}
+    },
+    collections: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        title: {type: 'string', maxlength: 191, nullable: false},
+        slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
+        description: {type: 'string', maxlength: 2000, nullable: true},
+        type: {type: 'string', maxlength: 50, nullable: false},
+        filter: {type: 'text', maxlength: 1000000000, nullable: true},
+        feature_image: {type: 'string', maxlength: 2000, nullable: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
+    },
+    collections_posts: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        collection_id: {type: 'string', maxlength: 24, nullable: false, references: 'collections.id', cascadeDelete: true},
+        post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
     }
 };

package/core/server/models/mail-event.js

@@ -0,0 +1,12 @@
+const ghostBookshelf = require('./base');
+
+const MailEvent = ghostBookshelf.Model.extend({
+    tableName: 'temp_mail_events',
+    defaults() {
+        return {};
+    }
+}, {});
+
+module.exports = {
+    MailEvent: ghostBookshelf.model('MailEvent', MailEvent)
+};

package/core/server/models/settings.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const _ = require('lodash');
 const uuid = require('uuid');
 const crypto = require('crypto');
@@ -211,8 +210,8 @@ Settings = ghostBookshelf.Model.extend({
             data = [data];
         }
 
-        return Promise.map(data, function (item) {
-            // Accept an array of models as input
+        // Accept an array of models as input
+        const promises = data.map(function (item) {
             if (item.toJSON) {
                 item = item.toJSON();
             }
@@ -254,6 +253,7 @@ Settings = ghostBookshelf.Model.extend({
                 return Promise.reject(new errors.NotFoundError({message: tpl(messages.unableToFindSetting, {key: item.key})}));
             });
         });
+        return Promise.all(promises);
     },
 
     populateDefaults: async function populateDefaults(unfilteredOptions) {