npm - ghost - Versions diffs - 5.7.0 → 5.7.1 - Mend

ghost 5.7.0 → 5.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (403) hide show

package/core/built/{assets/vendor.min-4a6661c574707ceca220aa2e76558995.css → admin/production/assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css} RENAMED Viewed

@@ -1,20 +1,27 @@
 .ember-basic-dropdown {
-  position: relative; }
+  position: relative;
+}
-.ember-basic-dropdown, .ember-basic-dropdown-content, .ember-basic-dropdown-content * {
-  box-sizing: border-box; }
+.ember-basic-dropdown,
+.ember-basic-dropdown-content,
+.ember-basic-dropdown-content * {
+  box-sizing: border-box;
+}
 .ember-basic-dropdown-content {
   position: absolute;
   width: auto;
   z-index: 1000;
-  background-color: #FFF; }
+  background-color: #fff;
+}
 .ember-basic-dropdown-content--left {
-  left: 0; }
+  left: 0;
+}
 .ember-basic-dropdown-content--right {
-  right: 0; }
+  right: 0;
+}
 .ember-basic-dropdown-overlay {
   position: fixed;
@@ -24,11 +31,12 @@
   z-index: 10;
   top: 0;
   left: 0;
-  pointer-events: none; }
+  pointer-events: none;
+}
 .ember-basic-dropdown-content-wormhole-origin {
-  display: inline; }
+  display: inline;
+}
 .ember-basic-dropdown {
   position: relative; }

package/core/{server/web/admin/views/default.html → built/admin/production/index.html} RENAMED Viewed

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -36,28 +36,26 @@
         }
     </style>
-                <link rel="stylesheet" href="assets/vendor.min-4a6661c574707ceca220aa2e76558995.css">
-                <link rel="stylesheet" href="assets/ghost.min-8f5c061e0892b93adecc2b9e37ad2f3a.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-5f1b1d81fa8b9b6bfb0fb2b92ca60409.css" title="light">
 </head>
 <body>
-<div class="ember-load-indicator">
-    <div class="gh-loading-content">
-        <div class="gh-loading-spinner"></div>
+    <div class="ember-load-indicator">
+        <div class="gh-loading-content">
+            <div class="gh-loading-spinner"></div>
+        </div>
     </div>
-</div>
-<div id="ember-basic-dropdown-wormhole"></div>
+    <div id="ember-basic-dropdown-wormhole"></div>
-                <script src="assets/vendor.min-3dd40d3052381526f38fd290d13baa47.js"></script>
-                <script src="assets/ghost.min-ff9ba089fd81cb40831f4b62e63a2ca9.js"></script>
+    <script src="assets/vendor-39e3abc175134f5c42eaa7c4a2d6f479.js"></script>
+<script src="assets/chunk.599.628afe8bdebf6628418c.js"></script>
+<script src="assets/chunk.143.8ada616796634b355196.js"></script>
+    <script src="assets/ghost-9d8eda43a01eb17ac57c0edaeeb04c2f.js"></script>
 </body>
 </html>

package/core/frontend/helpers/comment_count.js CHANGED Viewed

@@ -1,25 +1,31 @@
 const {SafeString} = require('../services/handlebars');
 const {labs} = require('../services/proxy');
+const {html} = require('common-tags');
 function commentCount(options) {
-    return new SafeString(`
-       <span data-ghost-comment-count="${this.id}" style="display:none">
-           ${options.fn(this)}
-       </span>`
-    );
+    const empty = options.hash.empty === undefined ? '' : options.hash.empty;
+    const singular = options.hash.singular === undefined ? 'comment' : options.hash.singular;
+    const plural = options.hash.plural === undefined ? 'comments' : options.hash.plural;
+    return new SafeString(html`
+        <script
+            data-ghost-comment-count="${this.id}"
+            data-ghost-comment-count-empty="${empty}"
+            data-ghost-comment-count-singular="${singular}"
+            data-ghost-comment-count-plural="${plural}"
+        >
+        </script>
+    `);
 }
