ghost 5.13.0 → 5.14.0

package/core/built/admin/index.html

@@ -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%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.13%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.14%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" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-733135cd6cbca8126c6fa223d63a5bf3.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-647c9a79282265a4d29bf273c44f72c0.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-40adc8310dcdd0be163cbf7b9d89c59a.css" title="light">
 
     
 </head>
@@ -53,9 +53,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-ab4b5dfdf8b86f24d726115ac7de0980.js"></script>
-<script src="assets/chunk.763.9a285d7351e1f4415f8d.js"></script>
-<script src="assets/chunk.143.e96aad00fdf7196692c7.js"></script>
-    <script src="assets/ghost-3203510c519d3195f1e71a34e9eecc59.js"></script>
+    <script src="assets/vendor-22a37451d7619a2b641310ecbcca4c05.js"></script>
+<script src="assets/chunk.579.2de3f4300baf25f9a0db.js"></script>
+<script src="assets/chunk.143.53c5e3490ffdae025d84.js"></script>
+    <script src="assets/ghost-84a4336c7d5c1f3fba00868b0a5237cd.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -167,11 +167,12 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             }
 
             head.push('<link rel="canonical" href="' + escapeExpression(meta.canonicalUrl) + '" />');
-            head.push('<meta name="referrer" content="' + referrerPolicy + '" />');
 
-            // don't allow indexing of preview URLs!
             if (_.includes(context, 'preview')) {
                 head.push(writeMetaTag('robots', 'noindex,nofollow', 'name'));
+                head.push(writeMetaTag('referrer', 'same-origin', 'name'));
+            } else {
+                head.push(writeMetaTag('referrer', referrerPolicy, 'name'));
             }
 
             // show amp link in post when 1. we are not on the amp page and 2. amp is enabled

package/core/frontend/helpers/url.js

