ghost 5.8.3 → 5.9.2

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

@@ -672,7 +672,7 @@
                     "slug": "ghost-explore",
                     "name": "Ghost Explore",
                     "description": "Built-in Ghost Explore integration",
-                    "type": "builtin",
+                    "type": "core",
                     "api_keys": [{"type": "admin", "role": "Ghost Explore Integration"}]
                 },
                 {

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

@@ -319,7 +319,7 @@ module.exports = {
             maxlength: 50,
             nullable: false,
             defaultTo: 'custom',
-            validations: {isIn: [['internal', 'builtin', 'custom']]}
+            validations: {isIn: [['internal', 'builtin', 'custom', 'core']]}
         },
         name: {type: 'string', maxlength: 191, nullable: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
@@ -440,9 +440,9 @@ module.exports = {
         stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
         interval: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['month', 'year']]}},
         currency: {type: 'string', maxlength: 50, nullable: true},
-        discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount']]}},
+        discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount', 'trial']]}},
         discount_amount: {type: 'integer', nullable: false},
-        duration: {type: 'string', maxlength: 50, nullable: false},
+        duration: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['trial', 'once', 'repeating', 'forever']]}},
         duration_in_months: {type: 'integer', nullable: true},
         portal_title: {type: 'string', maxlength: 191, nullable: true},
         portal_description: {type: 'string', maxlength: 2000, nullable: true},

package/core/server/models/base/plugins/user-type.js

@@ -33,7 +33,7 @@ module.exports = function (Bookshelf) {
             options = options || {};
             options.context = options.context || {};
 
-            if (options.context.user || Bookshelf.Model.isExternalUser(options.context.user)) {
+            if (options.context.user) {
                 return options.context.user;
             } else if (options.context.integration) {
             /**
@@ -64,8 +64,6 @@ module.exports = function (Bookshelf) {
                 return Bookshelf.Model.internalUser;
             } else if (this.get('id')) {
                 return this.get('id');
-            } else if (options.context.external) {
-                return Bookshelf.Model.externalUser;
             } else {
                 throw new errors.NotFoundError({
                     message: tpl(messages.missingContext),
@@ -80,15 +78,9 @@ module.exports = function (Bookshelf) {
          * context.user ? true : false (if context.user is 0 as number, this condition is false)
          */
         internalUser: 1,
-        externalUser: 0,
 
         isInternalUser: function isInternalUser(id) {
             return id === Bookshelf.Model.internalUser || id === Bookshelf.Model.internalUser.toString();
-        },
-
-        isExternalUser: function isExternalUser(id) {
-            return id === Bookshelf.Model.externalUser || id === Bookshelf.Model.externalUser.toString();
         }
-
     });
 };

package/core/server/models/comment.js

