ghost 5.4.1 → 5.7.0

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/migrations/versions/5.6/2022-07-27-13-40-change-explore-type.js

@@ -0,0 +1,24 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Changing Ghost Explore Integration to type "builtin"');
+        await knex('integrations')
+            .where({
+                name: 'Ghost Explore',
+                slug: 'ghost-explore'
+            })
+            .update('type', 'builtin');
+    },
+    async function down(knex) {
+        logging.info('Changing Ghost Explore Integration to type "internal"');
+
+        await knex('integrations')
+            .where({
+                name: 'Ghost Explore',
+                slug: 'ghost-explore'
+            })
+            .update('type', 'internal');
+    }
+);

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"
                 }
             ]
         },
@@ -667,7 +672,7 @@
                     "slug": "ghost-explore",
                     "name": "Ghost Explore",
                     "description": "Built-in Ghost Explore integration",
-                    "type": "internal",
+                    "type": "builtin",
                     "api_keys": [{"type": "admin", "role": "Ghost Explore Integration"}]
                 },
                 {

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/services/bulk-email/bulk-email-processor.js

@@ -7,6 +7,7 @@ const logging = require('@tryghost/logging');
 const models = require('../../models');
 const mailgunProvider = require('./mailgun');
 const sentry = require('../../../shared/sentry');
+const labs = require('../../../shared/labs');
 const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
 
@@ -170,6 +171,11 @@ module.exports = {
             // Load newsletter data on email
             await emailBatchModel.relations.email.getLazyRelation('newsletter', {require: false, ...knexOptions});
 
+            if (labs.isSet('newsletterPaywall')) {
+                // Load post data on email - for content gating on paywall
+                await emailBatchModel.relations.email.getLazyRelation('post', {require: false, ...knexOptions});
+            }
+
             // send the email
             const sendResponse = await this.send(emailBatchModel.relations.email.toJSON(), recipientRows, memberSegment);
 

package/core/server/services/comments/controller.js

@@ -0,0 +1,82 @@
+/**
+ * @typedef {import('../../api/shared/frame')} Frame
+ */
+
+const {MethodNotAllowedError} = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    cannotDestroyComments: 'You cannot destroy comments.'
+};
+
+module.exports = class CommentsController {
+    /**
+     * @param {import('./service')} service
+     */
+    constructor(service) {
+        this.service = service;
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async browse(frame) {
+        return this.service.getComments(frame.options);
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async read(frame) {
+        return await this.service.getCommentByID(frame.data.id, frame.options);
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async edit(frame) {
+        if (frame.data.comments[0].status === 'deleted') {
+            return await this.service.deleteComment(
+                frame.options.id,
+                frame?.options?.context?.member?.id,
+                frame.options
+            );
+        }
+
+        return await this.service.editCommentContent(
+            frame.options.id,
+            frame?.options?.context?.member?.id,
+            frame.data.comments[0].html,
+            frame.options
+        );
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async add(frame) {
+        const data = frame.data.comments[0];
+
+        if (data.parent_id) {
+            return await this.service.replyToComment(
+                data.parent_id,
+                frame.options.context.member.id,
+                data.html,
+                frame.options
+            );
+        }
+
+        return await this.service.commentOnPost(
+            data.post_id,
+            frame.options.context.member.id,
+            data.html,
+            frame.options
+        );
+    }
+
+    async destroy() {
+        throw new MethodNotAllowedError({
+            message: tpl(messages.cannotDestroyComments)
+        });
+    }
+};

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}.
     `;
 };