From 38eb75505606331705eddfa7c4ca3175c580886a Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Thu, 7 Jul 2022 12:01:46 +0200
Subject: [PATCH] Changed member name to "Anonymous" in emails when not set

refs https://github.com/TryGhost/Team/issues/1664
---
 core/server/services/comments/service.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/server/services/comments/service.js b/core/server/services/comments/service.js
index b72e337200..d6e9707d9c 100644
--- a/core/server/services/comments/service.js
+++ b/core/server/services/comments/service.js
@@ -83,6 +83,8 @@ class CommentsService {
             const to = author.get('email');
             const subject = '💬 You have a new comment on one of your posts';
 
+            const memberName = member.get('name') || 'Anonymous';
+
             const templateData = {
                 siteTitle: this.settingsCache.get('title'),
                 siteUrl: this.urlUtils.getSiteUrl(),
@@ -91,9 +93,9 @@ class CommentsService {
                 postUrl: this.urlService.getUrlByResourceId(post.get('id'), {absolute: true}),
                 commentHtml: comment.get('html'),
                 commentDate: moment(comment.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
-                memberName: member.get('name'),
+                memberName: memberName,
                 memberBio: member.get('bio'),
-                memberInitials: this.extractInitials(member.get('name')),
+                memberInitials: this.extractInitials(memberName),
                 accentColor: this.settingsCache.get('accent_color'),
                 fromEmail: this.notificationFromAddress,
                 toEmail: to,
@@ -122,6 +124,8 @@ class CommentsService {
             const post = await this.models.Post.findOne({id: reply.get('post_id')});
             const member = await this.models.Member.findOne({id: reply.get('member_id')});
 
+            const memberName = member.get('name') || 'Anonymous';
+
             const templateData = {
                 siteTitle: this.settingsCache.get('title'),
                 siteUrl: this.urlUtils.getSiteUrl(),
@@ -130,9 +134,9 @@ class CommentsService {
                 postUrl: this.urlService.getUrlByResourceId(post.get('id'), {absolute: true}),
                 replyHtml: reply.get('html'),
                 replyDate: moment(reply.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
-                memberName: member.get('name'),
+                memberName: memberName,
                 memberBio: member.get('bio'),
-                memberInitials: this.extractInitials(member.get('name')),
+                memberInitials: this.extractInitials(memberName),
                 accentColor: this.settingsCache.get('accent_color'),
                 fromEmail: this.notificationFromAddress,
                 toEmail: to,