@@ -8,8 +8,7 @@ const messages = {
     emptyComment: 'The body of a comment cannot be empty',
     commentNotFound: 'Comment could not be found',
     notYourCommentToEdit: 'You may only edit your own comments',
-    notYourCommentToDestroy: 'You may only delete your own comments',
-    cannotEditDeletedComment: 'You may only edit published comments'
+    notYourCommentToDestroy: 'You may only delete your own comments'
 };
 
 /**
@@ -52,7 +51,10 @@ const Comment = ghostBookshelf.Model.extend({
     },
 
     replies() {
-        return this.hasMany('Comment', 'parent_id');
+        return this.hasMany('Comment', 'parent_id', 'id')
+            .query('orderBy', 'created_at', 'ASC')
+            // Note: this limit is not working
+            .query('limit', 3);
     },
 
     emitChange: function emitChange(event, options) {
@@ -63,12 +65,6 @@ const Comment = ghostBookshelf.Model.extend({
     onSaving() {
         ghostBookshelf.Model.prototype.onSaving.apply(this, arguments);
 
-        if (this.hasChanged('html') && this.get('status') !== 'published') {
-            throw new ValidationError({
-                message: tpl(messages.cannotEditDeletedComment)
-            });
-        }
-
         if (this.hasChanged('html')) {
             const sanitizeHtml = require('sanitize-html');
 
@@ -105,13 +101,16 @@ const Comment = ghostBookshelf.Model.extend({
     },
 
     enforcedFilters: function enforcedFilters(options) {
-        if (options.context && options.context.user) {
-            return null;
+        // Convenicence option to merge all filters with parent_id:null filter
+        if (options.parentId !== undefined) {
+            if (options.parentId === null) {
+                return 'parent_id:null';
+            }
+            return 'parent_id:' + options.parentId;
         }
 
-        return 'parent_id:null';
+        return null;
     }
-
 }, {
     destroy: function destroy(unfilteredOptions) {
         let options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
@@ -181,12 +180,94 @@ 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) {
+        if (['findAll', 'findPage', 'edit', 'findOne', 'destroy'].indexOf(methodName) !== -1) {
             if (!options.withRelated || options.withRelated.length === 0) {
-                options.withRelated = ['member', 'likes', 'replies', 'replies.member', 'replies.likes'];
+                if (options.parentId) {
+                    // Do not include replies for replies
+                    options.withRelated = [
+                        // Relations
+                        'member', 'count.likes', 'count.liked'
+                    ];
+                } else {
+                    options.withRelated = [
+                        // Relations
+                        'member', 'count.replies', 'count.likes', 'count.liked',
+                        // Replies (limited to 3)
+                        'replies', 'replies.member' , 'replies.count.likes', 'replies.count.liked'
+                    ];
+                }
             }
         }
 
+        return options;
+    },
+
+    async findPage(options) {
+        const {withRelated} = this.defaultRelations('findPage', options);
+
+        const relationsToLoadIndividually = [
+            'replies',
+            'replies.member',
+            'replies.count.likes',
+            'replies.count.liked'
+        ].filter(relation => withRelated.includes(relation));
+
+        const result = await ghostBookshelf.Model.findPage.call(this, options);
+
+        for (const model of result.data) {
+            await model.load(relationsToLoadIndividually, _.omit(options, 'withRelated'));
+        }
+
+        return result;
+    },
+
+    countRelations() {
+        return {
+            replies(modelOrCollection) {
+                modelOrCollection.query('columns', 'comments.*', (qb) => {
+                    qb.count('replies.id')
+                        .from('comments AS replies')
+                        .whereRaw('replies.parent_id = comments.id')
+                        .as('count__replies');
+                });
+            },
+            likes(modelOrCollection) {
+                modelOrCollection.query('columns', 'comments.*', (qb) => {
+                    qb.count('comment_likes.id')
+                        .from('comment_likes')
+                        .whereRaw('comment_likes.comment_id = comments.id')
+                        .as('count__likes');
+                });
+            },
+            liked(modelOrCollection, options) {
+                modelOrCollection.query('columns', 'comments.*', (qb) => {
+                    if (options.context && options.context.member && options.context.member.id) {
+                        qb.count('comment_likes.id')
+                            .from('comment_likes')
+                            .whereRaw('comment_likes.comment_id = comments.id')
+                            .where('comment_likes.member_id', options.context.member.id)
+                            .as('count__liked');
+                        return;
+                    }
+
+                    // Return zero
+                    qb.select(ghostBookshelf.knex.raw('0')).as('count__liked');
+                });
+            }
+        };
+    },
+
+    /**
+     * Returns an array of keys permitted in a method's `options` hash, depending on the current method.
+     * @param {String} methodName The name of the method to check valid options for.
+     * @return {Array} Keys allowed in the `options` hash of the model's method.
+     */
+    permittedOptions: function permittedOptions(methodName) {
+        let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
+
+        // The comment model additionally supports having a parentId option
+        options.push('parentId');
+
         return options;
     }
 });

package/core/server/models/label.js

