diff --git a/server/emails/templates/CommentCreatedEmail.tsx b/server/emails/templates/CommentCreatedEmail.tsx index 67615e56d5..2a89ce9292 100644 --- a/server/emails/templates/CommentCreatedEmail.tsx +++ b/server/emails/templates/CommentCreatedEmail.tsx @@ -103,7 +103,7 @@ export default class CommentCreatedEmail extends BaseEmail< : `${commentText.slice(0, MAX_SUBJECT_CONTENT)}...`; return `${parentComment ? "Re: " : ""}New comment on “${ - document.title + document.titleWithDefault }” - ${trimmedText}`; } @@ -136,7 +136,7 @@ export default class CommentCreatedEmail extends BaseEmail< }: Props): string { return ` ${actorName} ${isReply ? "replied to a thread in" : "commented on"} "${ - document.title + document.titleWithDefault }"${collection?.name ? `in the ${collection.name} collection` : ""}. Open Thread: ${teamUrl}${document.url}?commentId=${commentId} @@ -164,10 +164,10 @@ Open Thread: ${teamUrl}${document.url}?commentId=${commentId}
- {document.title} + {document.titleWithDefault}

{actorName} {isReply ? "replied to a thread in" : "commented on"}{" "} - {document.title}{" "} + {document.titleWithDefault}{" "} {collection?.name ? `in the ${collection.name} collection` : ""}.

{body && ( diff --git a/server/emails/templates/CommentMentionedEmail.tsx b/server/emails/templates/CommentMentionedEmail.tsx index 8bdb026621..16d7af0d4a 100644 --- a/server/emails/templates/CommentMentionedEmail.tsx +++ b/server/emails/templates/CommentMentionedEmail.tsx @@ -92,7 +92,7 @@ export default class CommentMentionedEmail extends BaseEmail< } protected subject({ document }: Props) { - return `Mentioned you in “${document.title}”`; + return `Mentioned you in “${document.titleWithDefault}”`; } protected preview({ actorName }: Props): string { @@ -111,7 +111,7 @@ export default class CommentMentionedEmail extends BaseEmail< collection, }: Props): string { return ` -${actorName} mentioned you in a comment on "${document.title}"${ +${actorName} mentioned you in a comment on "${document.titleWithDefault}"${ collection.name ? `in the ${collection.name} collection` : "" }. @@ -139,10 +139,10 @@ Open Thread: ${teamUrl}${document.url}?commentId=${commentId}
- {document.title} + {document.titleWithDefault}

{actorName} mentioned you in a comment on{" "} - {document.title}{" "} + {document.titleWithDefault}{" "} {collection.name ? `in the ${collection.name} collection` : ""}.

{body && ( diff --git a/server/emails/templates/CommentResolvedEmail.tsx b/server/emails/templates/CommentResolvedEmail.tsx index 98fc4ea6ec..11531c7bb9 100644 --- a/server/emails/templates/CommentResolvedEmail.tsx +++ b/server/emails/templates/CommentResolvedEmail.tsx @@ -92,7 +92,7 @@ export default class CommentResolvedEmail extends BaseEmail< } protected subject({ document }: Props) { - return `Resolved a comment thread in “${document.title}”`; + return `Resolved a comment thread in “${document.titleWithDefault}”`; } protected preview({ actorName }: Props): string { @@ -110,7 +110,7 @@ export default class CommentResolvedEmail extends BaseEmail< commentId, collection, }: Props): string { - const t1 = `${actorName} resolved a comment thread on "${document.title}"`; + const t1 = `${actorName} resolved a comment thread on "${document.titleWithDefault}"`; const t2 = collection.name ? ` in the ${collection.name} collection` : ""; const t3 = `Open Thread: ${teamUrl}${document.url}?commentId=${commentId}`; return `${t1}${t2}.\n\n${t3}`; @@ -136,10 +136,10 @@ export default class CommentResolvedEmail extends BaseEmail<
- {document.title} + {document.titleWithDefault}

{actorName} resolved a comment on{" "} - {document.title}{" "} + {document.titleWithDefault}{" "} {collection.name ? `in the ${collection.name} collection` : ""}.

{body && ( diff --git a/server/emails/templates/DocumentMentionedEmail.tsx b/server/emails/templates/DocumentMentionedEmail.tsx index 131b5aa163..8beeb6c3d5 100644 --- a/server/emails/templates/DocumentMentionedEmail.tsx +++ b/server/emails/templates/DocumentMentionedEmail.tsx @@ -92,7 +92,7 @@ export default class DocumentMentionedEmail extends BaseEmail< } protected subject({ document }: Props) { - return `Mentioned you in “${document.title}”`; + return `Mentioned you in “${document.titleWithDefault}”`; } protected preview({ actorName }: Props): string { @@ -116,7 +116,7 @@ export default class DocumentMentionedEmail extends BaseEmail< return ` You were mentioned -${actorName} mentioned you in the document “${document.title}”. +${actorName} mentioned you in the document “${document.titleWithDefault}”. Open Document: ${teamUrl}${document.url} `; @@ -137,7 +137,7 @@ Open Document: ${teamUrl}${document.url} You were mentioned

{actorName} mentioned you in the document{" "} - {document.title}. + {document.titleWithDefault}.

{body && ( <> diff --git a/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx b/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx index 87057dcff5..1192b54188 100644 --- a/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx +++ b/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx @@ -114,7 +114,7 @@ export default class DocumentPublishedOrUpdatedEmail extends BaseEmail< } protected subject({ document, eventType }: Props) { - return `“${document.title}” ${this.eventName(eventType)}`; + return `“${document.titleWithDefault}” ${this.eventName(eventType)}`; } protected preview({ actorName, eventType }: Props): string { @@ -144,9 +144,9 @@ export default class DocumentPublishedOrUpdatedEmail extends BaseEmail< const eventName = this.eventName(eventType); return ` -"${document.title}" ${eventName} +"${document.titleWithDefault}" ${eventName} -${actorName} ${eventName} the document "${document.title}"${ +${actorName} ${eventName} the document "${document.titleWithDefault}"${ collection?.name ? `, in the ${collection.name} collection` : "" }. @@ -176,11 +176,11 @@ Open Document: ${teamUrl}${document.url} - “{document.title}” {eventName} + “{document.titleWithDefault}” {eventName}

{actorName} {eventName} the document{" "} - {document.title} + {document.titleWithDefault} {collection?.name ? <>, in the {collection.name} collection : ""} .

diff --git a/server/emails/templates/DocumentSharedEmail.tsx b/server/emails/templates/DocumentSharedEmail.tsx index 6dd12a0102..337c9ba6c7 100644 --- a/server/emails/templates/DocumentSharedEmail.tsx +++ b/server/emails/templates/DocumentSharedEmail.tsx @@ -53,7 +53,7 @@ export default class DocumentSharedEmail extends BaseEmail< } protected subject({ actorName, document }: Props) { - return `${actorName} shared “${document.title}” with you`; + return `${actorName} shared “${document.titleWithDefault}” with you`; } protected preview({ actorName }: Props): string { @@ -66,7 +66,7 @@ export default class DocumentSharedEmail extends BaseEmail< protected renderAsText({ actorName, teamUrl, document }: Props): string { return ` -${actorName} shared “${document.title}” with you. +${actorName} shared “${document.titleWithDefault}” with you. View Document: ${teamUrl}${document.path} `; @@ -87,10 +87,10 @@ View Document: ${teamUrl}${document.path}
- {document.title} + {document.titleWithDefault}

{actorName} invited you to {permission} the{" "} - {document.title} document. + {document.titleWithDefault} document.