Skip to content

Commit

Permalink
refactor: comments are converted to publish before sending reply email (
Browse files Browse the repository at this point in the history
halo-dev#2340)

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. 如果这是你的第一次,请阅读我们的贡献指南:<https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>。
1. If this is your first time, please read our contributor guidelines: <https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>.
2. 请根据你解决问题的类型为 Pull Request 添加合适的标签。
2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request.
3. 请确保你已经添加并运行了适当的测试。
3. Ensure you have added or ran the appropriate tests for your PR.
-->

#### What type of PR is this?
/kind bug
<!--
添加其中一个类别:
Add one of the following kinds:

/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind improvement

适当添加其中一个或多个类别(可选):
Optionally add one or more of the following kinds if applicable:

/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
-->

#### What this PR does / why we need it:
reply comments的评论审核通过时创建回复事件
添加了回复邮件发送的条件:当评论由管理员发布后回复邮件

#### Which issue(s) this PR fixes:

<!--
PR 合并时自动关闭 issue。
Automatically closes linked issue when PR is merged.

用法:`Fixes #<issue 号>`,或者 `Fixes (粘贴 issue 完整链接)`
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes halo-dev#2246

#### Special notes for your reviewer:

null

#### Does this PR introduce a user-facing change?

<!--
如果当前 Pull Request 的修改不会造成用户侧的任何变更,在 `release-note` 代码块儿中填写 `NONE`。
否则请填写用户侧能够理解的 Release Note。如果当前 Pull Request 包含破坏性更新(Break Change),
Release Note 需要以 `action required` 开头。
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-->

```release-note
修复未审核评论回复会发送邮件提醒的问题
```
  • Loading branch information
AirboZH authored Aug 24, 2022
1 parent 5d263d0 commit 80f9edd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import run.halo.app.model.entity.PostComment;
import run.halo.app.model.entity.SheetComment;
import run.halo.app.model.entity.User;
import run.halo.app.model.enums.CommentStatus;
import run.halo.app.model.properties.CommentProperties;
import run.halo.app.service.JournalCommentService;
import run.halo.app.service.JournalService;
Expand Down Expand Up @@ -230,6 +231,11 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
return;
}

// only send email with published comments
if (!postComment.getStatus().equals(CommentStatus.PUBLISHED)) {
return;
}

baseAuthorEmail = baseComment.getEmail();

BasePostMinimalDTO post =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,14 @@ public COMMENT updateStatus(@NonNull Long commentId, @NonNull CommentStatus stat
// Get comment by id
COMMENT comment = getById(commentId);

//Send mail if approved
if (comment.getStatus().equals(CommentStatus.AUDITING)
&& status.equals(CommentStatus.PUBLISHED)) {
if (!ServiceUtils.isEmptyId(comment.getParentId())) {
eventPublisher.publishEvent(new CommentReplyEvent(this, comment.getId()));
}
}

// Set comment status
comment.setStatus(status);

Expand Down

0 comments on commit 80f9edd

Please sign in to comment.