Fix "Dashboard shows deleted comments"

models/action.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"path"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 	"unicode"
@@ -77,6 +78,8 @@ type Action struct {
 	ActUser     *User       `xorm:"-"`
 	RepoID      int64       `xorm:"INDEX"`
 	Repo        *Repository `xorm:"-"`
+	CommentID   int64       `xorm:"INDEX"`
+	Comment     *Comment    `xorm:"-"`
 	RefName     string
 	IsPrivate   bool      `xorm:"INDEX NOT NULL DEFAULT false"`
 	Content     string    `xorm:"TEXT"`
@@ -191,6 +194,38 @@ func (a *Action) GetRepoLink() string {
 	return "/" + a.GetRepoPath()
 }
 
+// GetCommentLink returns link to action comment.
+func (a *Action) GetCommentLink() string {
+	if a == nil {
+		return "#"
+	}
+	if a.Comment == nil && a.CommentID != 0 {
+		a.Comment, _ = GetCommentByID(a.CommentID)
+	}
+	if a.Comment != nil {
+		return a.Comment.HTMLURL()
+	}
+	if len(a.GetIssueInfos()) == 0 {
+		return "#"
+	}
+	//Return link to issue
+	issueIDString := a.GetIssueInfos()[0]
+	issueID, err := strconv.ParseInt(issueIDString, 10, 64)
+
+	if err != nil {
+		return "#"
+	}
+
+	issue, err := GetIssueByID(issueID)
+
+	if err != nil {
+		return "#"
+	}
+
+	return issue.HTMLURL()
+
+}
+
 // GetBranch returns the action's repository branch.
 func (a *Action) GetBranch() string {
 	return a.RefName

models/issue_comment.go

@@ -334,6 +334,8 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		Content:   fmt.Sprintf("%d|%s", opts.Issue.Index, strings.Split(opts.Content, "\n")[0]),
 		RepoID:    opts.Repo.ID,
 		Repo:      opts.Repo,
+		Comment:   comment,
+		CommentID: comment.ID,
 		IsPrivate: opts.Repo.IsPrivate,
 	}
 
@@ -641,5 +643,12 @@ func DeleteComment(comment *Comment) error {
 		}
 	}
 
+	//Delete associated Action
+	if _, err := sess.Delete(&Action{
+		CommentID: comment.ID,
+	}); err != nil {
+		return err
+	}
+
 	return sess.Commit()
 }

models/migrations/migrations.go

@@ -118,6 +118,8 @@ var migrations = []Migration{
 	NewMigration("remove columns from action", removeActionColumns),
 	// v34 -> v35
 	NewMigration("give all units to owner teams", giveAllUnitsToOwnerTeams),
+	// v35 -> v36
+	NewMigration("adds comment to an action", addCommentIDToAction),
 }
 
 // Migrate database to current version

models/migrations/v35.go

@@ -0,0 +1,24 @@
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"github.com/go-xorm/xorm"
+)
+
+func addCommentIDToAction(x *xorm.Engine) error {
+	// Action see models/action.go
+	type Action struct {
+		CommentID int64 `xorm:"INDEX"`
+	}
+
+	if err := x.Sync2(new(Action)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+
+	return nil
+}

routers/user/home.go

@@ -74,6 +74,7 @@ func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isPr
 	if ctx.User != nil {
 		userCache[ctx.User.ID] = ctx.User
 	}
+	commentCache := map[int64]*models.Comment{}
 	repoCache := map[int64]*models.Repository{}
 	for _, act := range actions {
 		// Cache results to reduce queries.
@@ -104,6 +105,19 @@ func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isPr
 		}
 		act.Repo = repo
 
+		comment, ok := commentCache[act.CommentID]
+		if !ok {
+			comment, err = models.GetCommentByID(act.CommentID)
+			if err != nil {
+				if models.IsErrCommentNotExist(err) {
+					continue
+				}
+				ctx.Handle(500, "GetCommentByID", err)
+				return
+			}
+		}
+		act.Comment = comment
+
 		repoOwner, ok := userCache[repo.OwnerID]
 		if !ok {
 			repoOwner, err = models.GetUserByID(repo.OwnerID)
@@ -115,6 +129,7 @@ func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isPr
 				return
 			}
 		}
+
 		repo.Owner = repoOwner
 	}
 	ctx.Data["Feeds"] = actions

templates/user/dashboard/feeds.tmpl

@@ -63,12 +63,12 @@
 					{{else if eq .GetOpType 7}}
 						<span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span>
 					{{else if eq .GetOpType 10}}
-						<span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span>
+						<a href="{{.GetCommentLink}}" class="text truncate issue title has-emoji">{{.GetIssueTitle}}</a>
 						<p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p>
 					{{else if eq .GetOpType 11}}
 						<p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p>
 					{{else if (or (or (eq .GetOpType 12) (eq .GetOpType 13)) (or (eq .GetOpType 14) (eq .GetOpType 15)))}}
-						<span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span>
+						<a href="{{.GetCommentLink}}"  class="text truncate issue title has-emoji">{{.GetIssueTitle}}</a>
 					{{end}}
 					<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
 				</div>