@@ -107,6 +107,20 @@ Label = ghostBookshelf.Model.extend({
         return options;
     },
 
+    countRelations() {
+        return {
+            members(modelOrCollection) {
+                modelOrCollection.query('columns', 'labels.*', (qb) => {
+                    qb.count('members.id')
+                        .from('members')
+                        .leftOuterJoin('members_labels', 'members.id', 'members_labels.member_id')
+                        .whereRaw('members_labels.label_id = labels.id')
+                        .as('count__members');
+                });
+            }
+        };
+    },
+
     destroy: function destroy(unfilteredOptions) {
         const options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
         options.withRelated = ['members'];

package/core/server/models/newsletter.js

@@ -126,6 +126,27 @@ const Newsletter = ghostBookshelf.Model.extend({
         return options;
     },
 
+    countRelations() {
+        return {
+            posts(modelOrCollection) {
+                modelOrCollection.query('columns', 'newsletters.*', (qb) => {
+                    qb.count('posts.id')
+                        .from('posts')
+                        .whereRaw('posts.newsletter_id = newsletters.id')
+                        .as('count__posts');
+                });
+            },
+            members(modelOrCollection) {
+                modelOrCollection.query('columns', 'newsletters.*', (qb) => {
+                    qb.count('members_newsletters.id')
+                        .from('members_newsletters')
+                        .whereRaw('members_newsletters.newsletter_id = newsletters.id')
+                        .as('count__members');
+                });
+            }
+        };
+    },
+
     orderDefaultRaw: function () {
         return 'sort_order ASC, created_at ASC, id ASC';
     },

package/core/server/models/tag.js

@@ -182,6 +182,26 @@ Tag = ghostBookshelf.Model.extend({
         return options;
     },
 
+    countRelations() {
+        return {
+            posts(modelOrCollection, options) {
+                modelOrCollection.query('columns', 'tags.*', (qb) => {
+                    qb.count('posts.id')
+                        .from('posts')
+                        .leftOuterJoin('posts_tags', 'posts.id', 'posts_tags.post_id')
+                        .whereRaw('posts_tags.tag_id = tags.id')
+                        .as('count__posts');
+
+                    if (options.context && options.context.public) {
+                        // @TODO use the filter behavior for posts
+                        qb.andWhere('posts.type', '=', 'post');
+                        qb.andWhere('posts.status', '=', 'published');
+                    }
+                });
+            }
+        };
+    },
+
     destroy: function destroy(unfilteredOptions) {
         const options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
         options.withRelated = ['posts'];

package/core/server/models/user.js

@@ -426,6 +426,26 @@ User = ghostBookshelf.Model.extend({
         return permittedOptionsToReturn;
     },
 
+    countRelations() {
+        return {
+            posts(modelOrCollection, options) {
+                modelOrCollection.query('columns', 'users.*', (qb) => {
+                    qb.count('posts.id')
+                        .from('posts')
+                        .join('posts_authors', 'posts.id', 'posts_authors.post_id')
+                        .whereRaw('posts_authors.author_id = users.id')
+                        .as('count__posts');
+
+                    if (options.context && options.context.public) {
+                        // @TODO use the filter behavior for posts
+                        qb.andWhere('posts.type', '=', 'post');
+                        qb.andWhere('posts.status', '=', 'published');
+                    }
+                });
+            }
+        };
+    },
+
     /**
      * ### Find One
      *

package/core/server/services/auth/api-key/admin.js

@@ -127,11 +127,7 @@ const authenticateWithToken = async (req, res, next, {token, JWT_OPTIONS}) => {
 
         // CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
         if (limitService.isLimited('customIntegrations')
-            && (apiKey.relations.integration
-                && !['internal'].includes(apiKey.relations.integration.get('type'))
-                && !['ghost-explore'].includes(apiKey.relations.integration.get('slug'))
-            )
-        ) {
+            && (apiKey.relations.integration && !['internal', 'core'].includes(apiKey.relations.integration.get('type')))) {
             // NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
             //       a concept of measuring if the limit has been surpassed
             await limitService.errorIfWouldGoOverLimit('customIntegrations');

package/core/server/services/auth/api-key/content.js

@@ -43,11 +43,7 @@ const authenticateContentApiKey = async function authenticateContentApiKey(req,
 
         // CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
         if (limitService.isLimited('customIntegrations')
-            && (apiKey.relations.integration
-                && !['internal'].includes(apiKey.relations.integration.get('type'))
-                && !['ghost-explore'].includes(apiKey.relations.integration.get('slug'))
-            )
-        ) {
+            && (apiKey.relations.integration && !['internal', 'core'].includes(apiKey.relations.integration.get('type')))) {
             // NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
             //       a concept of measuring if the limit has been surpassed
             await limitService.errorIfWouldGoOverLimit('customIntegrations');

package/core/server/services/bulk-email/bulk-email-processor.js

@@ -5,17 +5,19 @@ const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const models = require('../../models');
-const mailgunProvider = require('./mailgun');
+const MailgunClient = require('@tryghost/mailgun-client');
 const sentry = require('../../../shared/sentry');
 const labs = require('../../../shared/labs');
 const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
+const configService = require('../../../shared/config');
+const settingsCache = require('../../../shared/settings-cache');
 
 const messages = {
     error: 'The email service was unable to send an email batch.'
 };
 
-const BATCH_SIZE = mailgunProvider.BATCH_SIZE;
+const mailgunClient = new MailgunClient({config: configService, settings: settingsCache});
 
 /**
  * An object representing batch request result
@@ -64,7 +66,7 @@ class FailedBatch extends BatchResultBase {
  */
 
 module.exports = {
-    BATCH_SIZE,
+    BATCH_SIZE: MailgunClient.BATCH_SIZE,
     SuccessfulBatch,
     FailedBatch,
 
@@ -211,11 +213,12 @@ module.exports = {
      * @param {Email-like} emailData - The email to send, must be a POJO so emailModel.toJSON() before calling if needed
      * @param {[EmailRecipient]} recipients - The recipients to send the email to with their associated data
      * @param {string?} memberSegment - The member segment of the recipients
-     * @returns {Object} - {providerId: 'xxx'}
+     * @returns {Promise<Object>} - {providerId: 'xxx'}
      */
-    send(emailData, recipients, memberSegment) {
-        const mailgunInstance = mailgunProvider.getInstance();
-        if (!mailgunInstance) {
+    async send(emailData, recipients, memberSegment) {
+        const mailgunConfigured = mailgunClient.isConfigured();
+        if (!mailgunConfigured) {
+            logging.warn('Bulk email has not been configured');
             return;
         }
 
@@ -231,7 +234,7 @@ module.exports = {
             // static data for every recipient
             const data = {
                 unique_id: recipient.member_uuid,
-                unsubscribe_url: postEmailSerializer.createUnsubscribeUrl(recipient.member_uuid, newsletterUuid)
+                unsubscribe_url: postEmailSerializer.createUnsubscribeUrl(recipient.member_uuid, {newsletterUuid})
             };
 
             // computed properties on recipients - TODO: better way of handling these
@@ -247,10 +250,11 @@ module.exports = {
 
         emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
 
-        return mailgunProvider.send(emailData, recipientData, replacements).then((response) => {
+        try {
+            const response = await mailgunClient.send(emailData, recipientData, replacements);
             debug(`sent message (${Date.now() - startTime}ms)`);
             return response;
-        }).catch((error) => {
+        } catch (error) {
             // REF: possible mailgun errors https://documentation.mailgun.com/en/latest/api-intro.html#errors
             let ghostError = new errors.EmailError({
                 err: error,
@@ -263,6 +267,9 @@ module.exports = {
 
             debug(`failed to send message (${Date.now() - startTime}ms)`);
             throw ghostError;
-        });
-    }
+        }
+    },
+
+    // NOTE: for testing only!
+    _mailgunClient: mailgunClient
 };

package/core/server/services/bulk-email/index.js

@@ -1,17 +1 @@
-const {
-    BATCH_SIZE,
-    SuccessfulBatch,
-    FailedBatch,
-    processEmail,
-    processEmailBatch,
-    send
-} = require('./bulk-email-processor');
-
-module.exports = {
-    BATCH_SIZE,
-    SuccessfulBatch,
-    FailedBatch,
-    processEmail,
-    processEmailBatch,
-    send
-};
+module.exports = require('./bulk-email-processor');

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

@@ -1,3 +1,5 @@
+const _ = require('lodash');
+
 /**
  * @typedef {import('../../api/shared/frame')} Frame
  */
@@ -26,6 +28,13 @@ module.exports = class CommentsController {
         return this.service.getComments(frame.options);
     }
 
+    /**
+     * @param {Frame} frame
+     */
+    async replies(frame) {
+        return this.service.getReplies(frame.options.id, _.omit(frame.options, 'id'));
+    }
+
     /**
      * @param {Frame} frame
      */

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

@@ -94,7 +94,7 @@
       border-bottom-color: #EEF5F8;
     }
     a {
-      color: #3A464C;
+      color: #15212A;
     }
     </style>
   </head>
@@ -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="{{postUrl}}" target="_blank" style="font-weight: bold; text-decoration: underline;">{{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" style="font-weight: bold; text-decoration: underline; color: #15212A;">{{postTitle}}</a>.</p>
 
                         <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
                         <tbody>
@@ -174,7 +174,7 @@
                     </tr>
                     <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; padding-top: 2px">
-                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;"><a class="small" href="{{profileUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">Manage your email preferences</a></p>
+                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;"><a class="small" href="{{profileUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">Unsubscribe from comment reply notifications</a></p>
                       </td>
                     </tr>
 

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

@@ -9,5 +9,5 @@ ${data.postUrl}#ghost-comments
 ---
 
 Sent to ${data.toEmail} from ${data.siteDomain}.
-You can manage your notification preferences at ${data.profileUrl}.`;
+You can unsubscribe from these notifications at ${data.profileUrl}.`;
 };

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

@@ -94,7 +94,7 @@
       border-bottom-color: #EEF5F8;
     }
     a {
-      color: #3A464C;
+      color: #15212A;
     }
     </style>
   </head>
@@ -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="{{postUrl}}" target="_blank" style="font-weight: bold; text-decoration: underline;">{{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" style="font-weight: bold; text-decoration: underline; color: #15212A;">{{postTitle}}</a>.</p>
 
                         <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
                         <tbody>

package/core/server/services/comments/email-templates/report.hbs

@@ -94,7 +94,7 @@
       border-bottom-color: #EEF5F8;
     }
     a {
-      color: #3A464C;
+      color: #15212A;
     }
     </style>
   </head>
@@ -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;">{{reporter}} has reported the comment below on <a href="{{postUrl}}" target="_blank">{{postTitle}}</a>. This comment will remain visible until you choose to remove it, which can be done directly on the post.</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;">{{reporter}} has reported the comment below on <a href="{{postUrl}}" target="_blank" style="font-weight: bold; text-decoration: underline; color: #15212A;">{{postTitle}}</a>. This comment will remain visible until you choose to remove it, which can be done directly on the post.</p>
 
                         <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
                         <tbody>

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

@@ -2,6 +2,7 @@ const {promises: fs} = require('fs');
 const path = require('path');
 const moment = require('moment');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
+const postEmailSerializer = require('../mega/post-email-serializer');
 
 class CommentsServiceEmails {
     constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils}) {
@@ -93,7 +94,7 @@ class CommentsServiceEmails {
             accentColor: this.settingsCache.get('accent_color'),
             fromEmail: this.notificationFromAddress,
             toEmail: to,
-            profileUrl: `${this.urlUtils.getSiteUrl()}#/portal/account/profile`
+            profileUrl: postEmailSerializer.createUnsubscribeUrl(member.get('uuid'), {comments: true})
         };
 
         const {html, text} = await this.renderEmailTemplate('new-comment-reply', templateData);

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

@@ -115,7 +115,18 @@ class CommentsService {
      */
     async getComments(options) {
         this.checkEnabled();
-        const page = await this.models.Comment.findPage(options);
+        const page = await this.models.Comment.findPage({...options, parentId: null});
+
+        return page;
+    }
+
+    /**
+     * @param {string} id - The ID of the Comment to get replies from
+     * @param {any} options
+     */
+    async getReplies(id, options) {
+        this.checkEnabled();
+        const page = await this.models.Comment.findPage({...options, parentId: id});
 
         return page;
     }
@@ -181,7 +192,8 @@ class CommentsService {
             commentId: model.id
         }));
 
-        return model;
+        // Instead of returning the model, fetch it again, so we have all the relations properly fetched
+        return await this.models.Comment.findOne({id: model.id}, {...options, require: true});
     }
 
     /**
@@ -240,7 +252,8 @@ class CommentsService {
             commentId: model.id
         }));
 
-        return model;
+        // Instead of returning the model, fetch it again, so we have all the relations properly fetched
+        return await this.models.Comment.findOne({id: model.id}, {...options, require: true});
     }
 
     /**