mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 00:54:28 +00:00
Add missing comment reply handling (#32050)
Fixes #31937 - Add missing comment reply handling - Use `onGiteaRun` in the test because the fixtures are not present otherwise (did this behaviour change?) Compare without whitespaces.
This commit is contained in:
parent
8cdf4e29c4
commit
55f1fcf0ad
@ -82,8 +82,6 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
switch r := ref.(type) {
|
|
||||||
case *issues_model.Issue:
|
|
||||||
attachmentIDs := make([]string, 0, len(content.Attachments))
|
attachmentIDs := make([]string, 0, len(content.Attachments))
|
||||||
if setting.Attachment.Enabled {
|
if setting.Attachment.Enabled {
|
||||||
for _, attachment := range content.Attachments {
|
for _, attachment := range content.Attachments {
|
||||||
@ -107,18 +105,17 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = issue_service.CreateIssueComment(ctx, doer, issue.Repo, issue, content.Content, attachmentIDs)
|
switch r := ref.(type) {
|
||||||
|
case *issues_model.Issue:
|
||||||
|
_, err := issue_service.CreateIssueComment(ctx, doer, issue.Repo, issue, content.Content, attachmentIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("CreateIssueComment failed: %w", err)
|
return fmt.Errorf("CreateIssueComment failed: %w", err)
|
||||||
}
|
}
|
||||||
case *issues_model.Comment:
|
case *issues_model.Comment:
|
||||||
comment := r
|
comment := r
|
||||||
|
|
||||||
if content.Content == "" {
|
switch comment.Type {
|
||||||
return nil
|
case issues_model.CommentTypeCode:
|
||||||
}
|
|
||||||
|
|
||||||
if comment.Type == issues_model.CommentTypeCode {
|
|
||||||
_, err := pull_service.CreateCodeComment(
|
_, err := pull_service.CreateCodeComment(
|
||||||
ctx,
|
ctx,
|
||||||
doer,
|
doer,
|
||||||
@ -130,11 +127,16 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u
|
|||||||
false, // not pending review but a single review
|
false, // not pending review but a single review
|
||||||
comment.ReviewID,
|
comment.ReviewID,
|
||||||
"",
|
"",
|
||||||
nil,
|
attachmentIDs,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("CreateCodeComment failed: %w", err)
|
return fmt.Errorf("CreateCodeComment failed: %w", err)
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
_, err := issue_service.CreateIssueComment(ctx, doer, issue.Repo, issue, content.Content, attachmentIDs)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("CreateIssueComment failed: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -7,6 +7,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/smtp"
|
"net/smtp"
|
||||||
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@ -26,8 +27,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestIncomingEmail(t *testing.T) {
|
func TestIncomingEmail(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
||||||
|
|
||||||
@ -147,7 +147,10 @@ func TestIncomingEmail(t *testing.T) {
|
|||||||
assert.Equal(t, user.ID, comment.PosterID)
|
assert.Equal(t, user.ID, comment.PosterID)
|
||||||
assert.Equal(t, content.Content, comment.Content)
|
assert.Equal(t, content.Content, comment.Content)
|
||||||
assert.NoError(t, comment.LoadAttachments(db.DefaultContext))
|
assert.NoError(t, comment.LoadAttachments(db.DefaultContext))
|
||||||
assert.Empty(t, comment.Attachments)
|
assert.Len(t, comment.Attachments, 1)
|
||||||
|
attachment := comment.Attachments[0]
|
||||||
|
assert.Equal(t, content.Attachments[0].Name, attachment.Name)
|
||||||
|
assert.EqualValues(t, 4, attachment.Size)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -207,6 +210,7 @@ func TestIncomingEmail(t *testing.T) {
|
|||||||
}, 10*time.Second, 1*time.Second)
|
}, 10*time.Second, 1*time.Second)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// A simple SMTP mail sender used for integration tests.
|
// A simple SMTP mail sender used for integration tests.
|
||||||
|
Loading…
Reference in New Issue
Block a user