fix some bugs

Author: lunny

models/issue.go

@@ -179,12 +179,21 @@ func (issue *Issue) LoadPullRequest() error {
 }
 
 func (issue *Issue) loadComments(e Engine) (err error) {
+	return issue.loadCommentsByType(e, CommentTypeUnknown)
+}
+
+// LoadDiscussComments loads discuss comments
+func (issue *Issue) LoadDiscussComments() error {
+	return issue.loadCommentsByType(x, CommentTypeComment)
+}
+
+func (issue *Issue) loadCommentsByType(e Engine, tp CommentType) (err error) {
 	if issue.Comments != nil {
 		return nil
 	}
 	issue.Comments, err = findComments(e, FindCommentsOptions{
 		IssueID: issue.ID,
-		Type:    CommentTypeUnknown,
+		Type:    tp,
 	})
 	return err
 }
@@ -1212,6 +1221,12 @@ func getIssuesByIDs(e Engine, issueIDs []int64) ([]*Issue, error) {
 	return issues, e.In("id", issueIDs).Find(&issues)
 }
 
+func getIssueIDsByRepoID(e Engine, repoID int64) ([]int64, error) {
+	var ids = make([]int64, 0, 10)
+	err := e.Table("issue").Where("repo_id = ?", repoID).Find(&ids)
+	return ids, err
+}
+
 // GetIssuesByIDs return issues with the given IDs.
 func GetIssuesByIDs(issueIDs []int64) ([]*Issue, error) {
 	return getIssuesByIDs(x, issueIDs)

models/issue_comment.go

@@ -1032,13 +1032,6 @@ func UpdateComment(doer *User, c *Comment, oldContent string) error {
 		return err
 	}
 
-	if c.Type == CommentTypeComment {
-		if err := c.Issue.loadComments(x); err != nil {
-			return err
-		}
-		UpdateIssueIndexer(c.Issue)
-	}
-
 	if err := c.Issue.LoadAttributes(); err != nil {
 		return err
 	}
@@ -1098,13 +1091,6 @@ func DeleteComment(doer *User, comment *Comment) error {
 		return err
 	}
 
-	if comment.Type == CommentTypeComment {
-		if err := comment.Issue.loadComments(x); err != nil {
-			return err
-		}
-		UpdateIssueIndexer(comment.Issue)
-	}
-
 	if err := comment.Issue.LoadAttributes(); err != nil {
 		return err
 	}

models/issue_indexer.go

@@ -115,8 +115,19 @@ func UpdateIssueIndexer(issue *Issue) {
 
 // DeleteRepoIssueIndexer deletes repo's all issues indexes
 func DeleteRepoIssueIndexer(repo *Repository) {
+	var ids []int64
+	ids, err := getIssueIDsByRepoID(x, repo.ID)
+	if err != nil {
+		log.Error(4, "getIssueIDsByRepoID failed: %v", err)
+		return
+	}
+
+	if len(ids) <= 0 {
+		return
+	}
+
 	issueIndexerUpdateQueue.Push(&issues.IndexerData{
-		RepoID:   repo.ID,
+		IDs:      ids,
 		IsDelete: true,
 	})
 }

modules/indexer/issues/bleve.go

@@ -205,6 +205,17 @@ func (b *BleveIndexer) Index(issues []*IndexerData) error {
 	return batch.Flush()
 }
 
+// Delete deletes indexes by ids
+func (b *BleveIndexer) Delete(ids ...int64) error {
+	batch := rupture.NewFlushingBatch(b.indexer, maxBatchSize)
+	for _, id := range ids {
+		if err := batch.Delete(indexerID(id)); err != nil {
+			return err
+		}
+	}
+	return batch.Flush()
+}
+
 // Search searches for issues by given conditions.
 // Returns the matching issue IDs
 func (b *BleveIndexer) Search(keyword string, repoID int64, limit, start int) (*SearchResult, error) {

modules/indexer/issues/indexer.go

@@ -11,7 +11,8 @@ type IndexerData struct {
 	Title    string
 	Content  string
 	Comments []string
-	IsDelete bool `json:"-"`
+	IsDelete bool
+	IDs      []int64
 }
 
 // Match represents on search result
@@ -30,5 +31,6 @@ type SearchResult struct {
 type Indexer interface {
 	Init() (bool, error)
 	Index(issue []*IndexerData) error
+	Delete(ids ...int64) error
 	Search(kw string, repoID int64, limit, start int) (*SearchResult, error)
 }

modules/indexer/issues/queue_ledis_local.go

@@ -83,6 +83,20 @@ func (l *LedisLocalQueue) Run() error {
 
 		log.Trace("LedisLocalQueue: task found: %#v", data)
 
+		if data.IsDelete {
+			if data.ID > 0 {
+				if err = l.indexer.Delete(data.ID); err != nil {
+					log.Error(4, "indexer.Delete: %v", err)
+				}
+			} else if len(data.IDs) > 0 {
+				if err = l.indexer.Delete(data.IDs...); err != nil {
+					log.Error(4, "indexer.Delete: %v", err)
+				}
+			}
+			time.Sleep(time.Millisecond * 10)
+			continue
+		}
+
 		datas = append(datas, &data)
 		time.Sleep(time.Millisecond * 10)
 	}

modules/notification/base/notifier.go

@@ -34,8 +34,8 @@ type Notifier interface {
 
 	NotifyCreateIssueComment(*models.User, *models.Repository,
 		*models.Issue, *models.Comment)
-	NotifyUpdateComment(*models.User, *models.Comment, int64, string)
-	NotifyDeleteComment(*models.User, *models.Comment, int64)
+	NotifyUpdateComment(*models.User, *models.Comment, string)
+	NotifyDeleteComment(*models.User, *models.Comment)
 
 	NotifyNewRelease(rel *models.Release)
 	NotifyUpdateRelease(doer *models.User, rel *models.Release)

modules/notification/base/null.go

@@ -47,11 +47,11 @@ func (*NullNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models
 }
 
 // NotifyUpdateComment places a place holder function
-func (*NullNotifier) NotifyUpdateComment(doer *models.User, c *models.Comment, repoID int64, oldContent string) {
+func (*NullNotifier) NotifyUpdateComment(doer *models.User, c *models.Comment, oldContent string) {
 }
 
 // NotifyDeleteComment places a place holder function
-func (*NullNotifier) NotifyDeleteComment(doer *models.User, c *models.Comment, repoID int64) {
+func (*NullNotifier) NotifyDeleteComment(doer *models.User, c *models.Comment) {
 }
 
 // NotifyDeleteRepository places a place holder function

modules/notification/indexer/indexer.go

@@ -6,6 +6,7 @@ package indexer
 
 import (
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification/base"
 )
 
@@ -25,6 +26,15 @@ func NewNotifier() base.Notifier {
 func (r *indexerNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
 	issue *models.Issue, comment *models.Comment) {
 	if comment.Type == models.CommentTypeComment {
+		if issue.Comments == nil {
+			if err := issue.LoadDiscussComments(); err != nil {
+				log.Error(4, "LoadComments failed: %v", err)
+				return
+			}
+		} else {
+			issue.Comments = append(issue.Comments, comment)
+		}
+
 		models.UpdateIssueIndexer(issue)
 	}
 }
@@ -37,14 +47,50 @@ func (r *indexerNotifier) NotifyNewPullRequest(pr *models.PullRequest) {
 	models.UpdateIssueIndexer(pr.Issue)
 }
 
-func (r *indexerNotifier) NotifyUpdateComment(doer *models.User, c *models.Comment, repoID int64, oldContent string) {
+func (r *indexerNotifier) NotifyUpdateComment(doer *models.User, c *models.Comment, oldContent string) {
 	if c.Type == models.CommentTypeComment {
+		var found bool
+		if c.Issue.Comments != nil {
+			for i := 0; i < len(c.Issue.Comments); i++ {
+				if c.Issue.Comments[i].ID == c.ID {
+					c.Issue.Comments[i] = c
+					found = true
+					break
+				}
+			}
+		}
+
+		if !found {
+			if err := c.Issue.LoadDiscussComments(); err != nil {
+				log.Error(4, "LoadComments failed: %v", err)
+				return
+			}
+		}
+
 		models.UpdateIssueIndexer(c.Issue)
 	}
 }
 
-func (r *indexerNotifier) NotifyDeleteComment(doer *models.User, comment *models.Comment, repoID int64) {
+func (r *indexerNotifier) NotifyDeleteComment(doer *models.User, comment *models.Comment) {
 	if comment.Type == models.CommentTypeComment {
+		var found bool
+		if comment.Issue.Comments != nil {
+			for i := 0; i < len(comment.Issue.Comments); i++ {
+				if comment.Issue.Comments[i].ID == comment.ID {
+					comment.Issue.Comments = append(comment.Issue.Comments[:i], comment.Issue.Comments[i+1:]...)
+					found = true
+					break
+				}
+			}
+		}
+
+		if !found {
+			if err := comment.Issue.LoadDiscussComments(); err != nil {
+				log.Error(4, "LoadComments failed: %v", err)
+				return
+			}
+		}
+		// reload comments to delete the old comment
 		models.UpdateIssueIndexer(comment.Issue)
 	}
 }

modules/notification/notification.go

@@ -73,16 +73,16 @@ func NotifyPullRequestReview(pr *models.PullRequest, review *models.Review, comm
 }
 
 // NotifyUpdateComment notifies update comment to notifiers
-func NotifyUpdateComment(doer *models.User, c *models.Comment, repoID int64, oldContent string) {
+func NotifyUpdateComment(doer *models.User, c *models.Comment, oldContent string) {
 	for _, notifier := range notifiers {
-		notifier.NotifyUpdateComment(doer, c, repoID, oldContent)
+		notifier.NotifyUpdateComment(doer, c, oldContent)
 	}
 }
 
 // NotifyDeleteComment notifies delete comment to notifiers
-func NotifyDeleteComment(doer *models.User, c *models.Comment, repoID int64) {
+func NotifyDeleteComment(doer *models.User, c *models.Comment) {
 	for _, notifier := range notifiers {
-		notifier.NotifyDeleteComment(doer, c, repoID)
+		notifier.NotifyDeleteComment(doer, c)
 	}
 }
 

routers/api/v1/repo/issue_comment.go

@@ -284,7 +284,7 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
 		return
 	}
 
-	notification.NotifyUpdateComment(ctx.User, comment, ctx.Repo.Repository.ID, oldContent)
+	notification.NotifyUpdateComment(ctx.User, comment, oldContent)
 
 	ctx.JSON(200, comment.APIFormat())
 }
@@ -375,7 +375,7 @@ func deleteIssueComment(ctx *context.APIContext) {
 		return
 	}
 
-	notification.NotifyDeleteComment(ctx.User, comment, ctx.Repo.Repository.ID)
+	notification.NotifyDeleteComment(ctx.User, comment)
 
 	ctx.Status(204)
 }

routers/repo/issue.go

@@ -1259,7 +1259,7 @@ func UpdateCommentContent(ctx *context.Context) {
 		return
 	}
 
-	notification.NotifyUpdateComment(ctx.User, comment, comment.Issue.RepoID, oldContent)
+	notification.NotifyUpdateComment(ctx.User, comment, oldContent)
 
 	ctx.JSON(200, map[string]interface{}{
 		"content": string(markdown.Render([]byte(comment.Content), ctx.Query("context"), ctx.Repo.Repository.ComposeMetas())),
@@ -1292,7 +1292,7 @@ func DeleteComment(ctx *context.Context) {
 		return
 	}
 
-	notification.NotifyDeleteComment(ctx.User, comment, comment.Issue.RepoID)
+	notification.NotifyDeleteComment(ctx.User, comment)
 
 	ctx.Status(200)
 }