You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2024/03/21 09:11:38 UTC
(incubator-answer) branch test updated (d6144e8b -> a040b100)
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a change to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
from d6144e8b Merge branch 'feat/1.3.0/notifiaction' into test
add c01dd12a feat(notification): send format content summary
new a040b100 Merge branch 'feat/1.3.0/notifiaction' into test
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
internal/service/comment/comment_service.go | 6 +++---
internal/service/content/answer_service.go | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
(incubator-answer) 01/01: Merge branch 'feat/1.3.0/notifiaction' into test
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit a040b100ef39e761f342e2010fec37b4e7ce3c78
Merge: d6144e8b c01dd12a
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Thu Mar 21 17:11:27 2024 +0800
Merge branch 'feat/1.3.0/notifiaction' into test
# Conflicts:
# internal/service/content/answer_service.go
internal/service/comment/comment_service.go | 6 +++---
internal/service/content/answer_service.go | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --cc internal/service/content/answer_service.go
index 058cc7d1,ae59b224..d96d75c5
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@@ -279,10 -269,8 +280,10 @@@ func (as *AnswerService) Insert(ctx con
if err != nil {
return insertData.ID, err
}
- as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
- htmltext.FetchExcerpt(insertData.ParsedText, "...", 240))
+ if insertData.Status == entity.AnswerStatusAvailable {
+ as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
- insertData.ParsedText)
++ htmltext.FetchExcerpt(insertData.ParsedText, "...", 240))
+ }
as.activityQueueService.Send(ctx, &schema.ActivityMsg{
UserID: insertData.UserID,