@@ -17,7 +17,7 @@ module.exports = function url(options) {
     let outputUrl = getMetaDataUrl(this, absolute);
 
     try {
-        outputUrl = encodeURI(decodeURI(outputUrl));
+        outputUrl = encodeURI(decodeURI(outputUrl)).replace(/%5B/g, '[').replace(/%5D/g, ']');
     } catch (err) {
         // Happens when the outputURL contains an invalid URI character like "%%" or "%80"
 

package/core/frontend/services/data/fetch-data.js

@@ -6,7 +6,6 @@ const _ = require('lodash');
 const Promise = require('bluebird');
 
 // The default settings for a default post query
-// @TODO: get rid of this config and use v2, v3 config
 const queryDefaults = {
     type: 'browse',
     resource: 'posts',

package/core/frontend/src/admin-auth/message-handler.js

@@ -1,4 +1,4 @@
-const adminUrl = window.location.href.replace('auth-frame/', '');
+const adminUrl = window.location.href.replace('auth-frame/', '') + 'api/admin';
 
 // At compile time, we'll replace the value with the actual origin.
 const siteOrigin = '{{SITE_ORIGIN}}';
@@ -26,7 +26,7 @@ window.addEventListener('message', async function (event) {
     if (data.action === 'getUser') {
         try {
             const res = await fetch(
-                adminUrl + 'api/canary/admin/users/me/'
+                adminUrl + '/users/me/'
             );
             const json = await res.json();
             respond(null, json);
@@ -37,7 +37,7 @@ window.addEventListener('message', async function (event) {
 
     if (data.action === 'hideComment') {
         try {
-            const res = await fetch(adminUrl + 'api/canary/admin/comments/' + data.id + '/', {
+            const res = await fetch(adminUrl + '/comments/' + data.id + '/', {
                 method: 'PUT',
                 body: JSON.stringify({
                     comments: [{
@@ -58,7 +58,7 @@ window.addEventListener('message', async function (event) {
 
     if (data.action === 'showComment') {
         try {
-            const res = await fetch(adminUrl + 'api/canary/admin/comments/' + data.id + '/', {
+            const res = await fetch(adminUrl + '/comments/' + data.id + '/', {
                 method: 'PUT',
                 body: JSON.stringify({
                     comments: [{

package/core/server/adapters/cache/Memory.js

@@ -1,4 +1,4 @@
-const Base = require('./Base');
+const Base = require('@tryghost/adapter-base-cache');
 
 class MemoryCache extends Base {
     constructor() {

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

@@ -1,18 +1,7 @@
-const Promise = require('bluebird');
-const tpl = require('@tryghost/tpl');
-const errors = require('@tryghost/errors');
-const models = require('../../models');
 const commentsService = require('../../services/comments');
 const ALLOWED_INCLUDES = ['member', 'replies', 'replies.member', 'replies.count.likes', 'replies.liked', 'count.replies', 'count.likes', 'liked', 'post', 'parent'];
 const UNSAFE_ATTRS = ['status'];
 
-const messages = {
-    commentNotFound: 'Comment could not be found',
-    memberNotFound: 'Unable to find member',
-    likeNotFound: 'Unable to find like',
-    alreadyLiked: 'This comment was liked already'
-};
-
 module.exports = {
     docName: 'comments',
 
@@ -157,27 +146,7 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            // TODO: move to likes service
-            if (frame.options?.context?.member?.id) {
-                const data = {
-                    member_id: frame.options.context.member.id,
-                    comment_id: frame.options.id
-                };
-
-                const existing = await models.CommentLike.findOne(data, frame.options);
-
-                if (existing) {
-                    throw new errors.BadRequestError({
-                        message: tpl(messages.alreadyLiked)
-                    });
-                }
-
-                return await models.CommentLike.add(data, frame.options);
-            } else {
-                throw new errors.NotFoundError({
-                    message: tpl(messages.memberNotFound)
-                });
-            }
+            return await commentsService.controller.like(frame);
         }
     },
 
@@ -188,31 +157,8 @@ module.exports = {
         ],
         validation: {},
         permissions: true,
-        query(frame) {
-            // TODO: move to likes service
-            if (frame.options?.context?.member?.id) {
-                return models.CommentLike.destroy({
-                    ...frame.options,
-                    destroyBy: {
-                        member_id: frame.options.context.member.id,
-                        comment_id: frame.options.id
-                    },
-                    require: true
-                }).then(() => null)
-                    .catch((err) => {
-                        if (err instanceof models.CommentLike.NotFoundError) {
-                            return Promise.reject(new errors.NotFoundError({
-                                message: tpl(messages.likeNotFound)
-                            }));
-                        }
-
-                        throw err;
-                    });
-            } else {
-                return Promise.reject(new errors.NotFoundError({
-                    message: tpl(messages.memberNotFound)
-                }));
-            }
+        async query(frame) {
+            return await commentsService.controller.unlike(frame);
         }
     },
 
@@ -224,13 +170,7 @@ module.exports = {
         validation: {},
         permissions: true,
         async query(frame) {
-            if (!frame.options?.context?.member?.id) {
-                return Promise.reject(new errors.UnauthorizedError({
-                    message: tpl(messages.memberNotFound)
-                }));
-            }
-
-            await commentsService.api.reportComment(frame.options.id, frame.options?.context?.member);
+            await commentsService.controller.report(frame);
         }
     }
 };

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -5,6 +5,7 @@ const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
+const clean = require('./utils/clean');
 
 function removeMobiledocFormat(frame) {
     if (frame.options.formats && frame.options.formats.includes('mobiledoc')) {
@@ -159,6 +160,8 @@ module.exports = {
                     frame.data.pages[0].tags[index] = {
                         name: tag
                     };
+                } else {
+                    frame.data.pages[0].tags[index] = clean.pagesTag(tag);
                 }
             });
         }

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -5,6 +5,7 @@ const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
+const clean = require('./utils/clean');
 
 function removeMobiledocFormat(frame) {
     if (frame.options.formats && frame.options.formats.includes('mobiledoc')) {
@@ -175,6 +176,8 @@ module.exports = {
                     frame.data.posts[0].tags[index] = {
                         name: tag
                     };
+                } else {
+                    frame.data.posts[0].tags[index] = clean.postsTag(tag);
                 }
             });
         }

package/core/server/api/endpoints/utils/serializers/input/utils/clean.js

@@ -0,0 +1,12 @@
+const _ = require('lodash');
+
+const tagRelation = (attrs) => {
+    return _.pick(attrs, [
+        'id',
+        'name',
+        'slug'
+    ]);
+};
+
+module.exports.pagesTag = tagRelation;
+module.exports.postsTag = tagRelation;

package/core/server/api/endpoints/utils/serializers/output/mappers/comments.js

@@ -14,7 +14,7 @@ const memberFields = [
     'id',
     'uuid',
     'name',
-    'bio',
+    'expertise',
     'avatar_image'
 ];
 

package/core/server/data/migrations/versions/5.14/2022-09-02-12-55-rename-members-bio-to-expertise.js

@@ -0,0 +1,34 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+
+module.exports = createNonTransactionalMigration (
+    async function up(knex) {
+        // check if the column exists before trying to rename it
+        const hasBio = await knex.schema.hasColumn('members', 'bio');
+        const hasExpertise = await knex.schema.hasColumn('members', 'expertise');
+
+        if (hasBio && !hasExpertise) {
+            logging.info('Renaming members.bio to members.expertise');
+            await knex.schema.table('members', (table) => {
+                table.renameColumn('bio', 'expertise');
+            }
+            );
+        } else {
+            logging.info('members.bio does not exist, skipping rename');
+        }
+    },
+    async function down(knex) {
+        const hasBio = await knex.schema.hasColumn('members', 'bio');
+        const hasExpertise = await knex.schema.hasColumn('members', 'expertise');
+
+        if (hasExpertise && !hasBio) {
+            logging.info(`Renaming members.expertise to members.bio`);
+            await knex.schema.table('members', (table) => {
+                table.renameColumn('expertise', 'bio');
+            }
+            );
+        } else {
+            logging.warn('members.expertise does not exist, skipping');
+        }
+    }
+);

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

@@ -396,7 +396,7 @@ module.exports = {
             }
         },
         name: {type: 'string', maxlength: 191, nullable: true},
-        bio: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 50}}},
+        expertise: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 50}}},
         note: {type: 'string', maxlength: 2000, nullable: true},
         geolocation: {type: 'string', maxlength: 2000, nullable: true},
         enable_comment_notifications: {type: 'boolean', nullable: false, defaultTo: true},

package/core/server/models/post.js

@@ -794,6 +794,12 @@ Post = ghostBookshelf.Model.extend({
             });
         }
 
+        if (this.get('tiers')) {
+            this.set('tiers', this.get('tiers').map(t => ({
+                id: t.id
+            })));
+        }
+
         return sequence(ops);
     },
 

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

@@ -15,7 +15,7 @@ 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'));
+adapterManager.registerAdapter('cache', require('@tryghost/adapter-base-cache'));
 
 module.exports = {
     /**
@@ -26,8 +26,8 @@ module.exports = {
     getAdapter(name) {
         const adapterServiceConfig = getAdapterServiceConfig(config);
 
-        const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
+        const {adapterClassName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
 
-        return adapterManager.getAdapter(adapterType, adapterName, adapterConfig);
+        return adapterManager.getAdapter(name, adapterClassName, adapterConfig);
     }
 };

package/core/server/services/adapter-manager/options-resolver.js

@@ -1,18 +1,39 @@
-module.exports = function resolveAdapterOptions(name, adapterServiceConfig) {
+/**
+ * Resolves full configuration for an adapter. Combining base class configurations
+ * along with feature-specific ones
+ * 
+ * @param {String} name
+ * @param {Object} adapterServiceConfig
+ * 
+ * @returns {{adapterClassName: String, adapterConfig: Object}} 
+ */
+const resolveAdapterOptions = (name, adapterServiceConfig) => {
     const [adapterType, feature] = name.split(':');
     const adapterSettings = adapterServiceConfig[adapterType];
 
-    let adapterName;
+    let adapterClassName;
     let adapterConfig;
 
-    // CASE: load resource-specific adapter when there is an adapter feature name specified as well as custom feature config
-    if (feature && adapterSettings[feature] && adapterSettings[adapterSettings[feature]]) {
-        adapterName = adapterSettings[feature];
-        adapterConfig = adapterSettings[adapterName];
+    const hasFeatureConfig = feature && adapterSettings[feature];
+    if (hasFeatureConfig && adapterSettings[adapterSettings[feature]]) {
+        // CASE: load resource-specific adapter when there is an adapter feature 
+        //       name (String) specified as well as custom feature config
+        adapterClassName = adapterSettings[feature];
+        adapterConfig = adapterSettings[adapterClassName];
+    } else if (hasFeatureConfig && adapterSettings[feature].adapter) {
+        // CASE: load resource-specific adapter when there is an adapter feature 
+        //       name (Object) specified as well as custom feature config
+        adapterClassName = adapterSettings[feature].adapter;
+        const commonAdapterConfig = {...adapterSettings[adapterClassName]};
+        const featureAdapterConfig = {...adapterSettings[feature]};
+        delete featureAdapterConfig.adapter;
+        adapterConfig = {...commonAdapterConfig, ...featureAdapterConfig};
     } else {
-        adapterName = adapterSettings.active;
-        adapterConfig = adapterSettings[adapterName];
+        adapterClassName = adapterSettings.active;
+        adapterConfig = adapterSettings[adapterClassName];
     }
 
-    return {adapterType, adapterName, adapterConfig};
+    return {adapterClassName, adapterConfig};
 };
+
+module.exports = resolveAdapterOptions;

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

@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const errors = require('@tryghost/errors');
 
 /**
  * @typedef {import('../../api/shared/frame')} Frame
@@ -8,7 +9,8 @@ const {MethodNotAllowedError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
-    cannotDestroyComments: 'You cannot destroy comments.'
+    cannotDestroyComments: 'You cannot destroy comments.',
+    memberNotFound: 'Unable to find member'
 };
 
 module.exports = class CommentsController {
@@ -21,6 +23,14 @@ module.exports = class CommentsController {
         this.stats = stats;
     }
 
+    #checkMember(frame) {
+        if (!frame.options?.context?.member?.id) {
+            throw new errors.UnauthorizedError({
+                message: tpl(messages.memberNotFound)
+            });
+        }
+    }
+
     /**
      * @param {Frame} frame
      */
@@ -46,6 +56,8 @@ module.exports = class CommentsController {
      * @param {Frame} frame
      */
     async edit(frame) {
+        this.#checkMember(frame);
+
         if (frame.data.comments[0].status === 'deleted') {
             return await this.service.deleteComment(
                 frame.options.id,
@@ -66,6 +78,7 @@ module.exports = class CommentsController {
      * @param {Frame} frame
      */
     async add(frame) {
+        this.#checkMember(frame);
         const data = frame.data.comments[0];
 
         if (data.parent_id) {
@@ -98,4 +111,42 @@ module.exports = class CommentsController {
 
         return await this.stats.getCountsByPost(frame.data.ids);
     }
+
+    /**
+     * @param {Frame} frame
+     */
+    async like(frame) {
+        this.#checkMember(frame);
+
+        return await this.service.likeComment(
+            frame.options.id, 
+            frame.options?.context?.member, 
+            frame.options
+        );
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async unlike(frame) {
+        this.#checkMember(frame);
+
+        return await this.service.unlikeComment(
+            frame.options.id, 
+            frame.options?.context?.member, 
+            frame.options
+        );
+    }
+
+    /**
+     * @param {Frame} frame
+     */
+    async report(frame) {
+        this.#checkMember(frame);
+
+        return await this.service.reportComment(
+            frame.options.id, 
+            frame.options?.context?.member
+        );
+    }
 };

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

@@ -136,7 +136,7 @@
                                             </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>
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberBio}}{{memberBio}} &#8226; {{/if}}{{replyDate}}</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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberExpertise}}{{memberExpertise}} &#8226; {{/if}}{{replyDate}}</p>
                                             </td>
                                         </tr>
                                     </table>

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

@@ -136,7 +136,7 @@
                                             </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>
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberBio}}{{memberBio}} &#8226; {{/if}}{{commentDate}}</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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberExpertise}}{{memberExpertise}} &#8226; {{/if}}{{commentDate}}</p>
                                             </td>
                                         </tr>
                                     </table>

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

@@ -131,7 +131,7 @@
                                             </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>
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberBio}}{{memberBio}} &#8226; {{/if}}{{commentDate}}</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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberExpertise}}{{memberExpertise}} &#8226; {{/if}}{{commentDate}}</p>
                                             </td>
                                         </tr>
                                     </table>

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

@@ -41,7 +41,7 @@ class CommentsServiceEmails {
                 commentHtml: comment.get('html'),
                 commentDate: moment(comment.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
                 memberName: memberName,
-                memberBio: member.get('bio'),
+                memberExpertise: member.get('expertise'),
                 memberInitials: this.extractInitials(memberName),
                 accentColor: this.settingsCache.get('accent_color'),
                 fromEmail: this.notificationFromAddress,
@@ -90,7 +90,7 @@ class CommentsServiceEmails {
             replyHtml: reply.get('html'),
             replyDate: moment(reply.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
             memberName: memberName,
-            memberBio: member.get('bio'),
+            memberExpertise: member.get('expertise'),
             memberInitials: this.extractInitials(memberName),
             accentColor: this.settingsCache.get('accent_color'),
             fromEmail: this.notificationFromAddress,
@@ -140,7 +140,7 @@ class CommentsServiceEmails {
 
             memberName: memberName,
             memberEmail: member.get('email'),
-            memberBio: member.get('bio'),
+            memberExpertise: member.get('expertise'),
             memberInitials: this.extractInitials(memberName),
             accentColor: this.settingsCache.get('accent_color'),
             fromEmail: this.notificationFromAddress,

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

@@ -87,6 +87,58 @@ class CommentsService {
         }
     }
 
+    async likeComment(commentId, member, options = {}) {
+        this.checkEnabled();
+
+        const memberModel = await this.models.Member.findOne({
+            id: member.id
+        }, {
+            require: true,
+            ...options,
+            withRelated: ['products']
+        });
+
+        this.checkCommentAccess(memberModel);
+
+        const data = {
+            member_id: memberModel.id,
+            comment_id: commentId
+        };
+
+        const existing = await this.models.CommentLike.findOne(data, options);
+
+        if (existing) {
+            throw new errors.BadRequestError({
+                message: tpl(messages.alreadyLiked)
+            });
+        }
+
+        return await this.models.CommentLike.add(data, options);
+    }
+
+    async unlikeComment(commentId, member, options = {}) {
+        this.checkEnabled();
+
+        try {
+            await this.models.CommentLike.destroy({
+                ...options,
+                destroyBy: {
+                    member_id: member.id,
+                    comment_id: commentId
+                },
+                require: true
+            });
+        } catch (err) {
+            if (err instanceof this.models.CommentLike.NotFoundError) {
+                return Promise.reject(new errors.NotFoundError({
+                    message: tpl(messages.likeNotFound)
+                }));
+            }
+
+            throw err;
+        }
+    }
+
     async reportComment(commentId, reporter) {
         this.checkEnabled();
         const comment = await this.models.Comment.findOne({id: commentId}, {require: true});