Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add more parameters in mail template. #2095

Merged
merged 8 commits into from
May 18, 2022
Merged

feat: add more parameters in mail template. #2095

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9af3c7
Fixed the bug of not being able to query according to the content
Yhcrown Apr 21, 2022
5cb7b6c
Merge branch 'halo-dev:master' into debug-query
Yhcrown Apr 22, 2022
395deec
Update static file mappings on refresh
Yhcrown Apr 30, 2022
459d57a
Merge branch 'halo-dev:master' into feat-comment
Yhcrown May 17, 2022
4e76b16
feat:add more parameter in mail template
Yhcrown May 17, 2022
d42a638
Update CommentEventListener.java
Yhcrown May 18, 2022
d3d3df8
Update CommentEventListener.java
Yhcrown May 18, 2022
8b373ba
Update CommentEventListener.java
Yhcrown May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/main/java/run/halo/app/listener/comment/CommentEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
data.put("pageTitle", post.getTitle());
data.put("author", postComment.getAuthor());
data.put("content", postComment.getContent());
data.put("email", postComment.getEmail());
data.put("status", postComment.getStatus());
data.put("createTime", postComment.getCreateTime());
data.put("authorUrl", postComment.getAuthorUrl());

subject.append("您的博客文章《")
.append(post.getTitle())
Expand All @@ -144,6 +148,10 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
data.put("pageTitle", sheet.getTitle());
data.put("author", sheetComment.getAuthor());
data.put("content", sheetComment.getContent());
data.put("email", sheetComment.getEmail());
Yhcrown marked this conversation as resolved.
Show resolved Hide resolved
data.put("status", sheetComment.getStatus());
data.put("createTime", sheetComment.getCreateTime());
data.put("authorUrl", sheetComment.getAuthorUrl());

subject.append("您的博客页面《")
.append(sheet.getTitle())
Expand All @@ -162,6 +170,10 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
data.put("pageTitle", journal.getCreateTime());
data.put("author", journalComment.getAuthor());
data.put("content", journalComment.getContent());
data.put("email", journalComment.getEmail());
data.put("status", journalComment.getStatus());
data.put("createTime", journalComment.getCreateTime());
data.put("authorUrl", journalComment.getAuthorUrl());

subject.append("您的博客日志有了新的评论");
}
Expand Down Expand Up @@ -230,6 +242,10 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
data.put("baseContent", baseComment.getContent());
data.put("replyAuthor", postComment.getAuthor());
data.put("replyContent", postComment.getContent());
data.put("baseAuthorEmail", baseComment.getEmail());
data.put("replyAuthorEmail", postComment.getEmail());
data.put("createTime", postComment.getCreateTime());
data.put("authorUrl", postComment.getAuthorUrl());

subject.append("您在【")
.append(blogTitle)
Expand Down Expand Up @@ -263,6 +279,10 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
data.put("baseContent", baseComment.getContent());
data.put("replyAuthor", sheetComment.getAuthor());
data.put("replyContent", sheetComment.getContent());
data.put("baseAuthorEmail", baseComment.getEmail());
data.put("replyAuthorEmail", sheetComment.getEmail());
data.put("createTime", sheetComment.getCreateTime());
data.put("authorUrl", sheetComment.getAuthorUrl());

subject.append("您在【")
.append(blogTitle)
Expand Down Expand Up @@ -298,6 +318,10 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
data.put("baseContent", baseComment.getContent());
data.put("replyAuthor", journalComment.getAuthor());
data.put("replyContent", journalComment.getContent());
data.put("baseAuthorEmail", baseComment.getEmail());
data.put("replyAuthorEmail", journalComment.getEmail());
data.put("createTime", journalComment.getCreateTime());
data.put("authorUrl", journalComment.getAuthorUrl());

subject.append("您在【")
.append(blogTitle)
Expand Down