From a874c66b729c87b2bb63c91f2bb1b43f6d26d853 Mon Sep 17 00:00:00 2001 From: Innei Date: Tue, 6 Jun 2023 15:46:16 +0800 Subject: [PATCH] feat: update email template Signed-off-by: Innei --- apps/core/src/modules/comment/comment.email.default.ts | 2 +- apps/core/src/modules/comment/comment.service.ts | 4 +++- .../core/src/processors/helper/helper.email.service.ts | 10 +++++++--- scripts/init-project.mjs | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/core/src/modules/comment/comment.email.default.ts b/apps/core/src/modules/comment/comment.email.default.ts index 38f5d77c..9b1190db 100644 --- a/apps/core/src/modules/comment/comment.email.default.ts +++ b/apps/core/src/modules/comment/comment.email.default.ts @@ -42,7 +42,7 @@ const defaultPostModelForRenderProps = { export const baseRenderProps = Object.freeze({ author: defaultCommentModelForRenderProps.author, - link: defaultCommentModelForRenderProps.url, + link: 'https://innei.ren/note/122#comments-37ccbeec9c15bb0ddc51ca7d' as string, mail: defaultCommentModelForRenderProps.mail, text: defaultCommentModelForRenderProps.text, title: '文章的标题' as string, diff --git a/apps/core/src/modules/comment/comment.service.ts b/apps/core/src/modules/comment/comment.service.ts index dc001459..8f12ae87 100644 --- a/apps/core/src/modules/comment/comment.service.ts +++ b/apps/core/src/modules/comment/comment.service.ts @@ -335,7 +335,9 @@ export class CommentService implements OnModuleInit { author: type === CommentReplyMailType.Guest ? parent!.author : model.author, master: masterInfo.name, - link: await this.resolveUrlByType(refType, refDoc), + link: await this.resolveUrlByType(refType, refDoc).then( + (url) => `${url}#comments-${model.id}`, + ), time: parsedTime, mail: CommentReplyMailType.Owner === type ? model.mail : masterInfo.mail, diff --git a/apps/core/src/processors/helper/helper.email.service.ts b/apps/core/src/processors/helper/helper.email.service.ts index 41e5b1a1..39780db9 100644 --- a/apps/core/src/processors/helper/helper.email.service.ts +++ b/apps/core/src/processors/helper/helper.email.service.ts @@ -77,9 +77,13 @@ export class EmailService implements OnModuleInit, OnModuleDestroy { } async deleteTemplate(type: string) { - await this.assetService.removeUserCustomAsset( - `/email-template/${type}.template.ejs`, - ) + await this.assetService + .removeUserCustomAsset(`/email-template/${type}.template.ejs`) + .catch((err) => { + if ((err?.message as string).includes('no such file or directory')) + return + throw err + }) } teardown() { diff --git a/scripts/init-project.mjs b/scripts/init-project.mjs index de8f04ff..1368f593 100644 --- a/scripts/init-project.mjs +++ b/scripts/init-project.mjs @@ -26,4 +26,6 @@ async function main() { } } +execSync('ln -s $PWD/assets $PWD/apps/core/assets ') + main()