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

ghost 5.5.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 (447) 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.5%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-a89d10b3b58c1a5ebaca68cef93a404c.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-cf3af99dca0c71937669305afb3686a1.js"></script>
-                <script src="assets/ghost.min-c75f224decd20f9538179d7564cd2ab4.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/helpers/comments.js CHANGED Viewed

@@ -24,13 +24,24 @@ async function comments(options) {
     }
     let colorScheme = 'auto';
-    if (options.hash.color_scheme === 'dark' || options.hash.color_scheme === 'light') {
-        colorScheme = options.hash.color_scheme;
+    if (options.hash.mode === 'dark' || options.hash.mode === 'light') {
+        colorScheme = options.hash.mode;
     }
-    let avatarSaturation = parseInt(options.hash.avatar_saturation);
+    let avatarSaturation = parseInt(options.hash.saturation);
     if (isNaN(avatarSaturation)) {
-        avatarSaturation = 50;
+        avatarSaturation = 60;
+    }
+    let count = true;
+    if (options.hash.count === false) {
+        count = false;
+    }
+    // This is null so that the comments-ui can handle the default title
+    let title = null;
+    if (typeof options.hash.title === 'string') {
+        title = options.hash.title;
     }
     let accentColor = '';
@@ -47,6 +58,8 @@ async function comments(options) {
         admin: urlUtils.urlFor('admin', true),
         key: frontendKey,
         styles: stylesUrl,
+        title: title,
+        count: count,
         'post-id': this.id,
         'sentry-dsn': '', /* todo: insert sentry dsn key here */
         'color-scheme': colorScheme,

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

@@ -12,6 +12,7 @@ const url = require('url');
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
+const imageTransform = require('@tryghost/image-transform');
 const messages = {
     attrIsRequired: 'Attribute is required e.g. {{img_url feature_image}}'
@@ -41,15 +42,26 @@ module.exports = function imgUrl(requestedImageUrl, options) {
     // CASE: if you pass an external image, there is nothing we want to do to it!
     const isInternalImage = detectInternalImage(requestedImageUrl);
+    const sizeOptions = getImageSizeOptions(options);
     if (!isInternalImage) {
+        // Detect Unsplash width and format
+        const isUnsplashImage = /images\.unsplash\.com/.test(requestedImageUrl);
+        if (isUnsplashImage) {
+            try {
+                return getUnsplashImage(requestedImageUrl, sizeOptions);
+            } catch (e) {
+                // ignore errors and just return the original URL
+            }
+        }
         return requestedImageUrl;
     }
-    const {requestedSize, imageSizes} = getImageSizeOptions(options);
     const absoluteUrlRequested = getAbsoluteOption(options);
     function applyImageSizes(image) {
-        return getImageWithSize(image, requestedSize, imageSizes);
+        return getImageWithSize(image, sizeOptions);
     }
     function getImageUrl(image) {
@@ -79,10 +91,12 @@ function getAbsoluteOption(options) {
 function getImageSizeOptions(options) {
     const requestedSize = options && options.hash && options.hash.size;
     const imageSizes = options && options.data && options.data.config && options.data.config.image_sizes;
+    const requestedFormat = options && options.hash && options.hash.format;
     return {
         requestedSize,
-        imageSizes
+        imageSizes,
+        requestedFormat
     };
 }
@@ -99,12 +113,58 @@ function detectInternalImage(requestedImageUrl) {
     return isAbsoluteInternalImage || isRelativeInternalImage;
 }
-function getImageWithSize(imagePath, requestedSize, imageSizes) {
+function getUnsplashImage(imagePath, sizeOptions) {
+    const parsedUrl = new URL(imagePath);
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
+    if (requestedFormat) {
+        const supportedFormats = ['avif', 'gif', 'jpg', 'png', 'webp'];
+        if (supportedFormats.includes(requestedFormat)) {
+            parsedUrl.searchParams.set('fm', requestedFormat);
+        } else if (requestedFormat === 'jpeg') {
+            // Map to alias
+            parsedUrl.searchParams.set('fm', 'jpg');
+        }
+    }
+    if (!imageSizes || !imageSizes[requestedSize]) {
+        return parsedUrl.toString();
+    }
+    const {width, height} = imageSizes[requestedSize];
+    if (!width && !height) {
+        return parsedUrl.toString();
+    }
+    parsedUrl.searchParams.delete('w');
+    parsedUrl.searchParams.delete('h');
+    if (width) {
+        parsedUrl.searchParams.set('w', width);
+    }
+    if (height) {
+        parsedUrl.searchParams.set('h', height);
+    }
+    return parsedUrl.toString();
+}
+/**
+ *
+ * @param {string} imagePath
+ * @param {Object} sizeOptions
+ * @param {string} sizeOptions.requestedSize
+ * @param {Object[]} sizeOptions.imageSizes
+ * @param {string} [sizeOptions.requestedFormat]
+ * @returns
+ */
+function getImageWithSize(imagePath, sizeOptions) {
     const hasLeadingSlash = imagePath[0] === '/';
     if (hasLeadingSlash) {
-        return '/' + getImageWithSize(imagePath.slice(1), requestedSize, imageSizes);
+        return '/' + getImageWithSize(imagePath.slice(1), sizeOptions);
     }
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
     if (!requestedSize) {
         return imagePath;
@@ -123,8 +183,9 @@ function getImageWithSize(imagePath, requestedSize, imageSizes) {
     const [imgBlogUrl, imageName] = imagePath.split(STATIC_IMAGE_URL_PREFIX);
     const sizeDirectoryName = prefixIfPresent('w', width) + prefixIfPresent('h', height);
+    const formatPrefix = requestedFormat && imageTransform.canTransformToFormat(requestedFormat) ? `/format/${requestedFormat}` : '';
-    return [imgBlogUrl, STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, imageName].join('');
+    return [imgBlogUrl, STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, formatPrefix, imageName].join('');
 }
 function prefixIfPresent(prefix, string) {

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/frontend/web/middleware/handle-image-sizes.js CHANGED Viewed

@@ -58,11 +58,6 @@ module.exports = function (req, res, next) {
     const themeImageSizes = activeTheme.get().config('image_sizes');
     const imageSizes = _.merge({}, themeImageSizes, internalImageSizes, contentImageSizes);
-    // CASE: no image_sizes config (NOTE - unlikely to be reachable now we have content sizes)
-    if (!imageSizes) {
-        return redirectToOriginal();
-    }
     // build a new object with keys that match the strings used in size paths like "w640h480"
     const imageDimensions = {};
     Object.keys(imageSizes).forEach((size) => {
@@ -106,16 +101,16 @@ module.exports = function (req, res, next) {
         return redirectToOriginal();
     }
+    // exit early if sharp isn't installed to avoid extra file reads
+    if (!imageTransform.canTransformFiles()) {
+        return redirectToOriginal();
+    }
     storageInstance.exists(req.url).then((exists) => {
         if (exists) {
             return;
         }
-        // exit early if sharp isn't installed to avoid extra file reads
-        if (!imageTransform.canTransformFiles()) {
-            return redirectToOriginal();
-        }
         const {dir, name, ext} = path.parse(imagePath);
         const [imageNameMatched, imageName, imageNumber] = name.match(/^(.+?)(-\d+)?$/) || [null];
@@ -148,7 +143,8 @@ module.exports = function (req, res, next) {
     }).then(() => {
         if (format) {
             // File extension won't match the new format, so we need to update the Content-Type header manually here
-            res.type(format);
+            // Express JS still uses an out of date mime package, which doesn't support avif
+            res.type(format === 'avif' ? 'image/avif' : format);
         }
         next();
     }).catch(function (err) {

package/core/server/api/endpoints/{comments-comments.js → comments-members.js} RENAMED 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'];
@@ -34,7 +33,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Comment.findPage(frame.options);
+            return commentsService.controller.browse(frame);
         }
     },
@@ -52,8 +51,8 @@ module.exports = {
             }
         },
         permissions: true,
-        async query(frame) {
-            return await commentsService.api.getCommentByID(frame.data.id, frame.options);
+        query(frame) {
+            return commentsService.controller.read(frame);
         }
     },
@@ -74,21 +73,8 @@ module.exports = {
             }
         },
         permissions: true,
-        async query(frame) {
-            if (frame.data.comments[0].status === 'deleted') {
-                return await commentsService.api.deleteComment(
-                    frame.options.id,
-                    frame?.options?.context?.member?.id,
-                    frame.options
-                );
-            }
-            return await commentsService.api.editCommentContent(
-                frame.options.id,
-                frame?.options?.context?.member?.id,
-                frame.data.comments[0].html,
-                frame.options
-            );
+        query(frame) {
+            return commentsService.controller.edit(frame);
         }
     },
@@ -111,24 +97,8 @@ module.exports = {
         permissions: {
             unsafeAttrs: UNSAFE_ATTRS
         },
-        async query(frame) {
-            const data = frame.data.comments[0];
-            if (data.parent_id) {
-                return await commentsService.api.replyToComment(
-                    data.parent_id,
-                    frame.options.context.member.id,
-                    data.html,
-                    frame.options
-                );
-            }
-            return await commentsService.api.commentOnPost(
-                data.post_id,
-                frame.options.context.member.id,
-                data.html,
-                frame.options
-            );
+        query(frame) {
+            return commentsService.controller.add(frame);
         }
     },
@@ -145,38 +115,14 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            frame.options.require = true;
-            return models.Comment.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Comment.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.commentNotFound)
-                    }));
-                });
+            return commentsService.controller.destroy(frame);
         }
     },
     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/api/endpoints/index.js CHANGED Viewed

@@ -225,11 +225,7 @@ module.exports = {
         return shared.pipeline(require('./offers-public'), localUtils, 'content');
     },
-    /**
-     * Comment API
-     */
-    get commentsComments() {
-        return shared.pipeline(require('./comments-comments'), localUtils, 'comments');
+    get commentsMembers() {
+        return shared.pipeline(require('./comments-members'), localUtils, 'comments');
     }
 };

package/core/server/api/endpoints/utils/serializers/output/mappers/posts.js CHANGED Viewed

@@ -17,6 +17,8 @@ const postsMetaSchema = require('../../../../../../data/schema').tables.posts_me
 const getPostServiceInstance = require('../../../../../../services/posts/posts-service');
 const postsService = getPostServiceInstance();
+const commentsService = require('../../../../../../services/comments');
 module.exports = async (model, frame, options = {}) => {
     const {tiers: tiersData} = options || {};
     const extendedOptions = Object.assign(_.cloneDeep(frame.options), {
@@ -54,6 +56,15 @@ module.exports = async (model, frame, options = {}) => {
     if (utils.isContentAPI(frame)) {
         date.forPost(jsonModel);
         gating.forPost(jsonModel, frame);
+        if (jsonModel.access) {
+            if (commentsService?.api?.enabled !== 'off') {
+                jsonModel.comments = true;
+            } else {
+                jsonModel.comments = false;
+            }
+        } else {
+            jsonModel.comments = false;
+        }
     }
     // Transforms post/page metadata to flat structure

package/core/server/api/endpoints/utils/serializers/output/utils/clean.js CHANGED Viewed

@@ -102,6 +102,10 @@ const post = (attrs, frame) => {
         if (columns && columns.includes('visibility') && fields && !fields.includes('visibility')) {
             delete attrs.visibility;
         }
+        if (fields && !fields.includes('comments')) {
+            delete attrs.comments;
+        }
     }
     if (columns && columns.includes('email_segment') && fields && !fields.includes('email_segment')) {

package/core/server/data/migrations/versions/5.3/2022-07-06-09-17-add-ghost-explore-integration.js CHANGED Viewed

@@ -6,7 +6,6 @@ module.exports = createTransactionalMigration(
     async function up(knex) {
         logging.info('Creating Ghost Explore Integration');
         const existingIntegration = await knex('integrations').where({
-            type: 'internal',
             name: 'Ghost Explore',
             slug: 'ghost-explore'
         }).first();

package/core/server/data/migrations/versions/5.3/2022-07-06-09-26-add-ghost-explore-integration-api-key.js CHANGED Viewed

@@ -10,7 +10,6 @@ module.exports = createTransactionalMigration(
         const integration = await knex('integrations').where({
             slug: 'ghost-explore',
-            type: 'internal',
             name: 'Ghost Explore'
         }).first();

package/core/server/data/migrations/versions/5.6/2022-07-27-13-40-change-explore-type.js ADDED Viewed

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

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

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

package/core/server/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'
+                        })
+                    }
+                })
+            ));
         }
     },