ghost 5.3.1 → 5.5.0

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

@@ -1,6 +1,7 @@
 //@ts-check
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:members');
 const {unparse} = require('@tryghost/members-csv');
+const mappers = require('./mappers');
 
 module.exports = {
     browse: createSerializer('browse', paginatedMembers),
@@ -18,7 +19,7 @@ module.exports = {
     importCSV: createSerializer('importCSV', passthrough),
     memberStats: createSerializer('memberStats', passthrough),
     mrrStats: createSerializer('mrrStats', passthrough),
-    activityFeed: createSerializer('activityFeed', passthrough)
+    activityFeed: createSerializer('activityFeed', activityFeed)
 };
 
 /**
@@ -73,6 +74,16 @@ function bulkAction(bulkActionResult, _apiConfig, frame) {
     };
 }
 
+/**
+ *
+ * @returns {{events: any[]}}
+ */
+function activityFeed(data, _apiConfig, frame) {
+    return {
+        events: data.events.map(e => mappers.activityFeedEvents(e, frame))
+    };
+}
+
 /**
  * @template PageMeta
  *

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

@@ -52,7 +52,7 @@ function serializeSettings(models, apiConfig, frame) {
 
     frame.response = {
         settings: mappers.settings(filteredSettings),
-        meta: {}
+        meta: models.meta ?? {}
     };
 
     if (frame.options.group) {
@@ -89,6 +89,7 @@ module.exports = {
     browse: serializeSettings,
     read: serializeSettings,
     edit: serializeSettings,
+    verifyKeyUpdate: serializeSettings,
 
     download: serializeData,
     upload: serializeData,

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

@@ -2,11 +2,12 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const {ValidationError, BadRequestError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
+const tpl = require('@tryghost/tpl');
 
 const messages = {
     invalidEmailReceived: 'Please send a valid email',
-    invalidEmailTypeReceived: 'Invalid email type received',
-    problemFindingSetting: 'Problem finding setting: {key}'
+    invalidEmailValueReceived: 'Please enter a valid email address.',
+    invalidEmailTypeReceived: 'Invalid email type received'
 };
 
 module.exports = {
@@ -22,6 +23,10 @@ module.exports = {
                 'secondary_navigation'
             ];
 
+            const emailTypeSettings = [
+                'members_support_address'
+            ];
+
             if (arrayTypeSettings.includes(setting.key)) {
                 const typeError = new ValidationError({
                     message: `Value in ${setting.key} should be an array.`,
@@ -43,6 +48,18 @@ module.exports = {
                     }
                 }
             }
+
+            if (emailTypeSettings.includes(setting.key)) {
+                const email = setting.value;
+
+                if (typeof email !== 'string' || (!validator.isEmail(email) && email !== 'noreply')) {
+                    const typeError = new ValidationError({
+                        message: tpl(messages.invalidEmailValueReceived),
+                        property: setting.key
+                    });
+                    errors.push(typeError);
+                }
+            }
         });
 
         // Prevent setting icon to the resized one when sending all settings received from browse again in the edit endpoint
@@ -56,6 +73,9 @@ module.exports = {
         }
     },
 
+    /**
+     * @deprecated
+     */
     updateMembersEmail(apiConfig, frame) {
         const {email, type} = frame.data;
 

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

@@ -34,7 +34,8 @@ const BACKUP_TABLES = [
     'members_newsletters',
     'comments',
     'comment_likes',
-    'comment_reports'
+    'comment_reports',
+    'jobs'
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file

package/core/server/data/migrations/versions/5.5/2022-07-18-14-29-add-comment-reporting-permissions.js

@@ -0,0 +1,10 @@
+const {addPermissionWithRoles} = require('../../utils');
+
+module.exports = addPermissionWithRoles({
+    name: 'Report comments',
+    action: 'report',
+    object: 'comment'
+}, [
+    'Administrator',
+    'Admin Integration'
+]);

package/core/server/data/migrations/versions/5.5/2022-07-18-14-31-drop-reports-reason.js

@@ -0,0 +1,3 @@
+const {createDropColumnMigration} = require('../../utils');
+
+module.exports = createDropColumnMigration('comment_reports', 'reason', {type: 'text', maxlength: 65535, nullable: false});

package/core/server/data/migrations/versions/5.5/2022-07-18-14-32-drop-nullable-member-id-from-likes.js

@@ -0,0 +1,4 @@
+const {createDropNullableMigration} = require('../../utils');
+
+// We need to disable foreign key checks because if MySQL is missing the STRICT_TRANS_TABLES mode, we cannot drop nullable from a foreign key
+module.exports = createDropNullableMigration('comment_likes', 'member_id', {disableForeignKeyChecks: true});

package/core/server/data/migrations/versions/5.5/2022-07-18-14-33-fix-comments-on-delete-foreign-keys.js

@@ -0,0 +1,119 @@
+const {addForeign, dropForeign} = require('../../../schema/commands');
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Adding on delete SET NULL for comments');
+    
+        await dropForeign({
+            fromTable: 'comments',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comments',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            setNullDelete: true,
+            transaction: knex
+        });
+    
+        logging.info('Adding on delete CASCADE for comment_likes');
+    
+        await dropForeign({
+            fromTable: 'comment_likes',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comment_likes',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            cascadeDelete: true,
+            transaction: knex
+        });
+    
+        logging.info('Adding on delete SET NULL for comment_reports');
+    
+        await dropForeign({
+            fromTable: 'comment_reports',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comment_reports',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            setNullDelete: true,
+            transaction: knex
+        });
+    }, 
+    async function down(knex) {
+        logging.info('Restoring foreign key for comments');
+    
+        await dropForeign({
+            fromTable: 'comments',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comments',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        logging.info('Restoring foreign key for comment_likes');
+    
+        await dropForeign({
+            fromTable: 'comment_likes',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comment_likes',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        logging.info('Restoring foreign key for comment_reports');
+    
+        await dropForeign({
+            fromTable: 'comment_reports',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    
+        await addForeign({
+            fromTable: 'comment_reports',
+            fromColumn: 'member_id',
+            toTable: 'members',
+            toColumn: 'id',
+            transaction: knex
+        });
+    }
+);

package/core/server/data/migrations/versions/5.5/2022-07-21-08-56-add-jobs-table.js

@@ -0,0 +1,11 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('jobs', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'queued', validations: {isIn: [['started', 'finished', 'failed', 'queued']]}},
+    started_at: {type: 'dateTime', nullable: true},
+    finished_at: {type: 'dateTime', nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});

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

@@ -50,6 +50,8 @@ function addTableColumn(tableName, table, columnName, columnSpec = schema[tableN
     }
     if (Object.prototype.hasOwnProperty.call(columnSpec, 'cascadeDelete') && columnSpec.cascadeDelete === true) {
         column.onDelete('CASCADE');
+    } else if (Object.prototype.hasOwnProperty.call(columnSpec, 'setNullDelete') && columnSpec.setNullDelete === true) {
+        column.onDelete('SET NULL');
     }
     if (Object.prototype.hasOwnProperty.call(columnSpec, 'defaultTo')) {
         column.defaultTo(columnSpec.defaultTo);
@@ -206,10 +208,11 @@ async function hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, trans
  * @param {string} configuration.fromColumn - column of the table to add the foreign key to
  * @param {string} configuration.toTable - name of the table to point the foreign key to
  * @param {string} configuration.toColumn - column of the table to point the foreign key to
- * @param {Boolean} configuration.cascadeDelete - adds the "on delete cascade" option if true
+ * @param {Boolean} [configuration.cascadeDelete] - adds the "on delete cascade" option if true
+ * @param {Boolean} [configuration.setNullDelete] - adds the "on delete SET NULL" option if true
  * @param {import('knex')} configuration.transaction - connection object containing knex reference
  */
-async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDelete = false, transaction = db.knex}) {
+async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDelete = false, setNullDelete = false, transaction = db.knex}) {
     if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (foreignKeyExists) {
@@ -232,6 +235,8 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
         await transaction.schema.table(fromTable, function (table) {
             if (cascadeDelete) {
                 table.foreign(fromColumn).references(`${toTable}.${toColumn}`).onDelete('CASCADE');
+            } else if (setNullDelete) {
+                table.foreign(fromColumn).references(`${toTable}.${toColumn}`).onDelete('SET NULL');
             } else {
                 table.foreign(fromColumn).references(`${toTable}.${toColumn}`);
             }

package/core/server/data/schema/fixtures/fixtures.json

@@ -610,6 +610,11 @@
                     "name": "Unlike comments",
                     "action_type": "unlike",
                     "object_type": "comment"
+                },
+                {
+                    "name": "Report comments",
+                    "action_type": "report",
+                    "object_type": "comment"
                 }
             ]
         },

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

@@ -750,7 +750,7 @@ module.exports = {
     comments: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         post_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'posts.id', cascadeDelete: true},
-        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id'},
+        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
         parent_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'comments.id'},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'published', validations: {isIn: [['published', 'hidden', 'deleted']]}},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
@@ -761,16 +761,24 @@ module.exports = {
     comment_likes: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         comment_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'comments.id', cascadeDelete: true},
-        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id'},
+        member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: false}
     },
     comment_reports: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         comment_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'comments.id', cascadeDelete: true},
-        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id'},
-        reason: {type: 'text', maxlength: 65535, nullable: false},
+        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: false}
+    },
+    jobs: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+        status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'queued', validations: {isIn: [['started', 'finished', 'failed', 'queued']]}},
+        started_at: {type: 'dateTime', nullable: true},
+        finished_at: {type: 'dateTime', nullable: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
     }
 };

