diff options
| -rw-r--r-- | models/issue.go | 2 | ||||
| -rw-r--r-- | routers/repo/issue.go | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/models/issue.go b/models/issue.go index b849f97bd4..511bfa31c4 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1455,7 +1455,7 @@ func getParticipantsByIssueID(e Engine, issueID int64) ([]*User, error) { userIDs := make([]int64, 0, 5) if err := e.Table("comment").Cols("poster_id"). Where("`comment`.issue_id = ?", issueID). - And("`comment`.type = ?", CommentTypeComment). + And("`comment`.type in (?,?,?)", CommentTypeComment, CommentTypeCode, CommentTypeReview). And("`user`.is_active = ?", true). And("`user`.prohibit_login = ?", false). Join("INNER", "`user`", "`user`.id = `comment`.poster_id"). diff --git a/routers/repo/issue.go b/routers/repo/issue.go index a865bd0ad1..dc09a650fe 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -803,17 +803,7 @@ func ViewIssue(ctx *context.Context) { return } marked[comment.PosterID] = comment.ShowTag - - isAdded := false - for j := range participants { - if comment.Poster == participants[j] { - isAdded = true - break - } - } - if !isAdded && !issue.IsPoster(comment.Poster.ID) { - participants = append(participants, comment.Poster) - } + participants = addParticipant(comment.Poster, participants) } else if comment.Type == models.CommentTypeLabel { if err = comment.LoadLabel(); err != nil { ctx.ServerError("LoadLabel", err) @@ -849,6 +839,7 @@ func ViewIssue(ctx *context.Context) { ctx.ServerError("LoadReview", err) return } + participants = addParticipant(comment.Poster, participants) if comment.Review == nil { continue } @@ -1571,3 +1562,12 @@ func ChangeCommentReaction(ctx *context.Context, form auth.ReactionForm) { "html": html, }) } + +func addParticipant(poster *models.User, participants []*models.User) []*models.User { + for _, part := range participants { + if poster.ID == part.ID { + return participants + } + } + return append(participants, poster) +} |