tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Fix bug when combine label comments (#14894)

Browse Source 
* Fix bug when combine label comments

* Added some code comments

* More comments
This commit is contained in:
Lunny Xiao
2021-03-05 23:17:32 +08:00
committed by GitHub
parent 144cfe5720
commit 9db590f2ee
2 changed files with 97 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
routers/repo/issue.go
View File

@@ -2481,12 +2481,11 @@ func attachmentsHTML(ctx *context.Context, attachments []*models.Attachment, con
return attachHTML
}
// combineLabelComments combine the nearby label comments as one.
func combineLabelComments(issue *models.Issue) {
var prev, cur *models.Comment
for i := 0; i < len(issue.Comments); i++ {
var (
prev *models.Comment
cur = issue.Comments[i]
)
cur = issue.Comments[i]
if i > 0 {
prev = issue.Comments[i-1]
}
@@ -2503,16 +2502,25 @@ func combineLabelComments(issue *models.Issue) {
continue
}
if cur.Label != nil {
if cur.Content != "1" {
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
} else {
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
if cur.Label != nil { // now cur MUST be label comment
if prev.Type == models.CommentTypeLabel { // we can combine them only prev is a label comment
if cur.Content != "1" {
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
} else {
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
}
prev.CreatedUnix = cur.CreatedUnix
// remove the current comment since it has been combined to prev comment
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
i--
} else { // if prev is not a label comment, start a new group
if cur.Content != "1" {
cur.RemovedLabels = append(cur.RemovedLabels, cur.Label)
} else {
cur.AddedLabels = append(cur.AddedLabels, cur.Label)
}
}
}
prev.CreatedUnix = cur.CreatedUnix
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
i--
}
}