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 06:34:48 UTC
(incubator-answer) branch test updated (2a686134 -> b7a63cbd)
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 2a686134 Merge branch 'feat/1.3.0/review' into test
add 7267d398 feat(notification): send format answer summary
new 8aaab552 Merge branch 'feat/1.3.0/notifiaction' into test
add 623dfa57 fix(connect): update user avatar only when there isn't any one (#857)
new b7a63cbd Merge remote-tracking branch 'origin/dev' into test
The 2 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/content/answer_service.go | 2 +-
internal/service/user_external_login/user_external_login_service.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(incubator-answer) 02/02: Merge remote-tracking branch 'origin/dev' 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 b7a63cbda89ac4175da40d7a52d52e3f9c96bd1d
Merge: 8aaab552 623dfa57
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Thu Mar 21 14:34:00 2024 +0800
Merge remote-tracking branch 'origin/dev' into test
internal/service/user_external_login/user_external_login_service.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(incubator-answer) 01/02: 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 8aaab55261fd460578242e30b9ab1e63c437b4c8
Merge: 2a686134 7267d398
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Thu Mar 21 14:33:45 2024 +0800
Merge branch 'feat/1.3.0/notifiaction' into test
# Conflicts:
# internal/service/content/answer_service.go
internal/service/content/answer_service.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc internal/service/content/answer_service.go
index 3c8b96ee,db605a1d..3b420350
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@@ -277,10 -268,8 +277,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,
- insertData.ParsedText)
+ if insertData.Status == entity.AnswerStatusAvailable {
+ as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
- insertData.OriginalText)
++ insertData.ParsedText)
+ }
as.activityQueueService.Send(ctx, &schema.ActivityMsg{
UserID: insertData.UserID,