ghost 5.6.0 → 5.8.0

package/core/server/api/endpoints/utils/serializers/output/utils/post-gating.js

@@ -1,5 +1,5 @@
 const membersService = require('../../../../../../services/members');
-const htmlToPlaintext = require('../../../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
 // @TODO: reconsider the location of this - it's part of members and adds a property to the API
 const forPost = (attrs, frame) => {

package/core/server/data/migrations/versions/4.0/23-regenerate-posts-html.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const mobiledocLib = require('../../../../lib/mobiledoc');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
 module.exports = createIrreversibleMigration(async (knex) => {
     logging.info('Starting re-generation of posts html.');

package/core/server/data/migrations/versions/4.9/05-fix-missed-mobiledoc-url-transforms.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const urlUtils = require('../../../../../shared/url-utils');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const mobiledocLib = require('../../../../lib/mobiledoc');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/5.0/2022-05-21-00-00-regenerate-posts-html.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const mobiledocLib = require('../../../../lib/mobiledoc');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
 module.exports = createIrreversibleMigration(async (knex) => {
     logging.info(`Starting regeneration of posts HTML`);

package/core/server/data/migrations/versions/5.8/2022-08-02-06-09-add-trial-period-days-column-to-tiers.js

@@ -0,0 +1,8 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('products', 'trial_days', {
+    type: 'integer',
+    unsigned: true,
+    nullable: false,
+    defaultTo: 0
+});

package/core/server/data/migrations/versions/5.8/2022-08-03-15-28-add-trial-start-column-to-stripe-subscriptions.js

@@ -0,0 +1,6 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('members_stripe_customers_subscriptions', 'trial_start_at', {
+    type: 'dateTime',
+    nullable: true
+});

package/core/server/data/migrations/versions/5.8/2022-08-03-15-29-add-trial-end-column-to-stripe-subscriptions.js

@@ -0,0 +1,6 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('members_stripe_customers_subscriptions', 'trial_end_at', {
+    type: 'dateTime',
+    nullable: true
+});

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

@@ -422,6 +422,7 @@ module.exports = {
             defaultTo: 'none',
             validations: {isIn: [['public', 'none']]}
         },
+        trial_days: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
         monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
         yearly_price_id: {type: 'string', maxlength: 24, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},
@@ -584,6 +585,8 @@ module.exports = {
         updated_by: {type: 'string', maxlength: 24, nullable: true},
         mrr: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
         offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
+        trial_start_at: {type: 'dateTime', nullable: true},
+        trial_end_at: {type: 'dateTime', nullable: true},
         /* Below fields are now redundant as we link prie_id to stripe_prices table */
         plan_id: {type: 'string', maxlength: 255, nullable: false, unique: false},
         plan_nickname: {type: 'string', maxlength: 50, nullable: false},

package/core/server/ghost-server.js

@@ -137,7 +137,14 @@ class GhostServer {
      * Called on SIGINT or SIGTERM
      */
     async shutdown(code = 0) {
+        // Prevent this function being run multiple times by checking whether we're
+        // already shutting down
+        if (this.isShuttingDown) {
+            return;
+        }
+
         try {
+            this.isShuttingDown = true;
             logging.warn(tpl(messages.ghostIsShuttingDown));
             await this.stop();
             setTimeout(() => {

package/core/server/models/base/index.js

@@ -1,6 +1,6 @@
 // # Base Model
 // This is the model from which all other Ghost models extend. The model is based on Bookshelf.Model, and provides
-// several basic behaviours such as UUIDs, as well as a set of Data methods for accessing information from the database.
+// several basic behaviors such as UUIDs, as well as a set of Data methods for accessing information from the database.
 //
 // The models are internal to Ghost, only the API and some internal functions such as migration and import/export
 // accesses the models directly.

package/core/server/models/base/plugins/filtered-collection.js

@@ -6,13 +6,13 @@ module.exports = function (Bookshelf) {
         getFilteredCollection: function getFilteredCollection(options) {
             const filteredCollection = this.forge();
 
-            // Apply model-specific query behaviour
+            // Apply model-specific query behavior
             filteredCollection.applyCustomQuery(options);
 
-            // Add Filter behaviour
+            // Add Filter behavior
             filteredCollection.applyDefaultAndCustomFilters(options);
 
-            // Apply model-specific search behaviour
+            // Apply model-specific search behavior
             filteredCollection.applySearchQuery(options);
 
             return filteredCollection;

package/core/server/models/comment.js

@@ -2,13 +2,29 @@ const ghostBookshelf = require('./base');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
+const {ValidationError} = require('@tryghost/errors');
 
 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'
 };
 
+/**
+ * Remove empty paragraps from the start and end
+ * + remove duplicate empty paragrapsh (only one empty line allowed)
+ */
+function trimParagraphs(str) {
+    const paragraph = '<p></p>';
+    const escapedParagraph = '<p>\\s*?</p>';
+
+    const startReg = new RegExp('^(' + escapedParagraph + ')+');
+    const endReg = new RegExp('(' + escapedParagraph + ')+$');
+    const duplicates = new RegExp('(' + escapedParagraph + ')+');
+    return str.replace(startReg, '').replace(endReg, '').replace(duplicates, paragraph);
+}
+
 const Comment = ghostBookshelf.Model.extend({
     tableName: 'comments',
 
@@ -49,20 +65,29 @@ const Comment = ghostBookshelf.Model.extend({
         if (this.hasChanged('html')) {
             const sanitizeHtml = require('sanitize-html');
 
-            this.set('html', sanitizeHtml(this.get('html'), {
-                allowedTags: ['p', 'br', 'a', 'blockquote'],
-                allowedAttributes: {
-                    a: ['href', 'target', 'rel']
-                },
-                selfClosing: ['br'],
-                // Enforce _blank and safe URLs
-                transformTags: {
-                    a: sanitizeHtml.simpleTransform('a', {
-                        target: '_blank', 
-                        rel: 'ugc noopener noreferrer nofollow'
-                    })
-                }
-            }));
+            const html = trimParagraphs(
+                sanitizeHtml(this.get('html'), {
+                    allowedTags: ['p', 'br', 'a', 'blockquote'],
+                    allowedAttributes: {
+                        a: ['href', 'target', 'rel']
+                    },
+                    selfClosing: ['br'],
+                    // Enforce _blank and safe URLs
+                    transformTags: {
+                        a: sanitizeHtml.simpleTransform('a', {
+                            target: '_blank', 
+                            rel: 'ugc noopener noreferrer nofollow'
+                        })
+                    }
+                })
+            ).trim();
+
+            if (html.length === 0) {
+                throw new ValidationError({
+                    message: tpl(messages.emptyComment)
+                });
+            }
+            this.set('html', html);
         }
     },
 

package/core/server/models/post.js

@@ -7,7 +7,7 @@ const {sequence} = require('@tryghost/promise');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const nql = require('@tryghost/nql');
-const htmlToPlaintext = require('../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const ghostBookshelf = require('./base');
 const config = require('../../shared/config');
 const settingsCache = require('../../shared/settings-cache');

package/core/server/models/product.js

@@ -6,7 +6,8 @@ const Product = ghostBookshelf.Model.extend({
 
     defaults: {
         active: true,
-        visibility: 'none'
+        visibility: 'none',
+        trial_days: 0
     },
 
     relationships: ['benefits'],

package/core/server/models/tag.js

@@ -103,7 +103,7 @@ Tag = ghostBookshelf.Model.extend({
         // Support tag creation with `posts: [{..., tags: [{slug: 'new'}]}]`
         // In that situation we have a slug but no name so validation will fail
         // unless we set one automatically. Re-using slug for name matches our
-        // opposite name->slug behaviour.
+        // opposite name->slug behavior.
         if (!newTag.get('name') && newTag.get('slug')) {
             this.set('name', newTag.get('slug'));
         }

package/core/server/models/user.js

@@ -234,7 +234,7 @@ User = ghostBookshelf.Model.extend({
          *   - we do some pre-validation checks, because onValidate is called AFTER onSaving
          *   - when importing, we set the password to a random uid and don't validate, just hash it and lock the user
          *   - when importing with `importPersistUser` we check if the password is a bcrypt hash already and fall back to
-         *     normal behaviour if not (set random password, lock user, and hash password)
+         *     normal behavior if not (set random password, lock user, and hash password)
          *   - no validations should run, when importing
          */
         if (self.hasChanged('password')) {
@@ -242,7 +242,7 @@ User = ghostBookshelf.Model.extend({
 
             // CASE: import with `importPersistUser` should always be an bcrypt password already,
             // and won't re-hash or overwrite it.
-            // In case the password is not bcrypt hashed we fall back to the standard behaviour.
+            // In case the password is not bcrypt hashed we fall back to the standard behavior.
             if (options.importPersistUser && this.get('password').match(/^\$2[ayb]\$.{56}$/i)) {
                 return;
             }

package/core/server/services/adapter-manager/index.js

@@ -15,11 +15,12 @@ const adapterManager = new AdapterManager({
 adapterManager.registerAdapter('storage', require('ghost-storage-base'));
 adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/SchedulingBase'));
 adapterManager.registerAdapter('sso', require('../../adapters/sso/Base'));
+adapterManager.registerAdapter('cache', require('../../adapters/cache/Base'));
 
 module.exports = {
     /**
      *
-     * @param {String} name - one of 'storage', 'scheduling', 'sso' etc. Or can contain a "resource" extension like "storage:image"
+     * @param {String} name - one of 'storage', 'scheduling', 'sso', 'cache' etc. Or can contain a "resource" extension like "storage:image"
      * @returns {Object} instance of an adapter
      */
     getAdapter(name) {

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

@@ -12,9 +12,11 @@ const messages = {
 module.exports = class CommentsController {
     /**
      * @param {import('./service')} service
+     * @param {import('./stats')} stats
      */
-    constructor(service) {
+    constructor(service, stats) {
         this.service = service;
+        this.stats = stats;
     }
 
     /**
@@ -79,4 +81,12 @@ module.exports = class CommentsController {
             message: tpl(messages.cannotDestroyComments)
         });
     }
+
+    async count(frame) {
+        if (!frame?.data?.ids) {
+            return await this.stats.getAllCounts();
+        }
+
+        return await this.stats.getCountsByPost(frame.data.ids);
+    }
 };

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

@@ -106,7 +106,7 @@
           <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;">
 
             <!-- START CENTERED CONTAINER -->
-            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Someone left a comment on your post</span>
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Someone just replied to your comment</span>
             <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
 
               <!-- START MAIN CONTENT AREA -->
@@ -116,20 +116,18 @@
                     <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">{{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;">{{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;">
+                        <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>
                             <tr>
                                 <td align="left" style="padding: 16px;">
                                     <table border="0" cellpadding="0" cellspacing="0">
                                         <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: 16px; padding-right: 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" width="44" height="44" style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px;">
-                                                    <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: 18px; color: #FFFFFF; text-align: center; font-weight: 500; height: 44px; width: 44px;">{{memberInitials}}</td>
-                                                    </tr>
-                                                </table>
+                                            <td style="padding-right: 8px;">
+                                                <div style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px; 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: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 42px;">
+                                                    {{memberInitials}}
+                                                </div>
                                             </td>
                                             <td style="padding-right: 8px;">
                                                 <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberName}}</p>
@@ -154,7 +152,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                                   <tbody>
                                     <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments-root" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comments</a> </td>
+                                      <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comments</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -164,7 +162,7 @@
                         </table>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments-root</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments</p>
                       </td>
                     </tr>
 

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

@@ -4,7 +4,7 @@ module.exports = function (data) {
 
 Someone just replied to your comment on "${data.postTitle}"
 
-${data.postUrl}#ghost-comments-root
+${data.postUrl}#ghost-comments
 
 ---
 

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

@@ -116,20 +116,18 @@
                     <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">{{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;">{{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;">
+                        <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>
                             <tr>
                                 <td align="left" style="padding: 16px;">
                                   <table border="0" cellpadding="0" cellspacing="0">
                                         <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: 16px; padding-right: 8px;">
-                                              <table border="0" cellpadding="0" cellspacing="0" width="44" height="44" style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px;">
-                                                    <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: 18px; color: #FFFFFF; text-align: center; font-weight: 500; height: 44px; width: 44px;">{{memberInitials}}</td>
-                                                    </tr>
-                                                </table>
+                                            <td style="padding-right: 8px;">
+                                                <div style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px; 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: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 42px;">
+                                                    {{memberInitials}}
+                                                </div>
                                             </td>
                                             <td style="padding-right: 8px;">
                                                 <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberName}}</p>
@@ -154,7 +152,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                                   <tbody>
                                     <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments-root" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comments</a> </td>
+                                      <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comments</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -164,7 +162,7 @@
                         </table>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments-root</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments</p>
                       </td>
                     </tr>
 

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

@@ -5,7 +5,7 @@ Hey there,
 
 Someone just posted a comment on your post "${data.postTitle}"
 
-${data.postUrl}#ghost-comments-root
+${data.postUrl}#ghost-comments
 
 ---
 

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

@@ -118,18 +118,16 @@
                         <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>
 
-                        <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;">
+                        <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>
                             <tr>
                                 <td align="left" style="padding: 16px;">
                                   <table border="0" cellpadding="0" cellspacing="0">
                                         <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: 16px; padding-right: 8px;">
-                                              <table border="0" cellpadding="0" cellspacing="0" width="44" height="44" style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px;">
-                                                    <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: 18px; color: #FFFFFF; text-align: center; font-weight: 500; height: 44px; width: 44px;">{{memberInitials}}</td>
-                                                    </tr>
-                                                </table>
+                                            <td style="padding-right: 8px;">
+                                                <div style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px; 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: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 42px;">
+                                                    {{memberInitials}}
+                                                </div>
                                             </td>
                                             <td style="padding-right: 8px;">
                                                 <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberName}}</p>
@@ -154,7 +152,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                                   <tbody>
                                     <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments-root" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comment</a> </td>
+                                      <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: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comment</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -164,7 +162,7 @@
                         </table>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments-root</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments</p>
                       </td>
                     </tr>
 

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

@@ -7,7 +7,7 @@ ${data.reporter} has reported the comment below on ${data.postTitle}. This comme
 ${data.memberName} (${data.memberEmail}):
 ${data.commentText}
 
-${data.postUrl}#ghost-comments-root
+${data.postUrl}#ghost-comments
 
 ---
 

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

@@ -1,7 +1,7 @@
 const {promises: fs} = require('fs');
 const path = require('path');
 const moment = require('moment');
-const htmlToPlaintext = require('../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
 class CommentsServiceEmails {
     constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils}) {
@@ -26,7 +26,7 @@ class CommentsServiceEmails {
             }
 
             const to = author.get('email');
-            const subject = '💬 You have a new comment on one of your posts';
+            const subject = '💬 New comment on your post: ' + post.get('title');
 
             const memberName = member.get('name') || 'Anonymous';
 
@@ -72,7 +72,7 @@ class CommentsServiceEmails {
         }
 
         const to = parentMember.get('email');
-        const subject = '💬 You have a new reply on one of your comments';
+        const subject = '↪️ New reply to your comment on ' + this.settingsCache.get('title');
 
         const post = await this.models.Post.findOne({id: reply.get('post_id')});
         const member = await this.models.Member.findOne({id: reply.get('member_id')});
@@ -129,7 +129,7 @@ class CommentsServiceEmails {
             postTitle: post.get('title'),
             postUrl: this.urlService.getUrlByResourceId(post.get('id'), {absolute: true}),
             commentHtml: comment.get('html'),
-            commentText: htmlToPlaintext.email(comment.get('html')),
+            commentText: htmlToPlaintext.comment(comment.get('html')),
             commentDate: moment(comment.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
             
             reporterName: reporter.name,

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

@@ -2,6 +2,7 @@ class CommentsServiceWrapper {
     init() {
         const CommentsService = require('./service');
         const CommentsController = require('./controller');
+        const CommentsStats = require('./stats');
 
         const config = require('../../../shared/config');
         const logging = require('@tryghost/logging');
@@ -12,6 +13,7 @@ class CommentsServiceWrapper {
         const urlService = require('../url');
         const urlUtils = require('../../../shared/url-utils');
         const membersService = require('../members');
+        const db = require('../../data/db');
 
         this.api = new CommentsService({
             config,
@@ -24,7 +26,9 @@ class CommentsServiceWrapper {
             contentGating: membersService.contentGating
         });
 
-        this.controller = new CommentsController(this.api);
+        const stats = new CommentsStats({db});
+
+        this.controller = new CommentsController(this.api, stats);
     }
 }
 

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

@@ -0,0 +1,44 @@
+module.exports = class CommentsStatsService {
+    constructor(deps) {
+        this.db = deps.db;
+    }
+
+    /**
+     * @param {string[]} ids - List of post ids to fetch counts for
+     * @returns {Promise<Object<string, number>>}
+     */
+    async getCountsByPost(ids) {
+        const results = await this.db.knex('comments')
+            .select(this.db.knex.raw(`COUNT(*) AS count, post_id`))
+            .groupBy('post_id')
+            .whereIn('post_id', ids);
+
+        const counts = ids.reduce((memo, id) => {
+            const result = results.find(x => x.post_id === id);
+            return {
+                ...memo,
+                [id]: result?.count || 0
+            };
+        }, {});
+
+        return counts;
+    }
+
+    /**
+     * @returns {Promise<Object<string, number>>}
+     */
+    async getAllCounts() {
+        const results = await this.db.knex('comments')
+            .select(this.db.knex.raw(`COUNT(*) AS count, post_id`))
+            .groupBy('post_id');
+
+        /** @type Object<string, number> */
+        let counts = {};
+
+        for (const row of results) {
+            counts[row.post_id] = row.count;
+        }
+
+        return counts;
+    }
+};

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

@@ -104,7 +104,7 @@ const sendTestEmail = async (postModel, toEmails, memberSegment) => {
         };
     }));
 
-    // enable tracking for previews to match real-world behaviour
+    // enable tracking for previews to match real-world behavior
     emailData.track_opens = !!settingsCache.get('email_track_opens');
 
     const response = await bulkEmailService.send(emailData, recipients, memberSegment);