mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 13:28:25 +00:00 
			
		
		
		
	Add reviewrs as participants (#8121)
This commit is contained in:
		@@ -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").
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user