ghost 4.41.1 → 4.42.0

package/core/server/api/canary/utils/serializers/output/members.js

@@ -9,6 +9,8 @@ module.exports = {
     read: createSerializer('read', singleMember),
     edit: createSerializer('edit', singleMember),
     add: createSerializer('add', singleMember),
+    destroy: createSerializer('destroy', passthrough),
+
     editSubscription: createSerializer('editSubscription', singleMember),
     createSubscription: createSerializer('createSubscription', singleMember),
     bulkDestroy: createSerializer('bulkDestroy', passthrough),
@@ -18,8 +20,6 @@ module.exports = {
     importCSV: createSerializer('importCSV', passthrough),
     memberStats: createSerializer('memberStats', passthrough),
     mrrStats: createSerializer('mrrStats', passthrough),
-    subscriberStats: createSerializer('subscriberStats', passthrough),
-    grossVolumeStats: createSerializer('grossVolumeStats', passthrough),
     activityFeed: createSerializer('activityFeed', passthrough)
 };
 

package/core/server/api/canary/utils/serializers/output/oembed.js

@@ -1,8 +1,8 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:oembed');
 
 module.exports = {
-    all(res, apiConfig, frame) {
+    all(data, apiConfig, frame) {
         debug('all');
-        frame.response = res;
+        frame.response = data;
     }
 };

package/core/server/api/canary/utils/serializers/output/offers.js

@@ -0,0 +1,8 @@
+const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:offers');
+
+module.exports = {
+    all() {
+        debug('all');
+        // Offers has frame.response already set
+    }
+};

package/core/server/api/canary/utils/serializers/output/redirects.js

@@ -1,5 +1,5 @@
 module.exports = {
-    download(response, apiConfig, frame) {
-        frame.response = response;
+    all(data, apiConfig, frame) {
+        frame.response = data;
     }
 };

package/core/server/api/canary/utils/serializers/output/schedules.js

@@ -1,5 +1,5 @@
 module.exports = {
-    all(model, apiConfig, frame) {
-        frame.response = model;
+    all(data, apiConfig, frame) {
+        frame.response = data;
     }
 };

package/core/server/api/canary/utils/serializers/output/session.js

@@ -0,0 +1,9 @@
+const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:session');
+
+module.exports = {
+    all(data, apiConfig, frame) {
+        debug('all');
+
+        frame.response = data;
+    }
+};

package/core/server/api/canary/utils/serializers/output/settings.js

@@ -1,65 +1,92 @@
 const _ = require('lodash');
 const utils = require('../../index');
 const mappers = require('./mappers');
-const _private = {};
 
 /**
- * ### Settings Filter
  * Filters an object based on a given filter object
  * @private
  * @param {Object} settings
  * @param {String} filter
  * @returns {*}
  */
-_private.settingsFilter = (settings, filter) => {
-    let filteredGroups = filter ? filter.split(',') : false;
+function settingsFilter(settings, filter) {
+    let filteredGroups = filter ? filter.split(',') : [];
     return _.filter(settings, (setting) => {
-        if (filteredGroups) {
+        if (filteredGroups.length > 0) {
             return _.includes(filteredGroups, setting.group);
         }
 
         return true;
     });
-};
+}
 
-module.exports = {
-    browse(models, apiConfig, frame) {
-        let filteredSettings;
+/**
+ * Serialies a settings object into the desired API repsonse format
+ *
+ * @param {Object} models
+ * @param {Object} apiConfig
+ * @param {Object} frame
+ */
+function serializeSettings(models, apiConfig, frame) {
+    let filteredSettings;
 
-        // If this is public, we already have the right data, we just need to add an Array wrapper
-        if (utils.isContentAPI(frame)) {
-            filteredSettings = models;
-        } else {
-            filteredSettings = _.values(_private.settingsFilter(models, frame.options.group));
-        }
+    // If this is public, we already have the right data, we just need to add an Array wrapper
+    if (utils.isContentAPI(frame)) {
+        filteredSettings = models;
+    } else {
+        filteredSettings = _.values(settingsFilter(models, frame.options.group));
+    }
 
-        frame.response = {
-            settings: mappers.settings(filteredSettings, frame),
-            meta: {}
-        };
+    frame.response = {
+        settings: mappers.settings(filteredSettings, frame),
+        meta: {}
+    };
 
-        if (frame.options.type || frame.options.group) {
-            frame.response.meta.filters = {};
+    if (frame.options.type || frame.options.group) {
+        frame.response.meta.filters = {};
 
-            if (frame.options.type) {
-                frame.response.meta.filters.type = frame.options.type;
-            }
+        if (frame.options.type) {
+            frame.response.meta.filters.type = frame.options.type;
+        }
 
-            if (frame.options.group) {
-                frame.response.meta.filters.group = frame.options.group;
-            }
+        if (frame.options.group) {
+            frame.response.meta.filters.group = frame.options.group;
         }
-    },
+    }
+}
 
-    read() {
-        this.browse(...arguments);
-    },
+/**
+ * This noop results in there being no response body
+ *
+ * @template Data
+ * @param {Data} data
+ * @returns Data
+ */
+function passthrough(data) {
+    return data;
+}
+
+/**
+ * Returns the data as-is without any further modiications
+ *
+ * @template Data
+ * @param {Data} data
+ * @param {Object} apiConfig
+ * @param {Object} frame
+ */
+function serializeData(data, apiConfig, frame) {
+    frame.response = data;
+}
+
+module.exports = {
+    browse: serializeSettings,
+    read: serializeSettings,
+    edit: serializeSettings,
 
-    edit() {
-        this.browse(...arguments);
-    },
+    download: serializeData,
+    upload: serializeData,
 
-    download(bytes, apiConfig, frame) {
-        frame.response = bytes;
-    }
+    updateMembersEmail: passthrough,
+    validateMembersEmailUpdate: passthrough,
+    disconnectStripeConnectIntegration: passthrough
 };

package/core/server/api/canary/utils/serializers/output/slack.js

@@ -0,0 +1,9 @@
+const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:slack');
+
+module.exports = {
+    all(data, apiConfig, frame) {
+        debug('all');
+
+        frame.response = data;
+    }
+};

package/core/server/api/canary/utils/serializers/output/themes.js

@@ -1,30 +1,9 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:themes');
 
 module.exports = {
-    browse(themes, apiConfig, frame) {
-        debug('browse');
+    all(data, apiConfig, frame) {
+        debug('all');
 
-        frame.response = themes;
-    },
-
-    upload() {
-        debug('upload');
-        this.browse(...arguments);
-    },
-
-    install() {
-        debug('install');
-        this.browse(...arguments);
-    },
-
-    activate() {
-        debug('activate');
-        this.browse(...arguments);
-    },
-
-    download(fn, apiConfig, frame) {
-        debug('download');
-
-        frame.response = fn;
+        frame.response = data;
     }
 };

package/core/server/api/canary/utils/serializers/output/users.js

@@ -1,34 +1,11 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:users');
 const tpl = require('@tryghost/tpl');
-const mappers = require('./mappers');
 
 const messages = {
     pwdChangedSuccessfully: 'Password changed successfully.'
 };
 
 module.exports = {
-    browse(models, apiConfig, frame) {
-        debug('browse');
-
-        frame.response = {
-            users: models.data.map(model => mappers.users(model, frame)),
-            meta: models.meta
-        };
-    },
-
-    read(model, apiConfig, frame) {
-        debug('read');
-
-        frame.response = {
-            users: [mappers.users(model, frame)]
-        };
-    },
-
-    edit() {
-        debug('edit');
-        this.read(...arguments);
-    },
-
     destroy(filename, apiConfig, frame) {
         debug('destroy');
 

package/core/server/api/shared/serializers/handle.js

@@ -67,6 +67,19 @@ module.exports.input = (apiConfig, apiSerializers, frame) => {
     return sequence(tasks);
 };
 
+const getBestMatchSerializer = function (apiSerializers, docName, method) {
+    if (apiSerializers[docName] && apiSerializers[docName][method]) {
+        debug(`Calling ${docName}.${method}`);
+        return apiSerializers[docName][method].bind(apiSerializers[docName]);
+    } else if (apiSerializers[docName] && apiSerializers[docName].all) {
+        debug(`Calling ${docName}.all`);
+        return apiSerializers[docName].all.bind(apiSerializers[docName]);
+    }
+
+    debug(`Returning as-is`);
+    return false;
+};
+
 /**
  * @description Shared output serialization handler.
  *
@@ -101,18 +114,19 @@ module.exports.output = (response = {}, apiConfig, apiSerializers, frame) => {
         });
     }
 
-    if (apiSerializers[apiConfig.docName]) {
-        if (apiSerializers[apiConfig.docName].all) {
-            tasks.push(function serializeOptionsShared() {
-                return apiSerializers[apiConfig.docName].all(response, apiConfig, frame);
-            });
-        }
+    const customSerializer = getBestMatchSerializer(apiSerializers, apiConfig.docName, apiConfig.method);
+    const defaultSerializer = getBestMatchSerializer(apiSerializers, 'default', apiConfig.method);
 
-        if (apiSerializers[apiConfig.docName][apiConfig.method]) {
-            tasks.push(function serializeOptionsShared() {
-                return apiSerializers[apiConfig.docName][apiConfig.method](response, apiConfig, frame);
-            });
-        }
+    if (customSerializer) {
+        // CASE: custom serializer exists
+        tasks.push(function doCustomSerializer() {
+            return customSerializer(response, apiConfig, frame);
+        });
+    } else if (defaultSerializer) {
+        // CASE: Fall back to default serializer
+        tasks.push(function doDefaultSerializer() {
+            return defaultSerializer(response, apiConfig, frame);
+        });
     }
 
     if (apiSerializers.all && apiSerializers.all.after) {

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

@@ -15,6 +15,7 @@ const BACKUP_TABLES = [
     'members_stripe_customers_subscriptions',
     'migrations',
     'migrations_lock',
+    'newsletters',
     'oauth',
     'permissions',
     'permissions_roles',

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

@@ -178,7 +178,7 @@ function addPermissionToRole(config) {
                 return;
             }
 
-            logging.warn(`Adding permission(${config.permission}) to role(${config.role})`);
+            logging.info(`Adding permission(${config.permission}) to role(${config.role})`);
             await connection('permissions_roles').insert({
                 id: ObjectId().toHexString(),
                 permission_id: permission.id,

package/core/server/data/migrations/versions/4.42/2022-03-21-17-17-add.js

@@ -0,0 +1,20 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('newsletters', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    name: {type: 'string', maxlength: 191, nullable: false},
+    description: {type: 'string', maxlength: 2000, nullable: true},
+    sender_name: {type: 'string', maxlength: 191, nullable: false},
+    sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+    sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+    default: {type: 'bool', nullable: false, defaultTo: false},
+    status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
+    recipient_filter: {
+        type: 'text',
+        maxlength: 1000000000,
+        nullable: false,
+        defaultTo: ''
+    },
+    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+    sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+});

package/core/server/data/migrations/versions/4.42/2022-03-30-15-44-add-newsletter-permissions.js

@@ -0,0 +1,28 @@
+const {
+    addPermissionWithRoles,
+    combineTransactionalMigrations
+} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    addPermissionWithRoles({
+        name: 'Browse newsletters',
+        action: 'browse',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ]),
+    addPermissionWithRoles({
+        name: 'Add newsletters',
+        action: 'add',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ]),
+    addPermissionWithRoles({
+        name: 'Edit newsletters',
+        action: 'edit',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ])
+);

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

@@ -80,18 +80,18 @@ function dropColumn(tableName, column, transaction = db.knex) {
  */
 async function addUnique(tableName, columns, transaction = db.knex) {
     try {
-        logging.info(`Adding unique constraint for: ${columns} in table ${tableName}`);
+        logging.info(`Adding unique constraint for '${columns}' in table '${tableName}'`);
 
         return await transaction.schema.table(tableName, function (table) {
             table.unique(columns);
         });
     } catch (err) {
         if (err.code === 'SQLITE_ERROR') {
-            logging.warn(`Constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         if (err.code === 'ER_DUP_KEYNAME') {
-            logging.warn(`Constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         throw err;
@@ -107,18 +107,18 @@ async function addUnique(tableName, columns, transaction = db.knex) {
  */
 async function dropUnique(tableName, columns, transaction = db.knex) {
     try {
-        logging.info(`Dropping unique constraint for: ${columns} in table: ${tableName}`);
+        logging.info(`Dropping unique constraint for '${columns}' in table '${tableName}'`);
 
         return await transaction.schema.table(tableName, function (table) {
             table.dropUnique(columns);
         });
     } catch (err) {
         if (err.code === 'SQLITE_ERROR') {
-            logging.warn(`Constraint for: ${columns} does not exist for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
             return;
         }
         if (err.code === 'ER_CANT_DROP_FIELD_OR_KEY') {
-            logging.warn(`Constraint for: ${columns} does not exist for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
             return;
         }
         throw err;
@@ -164,7 +164,7 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
     if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (foreignKeyExists) {
-            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
+            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - already exists`);
             return;
         }
     }
@@ -195,7 +195,7 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
         }
     } catch (err) {
         if (err.code === 'ER_DUP_KEY' || err.code === 'ER_FK_DUP_KEY' || err.code === 'ER_FK_DUP_NAME') {
-            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
+            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - already exists`);
             return;
         }
         throw err;
@@ -216,7 +216,7 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
     if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (!foreignKeyExists) {
-            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key does not exist`);
+            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - does not exist`);
             return;
         }
     }
@@ -243,7 +243,7 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
         }
     } catch (err) {
         if (err.code === 'ER_CANT_DROP_FIELD_OR_KEY') {
-            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key does not exist`);
+            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - does not exist`);
             return;
         }
         throw err;
@@ -280,18 +280,18 @@ async function addPrimaryKey(tableName, columns, transaction = db.knex) {
     if (DatabaseInfo.isSQLite(transaction)) {
         const primaryKeyExists = await hasPrimaryKeySQLite(tableName, transaction);
         if (primaryKeyExists) {
-            logging.warn(`Primary key constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Primary key constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
     }
     try {
-        logging.info(`Adding primary key constraint for: ${columns} in table ${tableName}`);
+        logging.info(`Adding primary key constraint for '${columns}' in table '${tableName}'`);
         return await transaction.schema.table(tableName, function (table) {
             table.primary(columns);
         });
     } catch (err) {
         if (err.code === 'ER_MULTIPLE_PRI_KEY') {
-            logging.warn(`Primary key constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Primary key constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         throw err;

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

@@ -711,5 +711,23 @@ module.exports = {
             }
         },
         value: {type: 'text', maxlength: 65535, nullable: true}
+    },
+    newsletters: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        name: {type: 'string', maxlength: 191, nullable: false},
+        description: {type: 'string', maxlength: 2000, nullable: true},
+        sender_name: {type: 'string', maxlength: 191, nullable: false},
+        sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        default: {type: 'bool', nullable: false, defaultTo: false},
+        status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
+        recipient_filter: {
+            type: 'text',
+            maxlength: 1000000000,
+            nullable: false,
+            defaultTo: ''
+        },
+        subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
     }
 };

package/core/server/models/newsletter.js

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+
+const Newsletter = ghostBookshelf.Model.extend({
+    tableName: 'newsletters'
+});
+
+module.exports = {
+    Newsletter: ghostBookshelf.model('Newsletter', Newsletter)
+};

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

@@ -198,48 +198,55 @@ h5,
 h6 {
     margin-top: 0;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    line-height: 1.15em;
-    font-weight: 600;
+    line-height: 1.11em;
+    font-weight: 700;
     text-rendering: optimizeLegibility;
 }
 
 h1 {
     margin: 1.5em 0 0.5em 0;
     font-size: 42px;
-    font-weight: 600;
+    font-weight: 700;
 }
 
 h2 {
     margin: 1.5em 0 0.5em 0;
     font-size: 32px;
-    line-height: 1.22em;
 }
 
 h3 {
     margin: 1.5em 0 0.5em 0;
     font-size: 26px;
-    line-height: 1.25em;
 }
 
 h4 {
     margin: 1.8em 0 0.5em 0;
     font-size: 21px;
-    line-height: 1.3em;
+    line-height: 1.2em;
 }
 
 h5 {
     margin: 2em 0 0.5em 0;
     font-size: 19px;
-    line-height: 1.4em;
+    line-height: 1.3em;
 }
 
 h6 {
     margin: 2em 0 0.5em 0;
     font-size: 19px;
-    line-height: 1.4em;
+    line-height: 1.3em;
     font-weight: 700;
 }
 
+h1 strong,
+h2 strong,
+h3 strong,
+h4 strong,
+h5 strong,
+h6 strong {
+    font-weight: 800;
+}
+
 strong {
     font-weight: 700;
 }
@@ -301,6 +308,10 @@ figure blockquote p {
 
 .site-info {
     padding-top: 50px;
+}
+
+.site-info-bordered {
+    padding-top: 50px;
     border-bottom: 1px solid #e5eff5;
 }
 
@@ -322,11 +333,12 @@ figure blockquote p {
     padding-bottom: 10px;
     font-size: 42px;
     line-height: 1.1em;
-    font-weight: 600;
+    font-weight: 700;
     text-align: center;
 }
 .post-title-serif {
     font-family: Georgia, serif;
+    letter-spacing: -0.01em;
 }
 .post-title-left {
     text-align: left;
@@ -388,7 +400,7 @@ figure blockquote p {
     font-family: Georgia, serif;
     font-size: 18px;
     line-height: 1.5em;
-    color: #23323D;
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
 }
@@ -397,7 +409,7 @@ figure blockquote p {
     max-width: 600px !important;
     font-size: 17px;
     line-height: 1.5em;
-    color: #23323D;
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
 }
@@ -711,7 +723,7 @@ a[data-flickr-embed] img {
 }
 
 .kg-header-card h3 strong {
-    font-weight: 600;
+    font-weight: 700;
 }
 
 .kg-header-card.kg-size-large h3 {
@@ -1148,7 +1160,7 @@ ${ templateSettings.showBadge ? `
 
                                     ${ templateSettings.showHeaderIcon || templateSettings.showHeaderTitle ? `
                                     <tr>
-                                        <td class="site-info" width="100%" align="center">
+                                        <td class="${templateSettings.showHeaderTitle ? `site-info-bordered` : `site-info`}" width="100%" align="center">
                                             <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                                                 ${ templateSettings.showHeaderIcon && site.iconUrl ? `
                                                 <tr>