-module.exports = async function commentsLabsWrapper() {
+module.exports = function commentsLabsWrapper() {
     const self = this;
     const args = arguments;
     return labs.enabledHelper({
         flagKey: 'comments',
         flagName: 'Comments',
-        helperName: 'comments'
+        helperName: 'comment_count'
     }, () => {
         return commentCount.apply(self, args);
     });
 };
-module.exports.async = true;

package/core/frontend/src/comment-counts/js/comment-counts.js CHANGED Viewed

@@ -27,8 +27,23 @@
         for (const [id, count] of Object.entries(countsMap)) {
             const countElems = document.querySelectorAll(`[data-ghost-comment-count="${id}"]`);
             countElems.forEach((e) => {
-                e.innerHTML = e.innerHTML.replace('#', count);
-                e.style.display = '';
+                let text = e.dataset.ghostCommentCountEmpty;
+                if (count === 1) {
+                    if (e.dataset.ghostCommentCountSingular) {
+                        text = `${count} ${e.dataset.ghostCommentCountSingular}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                if (count > 1) {
+                    if (e.dataset.ghostCommentCountPlural) {
+                        text = `${count} ${e.dataset.ghostCommentCountPlural}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                e.insertAdjacentText('afterend', text);
+                e.remove();
             });
         }
     };

package/core/server/api/endpoints/comments-members.js CHANGED Viewed

@@ -2,7 +2,6 @@ const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const db = require('../../data/db');
 const commentsService = require('../../services/comments');
 const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies'];
 const UNSAFE_ATTRS = ['status'];
@@ -123,23 +122,7 @@ module.exports = {
     counts: {
         permissions: false,
         async query(frame) {
-            const query = db.knex('comments')
-                .select(db.knex.raw(`COUNT(*) AS count, post_id`))
-                .groupBy('post_id');
-            if (Array.isArray(frame?.data?.ids)) {
-                query.whereIn('post_id', frame.data.ids);
-            }
-            const results = await query;
-            const counts = {};
-            for (const row of results) {
-                counts[row.post_id] = row.count;
-            }
-            return counts;
+            return commentsService.controller.count(frame);
         }
     },

package/core/server/models/comment.js CHANGED Viewed

@@ -9,6 +9,24 @@ const messages = {
     notYourCommentToDestroy: 'You may only delete your own comments'
 };
+function escapeRegex(string) {
+    return string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+/**
+ * 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 = escapeRegex(paragraph);
+    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 +67,22 @@ 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'
-                    })
-                }
-            }));
+            this.set('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'
+                        })
+                    }
+                })
+            ));
         }
     },

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

@@ -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 CHANGED Viewed

@@ -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,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">{{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;">
                         <tbody>
@@ -154,7 +154,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 +164,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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">{{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;">
                         <tbody>
@@ -154,7 +154,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 +164,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -154,7 +154,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 +164,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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/web/admin/app.js CHANGED Viewed

@@ -1,4 +1,5 @@
 const debug = require('@tryghost/debug')('web:admin:app');
+const path = require('path');
 const express = require('../../../shared/express');
 const serveStatic = express.static;
 const config = require('../../../shared/config');
@@ -16,8 +17,9 @@ module.exports = function setupAdminApp() {
     // Admin assets
     // @TODO ensure this gets a local 404 error handler
     const configMaxAge = config.get('caching:admin:maxAge');
+    const envDir = config.get('env') === 'production' ? 'production' : 'development';
     adminApp.use('/assets', serveStatic(
-        config.get('paths').adminAssets,
+        path.join(config.get('paths').adminAssets, envDir, 'assets'),
         {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS, fallthrough: false}
     ));

package/core/server/web/admin/controller.js CHANGED Viewed

@@ -29,8 +29,8 @@ module.exports = function adminController(req, res) {
     // CASE: trigger update check unit and let it run in background, don't block the admin rendering
     updateCheck();
-    const defaultTemplate = config.get('env') === 'production' ? 'default-prod.html' : 'default.html';
-    const templatePath = path.resolve(config.get('paths').adminViews, defaultTemplate);
+    const envDir = config.get('env') === 'production' ? 'production' : 'development';
+    const templatePath = path.resolve(config.get('paths').adminAssets, envDir, 'index.html');
     const headers = {};
     try {

package/core/shared/config/overrides.json CHANGED Viewed

@@ -2,10 +2,9 @@
     "paths": {
         "appRoot": ".",
         "corePath": "core/",
-        "adminAssets": "core/built/assets",
+        "adminAssets": "core/built/admin",
         "adminAuthAssets": "content/public/admin-auth",
         "helperTemplates": "core/frontend/helpers/tpl/",
-        "adminViews": "core/server/web/admin/views/",
         "defaultViews": "core/server/views/",
         "defaultRouteSettings": "core/server/services/route-settings/",
         "internalAppPath": "core/frontend/apps/",

package/core/shared/html-to-plaintext.js CHANGED Viewed

@@ -34,6 +34,7 @@ const baseSettings = {
 let excerptConverter;
 let emailConverter;
+let commentConverter;
 const loadConverters = () => {
     if (excerptConverter && emailConverter) {
@@ -63,8 +64,19 @@ const loadConverters = () => {
         ]
     });
+    const commentSettings = mergeSettings({
+        preserveNewlines: false,
+        selectors: [
+            // equiv hideLinkHrefIfSameAsText: true
+            {selector: 'a', options: {hideLinkHrefIfSameAsText: true}},
+            // No space between <p> tags. An empty <p> is needed
+            {selector: 'p', options: {leadingLineBreaks: 1, trailingLineBreaks: 1}}
+        ]
+    });
     excerptConverter = compile(excerptSettings);
     emailConverter = compile(emailSettings);
+    commentConverter = compile(commentSettings);
 };
 module.exports.excerpt = (html) => {
@@ -78,3 +90,9 @@ module.exports.email = (html) => {
     return emailConverter(html);
 };
+module.exports.comment = (html) => {
+    loadConverters();
+    return commentConverter(html);
+};

package/core/shared/labs.js CHANGED Viewed

@@ -28,7 +28,8 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'comments',
-    'explore'
+    'explore',
+    'freeTrial'
 ];
 module.exports.GA_KEYS = [...GA_FEATURES];