package/core/server/ghost-server.js

@@ -213,9 +213,6 @@ class GhostServer {
      * Internal Method for TestMode.
      */
     _startTestMode() {
-        // This is horrible and very temporary
-        const jobService = require('./services/jobs');
-
         // Output how many connections are open every 5 seconds
         const connectionInterval = setInterval(() => this.httpServer.getConnections(
             (err, connections) => logging.warn(`${connections} connections currently open`)
@@ -226,25 +223,6 @@ class GhostServer {
             clearInterval(connectionInterval);
             logging.warn('Server has fully closed');
         });
-
-        // Output job queue length every 5 seconds
-        setInterval(() => {
-            logging.warn(`${jobService.queue.length()} jobs in the queue. Idle: ${jobService.queue.idle()}`);
-
-            const runningScheduledjobs = Object.keys(jobService.bree.workers);
-            if (Object.keys(jobService.bree.workers).length) {
-                logging.warn(`${Object.keys(jobService.bree.workers).length} jobs running: ${runningScheduledjobs}`);
-            }
-
-            const scheduledJobs = Object.keys(jobService.bree.intervals);
-            if (Object.keys(jobService.bree.intervals).length) {
-                logging.warn(`${Object.keys(jobService.bree.intervals).length} scheduled jobs: ${scheduledJobs}`);
-            }
-
-            if (runningScheduledjobs.length === 0 && scheduledJobs.length === 0) {
-                logging.warn('No scheduled or running jobs');
-            }
-        }, 5000);
     }
 
     /**

package/core/server/models/comment-report.js

@@ -0,0 +1,34 @@
+const ghostBookshelf = require('./base');
+
+const CommentReport = ghostBookshelf.Model.extend({
+    tableName: 'comment_reports',
+
+    defaults: function defaults() {
+        return {};
+    },
+
+    comment() {
+        return this.belongsTo('Comment', 'comment_id');
+    },
+
+    member() {
+        return this.belongsTo('Member', 'member_id');
+    },
+
+    emitChange: function emitChange(event, options) {
+        const eventToTrigger = 'comment_report' + '.' + event;
+        ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
+    },
+
+    onCreated: function onCreated(model, options) {
+        ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
+
+        model.emitChange('added', options);
+    }
+}, {
+
+});
+
+module.exports = {
+    CommentReport: ghostBookshelf.model('CommentReport', CommentReport)
+};

package/core/server/models/comment.js

@@ -2,7 +2,6 @@ const ghostBookshelf = require('./base');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
-const commentsService = require('../services/comments');
 
 const messages = {
     commentNotFound: 'Comment could not be found',
@@ -70,14 +69,14 @@ const Comment = ghostBookshelf.Model.extend({
     onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
-        if (!options.context.internal) {
-            commentsService.api.sendNewCommentNotifications(model);
-        }
-
         model.emitChange('added', options);
     },
 
-    enforcedFilters: function enforcedFilters() {
+    enforcedFilters: function enforcedFilters(options) {
+        if (options.context && options.context.user) {
+            return null;
+        }
+
         return 'parent_id:null';
     }
 
@@ -151,7 +150,9 @@ const Comment = ghostBookshelf.Model.extend({
     defaultRelations: function defaultRelations(methodName, options) {
         // @todo: the default relations are not working for 'add' when we add it below
         if (['findAll', 'findPage', 'edit', 'findOne'].indexOf(methodName) !== -1) {
-            options.withRelated = _.union(['member', 'likes', 'replies', 'replies.member', 'replies.likes'], options.withRelated || []);
+            if (!options.withRelated || options.withRelated.length === 0) {
+                options.withRelated = ['member', 'likes', 'replies', 'replies.member', 'replies.likes'];
+            }
         }
 
         return options;

package/core/server/models/job.js

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

package/core/server/models/tag.js

@@ -154,6 +154,10 @@ Tag = ghostBookshelf.Model.extend({
             actor_id: actor.id,
             actor_type: actor.type
         };
+    },
+
+    defaultColumnsToFetch() {
+        return ['id'];
     }
 }, {
     orderDefaultOptions: function orderDefaultOptions() {

package/core/server/services/comments/email-templates/new-comment-reply.hbs

@@ -116,7 +116,7 @@
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there,</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 32px;">Someone just replied to your comment on <a href="https://ghost.org">{{postTitle}}</a>.</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 32px;">Someone just replied to your comment on <a href="{{postUrl}}" target="_blank">{{postTitle}}</a>.</p>
 
                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
                         <tbody>
@@ -196,4 +196,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>

package/core/server/services/comments/email-templates/new-comment-reply.txt.js

@@ -1,14 +1,13 @@
 module.exports = function (data) {
-    return `
-        Hey there,
+    // Be careful when you indent the email, because whitespaces are visible in emails!
+    return `Hey there,
 
-        Someone just replied to your comment on "${data.postTitle}"
+Someone just replied to your comment on "${data.postTitle}"
 
-        ${data.postUrl}#comments-area
+${data.postUrl}#ghost-comments-root
 
-        ---
+---
 
-        Sent to ${data.toEmail} from ${data.siteDomain}.
-        You can manage your notification preferences at ${data.profileUrl}.
-    `;
+Sent to ${data.toEmail} from ${data.siteDomain}.
+You can manage your notification preferences at ${data.profileUrl}.`;
 };

package/core/server/services/comments/email-templates/new-comment.hbs

@@ -116,7 +116,7 @@
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there,</p>
-                          <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 32px;">Someone just left a comment on your post <a href="https://ghost.org">{{postTitle}}</a>.</p>
+                          <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 32px;">Someone just left a comment on your post <a href="{{postUrl}}" target="_blank">{{postTitle}}</a>.</p>
 
                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
                         <tbody>
@@ -196,4 +196,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>

package/core/server/services/comments/email-templates/new-comment.txt.js

@@ -1,14 +1,15 @@
 module.exports = function (data) {
+    // Be careful when you indent the email, because whitespaces are visible in emails!
     return `
-        Hey there,
+Hey there,
 
-        Someone just posted a comment on your post "${data.postTitle}"
+Someone just posted a comment on your post "${data.postTitle}"
 
-        ${data.postUrl}#comments-area
+${data.postUrl}#ghost-comments-root
 
-        ---
+---
 
-        Sent to ${data.toEmail} from ${data.siteDomain}.
-        You can manage your notification preferences at ${data.staffUrl}.
+Sent to ${data.toEmail} from ${data.siteDomain}.
+You can manage your notification preferences at ${data.staffUrl}.
     `;
 };