Fix "Dashboard shows deleted comments"

models/action.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"path"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 	"unicode"
@@ -70,18 +71,21 @@ func init() {
 // repository. It implemented interface base.Actioner so that can be
 // used in template render.
 type Action struct {
-	ID          int64 `xorm:"pk autoincr"`
-	UserID      int64 `xorm:"INDEX"` // Receiver user id.
-	OpType      ActionType
-	ActUserID   int64       `xorm:"INDEX"` // Action user id.
-	ActUser     *User       `xorm:"-"`
-	RepoID      int64       `xorm:"INDEX"`
-	Repo        *Repository `xorm:"-"`
-	RefName     string
-	IsPrivate   bool      `xorm:"INDEX NOT NULL DEFAULT false"`
-	Content     string    `xorm:"TEXT"`
-	Created     time.Time `xorm:"-"`
-	CreatedUnix int64     `xorm:"INDEX"`
+	ID             int64 `xorm:"pk autoincr"`
+	UserID         int64 `xorm:"INDEX"` // Receiver user id.
+	OpType         ActionType
+	ActUserID      int64       `xorm:"INDEX"` // Action user id.
+	ActUser        *User       `xorm:"-"`
+	RepoID         int64       `xorm:"INDEX"`
+	Repo           *Repository `xorm:"-"`
+	CommentID      int64       `xorm:"INDEX"`
+	Comment        *Comment    `xorm:"-"`
+	CommentDeleted bool        `xorm:"default 0 not null"`
+	RefName        string
+	IsPrivate      bool      `xorm:"INDEX NOT NULL DEFAULT false"`
+	Content        string    `xorm:"TEXT"`
+	Created        time.Time `xorm:"-"`
+	CreatedUnix    int64     `xorm:"INDEX"`
 }
 
 // BeforeInsert will be invoked by XORM before inserting a record
@@ -191,6 +195,35 @@ 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
@@ -674,10 +707,11 @@ func MergePullRequestAction(actUser *User, repo *Repository, pull *Issue) error
 
 // GetFeedsOptions options for retrieving feeds
 type GetFeedsOptions struct {
-	RequestedUser    *User
-	RequestingUserID int64
-	IncludePrivate   bool // include private actions
-	OnlyPerformedBy  bool // only actions performed by requested user
+	RequestedUser          *User
+	RequestingUserID       int64
+	IncludePrivate         bool // include private actions
+	OnlyPerformedBy        bool // only actions performed by requested user
+	IncludeDeletedComments bool // include comments that reference a deleted comment
 }
 
 // GetFeeds returns actions according to the provided options
@@ -706,5 +740,11 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 	if opts.RequestedUser.IsOrganization() {
 		sess.In("repo_id", repoIDs)
 	}
+
+	if !opts.IncludeDeletedComments {
+		sess.And("comment_deleted = ?", false)
+
+	}
+
 	return actions, sess.Find(&actions)
 }

models/action_test.go

@@ -306,10 +306,11 @@ func TestGetFeeds(t *testing.T) {
 	user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
 
 	actions, err := GetFeeds(GetFeedsOptions{
-		RequestedUser:    user,
-		RequestingUserID: user.ID,
-		IncludePrivate:   true,
-		OnlyPerformedBy:  false,
+		RequestedUser:          user,
+		RequestingUserID:       user.ID,
+		IncludePrivate:         true,
+		OnlyPerformedBy:        false,
+		IncludeDeletedComments: true,
 	})
 	assert.NoError(t, err)
 	assert.Len(t, actions, 1)
@@ -333,21 +334,23 @@ func TestGetFeeds2(t *testing.T) {
 	userID := AssertExistsAndLoadBean(t, &OrgUser{OrgID: org.ID, IsOwner: true}).(*OrgUser).UID
 
 	actions, err := GetFeeds(GetFeedsOptions{
-		RequestedUser:    org,
-		RequestingUserID: userID,
-		IncludePrivate:   true,
-		OnlyPerformedBy:  false,
+		RequestedUser:          org,
+		RequestingUserID:       userID,
+		IncludePrivate:         true,
+		OnlyPerformedBy:        false,
+		IncludeDeletedComments: true,
 	})
 	assert.NoError(t, err)
 	assert.Len(t, actions, 1)
 	assert.EqualValues(t, 2, actions[0].ID)
 	assert.EqualValues(t, org.ID, actions[0].UserID)
 
 	actions, err = GetFeeds(GetFeedsOptions{
-		RequestedUser:    org,
-		RequestingUserID: userID,
-		IncludePrivate:   false,
-		OnlyPerformedBy:  false,
+		RequestedUser:          org,
+		RequestingUserID:       userID,
+		IncludePrivate:         false,
+		OnlyPerformedBy:        false,
+		IncludeDeletedComments: true,
 	})
 	assert.NoError(t, err)
 	assert.Len(t, actions, 0)

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,7 @@ func DeleteComment(comment *Comment) error {
 		}
 	}
 
+	sess.Exec("UPDATE `action` SET comment_deleted = 1 WHERE comment_id = ?", comment.ID)
+
 	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,29 @@
+// 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"`
+		CommentDeleted bool  `xorm:"default 0 not null"`
+	}
+
+	if err := x.Sync2(new(Action)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+
+	x.Where("comment_id = 0").Update(&Action{
+		CommentDeleted: false,
+	})
+
+	return nil
+}

routers/user/home.go

@@ -54,16 +54,17 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
 }
 
 // retrieveFeeds loads feeds for the specified user
-func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isProfile bool) {
+func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isProfile bool, includeDeletedComments bool) {
 	var requestingID int64
 	if ctx.User != nil {
 		requestingID = ctx.User.ID
 	}
 	actions, err := models.GetFeeds(models.GetFeedsOptions{
-		RequestedUser:    user,
-		RequestingUserID: requestingID,
-		IncludePrivate:   includePrivate,
-		OnlyPerformedBy:  isProfile,
+		RequestedUser:          user,
+		RequestingUserID:       requestingID,
+		IncludePrivate:         includePrivate,
+		OnlyPerformedBy:        isProfile,
+		IncludeDeletedComments: includeDeletedComments,
 	})
 	if err != nil {
 		ctx.Handle(500, "GetFeeds", err)
@@ -186,7 +187,7 @@ func Dashboard(ctx *context.Context) {
 	ctx.Data["MirrorCount"] = len(mirrors)
 	ctx.Data["Mirrors"] = mirrors
 
-	retrieveFeeds(ctx, ctxUser, true, false)
+	retrieveFeeds(ctx, ctxUser, true, false, false)
 	if ctx.Written() {
 		return
 	}

routers/user/profile.go

@@ -138,7 +138,7 @@ func Profile(ctx *context.Context) {
 	ctx.Data["Keyword"] = keyword
 	switch tab {
 	case "activity":
-		retrieveFeeds(ctx, ctxUser, showPrivate, true)
+		retrieveFeeds(ctx, ctxUser, showPrivate, true, false)
 		if ctx.Written() {
 			return
 		}

templates/user/dashboard/feeds.tmpl

@@ -63,7 +63,7 @@
 					{{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>