Add action feed for new release (#12324)

a1012112796 · lunny · lafriks · web-flow · commit 1f12dc8e8862 · 2020-07-29T15:20:54.000-04:00
* Add action feed for new release

Signed-off-by: a1012112796 &lt;1012112796@qq.com&gt;

* fix lint

* Apply suggestions from code review

* Add ReleaseID to the action table
* Remove error message
* Fold the attachments download list

* remove attchment download list

* simplify code

* fix create release from existing tag

* simplify ui

* translation change

* fix test

Co-authored-by: Lunny Xiao &lt;xiaolunwen@gmail.com&gt;
Co-authored-by: Lauris BH &lt;lauris@nix.lv&gt;
Co-authored-by: techknowlogick &lt;techknowlogick@gitea.io&gt;
diff --git a/models/action.go b/models/action.go
@@ -49,6 +49,7 @@ const (
 	ActionApprovePullRequest                       // 21
 	ActionRejectPullRequest                        // 22
 	ActionCommentPull                              // 23
+	ActionPublishRelease                           // 24
 )
 
 // Action represents user operation type and other information to
diff --git a/models/repo_watch.go b/models/repo_watch.go
@@ -252,7 +252,7 @@ func notifyWatchers(e Engine, actions ...*Action) error {
 			act.Repo.Units = nil
 
 			switch act.OpType {
-			case ActionCommitRepo, ActionPushTag, ActionDeleteTag, ActionDeleteBranch:
+			case ActionCommitRepo, ActionPushTag, ActionDeleteTag, ActionPublishRelease, ActionDeleteBranch:
 				if !permCode[i] {
 					continue
 				}
diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go
@@ -314,3 +314,22 @@ func (a *actionNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Rep
 		log.Error("notifyWatchers: %v", err)
 	}
 }
+
+func (a *actionNotifier) NotifyNewRelease(rel *models.Release) {
+	if err := rel.LoadAttributes(); err != nil {
+		log.Error("NotifyNewRelease: %v", err)
+		return
+	}
+	if err := models.NotifyWatchers(&models.Action{
+		ActUserID: rel.PublisherID,
+		ActUser:   rel.Publisher,
+		OpType:    models.ActionPublishRelease,
+		RepoID:    rel.RepoID,
+		Repo:      rel.Repo,
+		IsPrivate: rel.Repo.IsPrivate,
+		Content:   rel.Title,
+		RefName:   rel.TagName,
+	}); err != nil {
+		log.Error("notifyWatchers: %v", err)
+	}
+}
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -640,6 +640,8 @@ func ActionIcon(opType models.ActionType) string {
 		return "check"
 	case models.ActionRejectPullRequest:
 		return "diff"
+	case models.ActionPublishRelease:
+		return "tag"
 	default:
 		return "question"
 	}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -2331,6 +2331,7 @@ mirror_sync_create = synced new reference <a href="%s/src/%s">%[2]s</a> to <a hr
 mirror_sync_delete = synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror
 approve_pull_request = `approved <a href="%s/pulls/%s">%s#%[2]s</a>`
 reject_pull_request = `suggested changes for <a href="%s/pulls/%s">%s#%[2]s</a>`
+publish_release  = `released <a href="%s/releases/tag/%s"> "%[4]s" </a> at <a href="%[1]s">%[3]s</a>`
 
 [tool]
 ago = %s ago
diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go
@@ -194,8 +194,8 @@ func CreateRelease(ctx *context.APIContext, form api.CreateReleaseOption) {
 		rel.Repo = ctx.Repo.Repository
 		rel.Publisher = ctx.User
 
-		if err = releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, nil); err != nil {
-			ctx.ServerError("UpdateRelease", err)
+		if err = releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, nil, true); err != nil {
+			ctx.ServerError("UpdateReleaseOrCreatReleaseFromTag", err)
 			return
 		}
 	}
@@ -266,8 +266,8 @@ func EditRelease(ctx *context.APIContext, form api.EditReleaseOption) {
 	if form.IsPrerelease != nil {
 		rel.IsPrerelease = *form.IsPrerelease
 	}
-	if err := releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, nil); err != nil {
-		ctx.Error(http.StatusInternalServerError, "UpdateRelease", err)
+	if err := releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, nil, false); err != nil {
+		ctx.Error(http.StatusInternalServerError, "UpdateReleaseOrCreatReleaseFromTag", err)
 		return
 	}
 
diff --git a/routers/repo/release.go b/routers/repo/release.go
@@ -223,7 +223,7 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) {
 			return
 		}
 
-		rel := &models.Release{
+		rel = &models.Release{
 			RepoID:       ctx.Repo.Repository.ID,
 			PublisherID:  ctx.User.ID,
 			Title:        form.Title,
@@ -262,9 +262,9 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) {
 		rel.PublisherID = ctx.User.ID
 		rel.IsTag = false
 
-		if err = releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, attachmentUUIDs); err != nil {
+		if err = releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, attachmentUUIDs, true); err != nil {
 			ctx.Data["Err_TagName"] = true
-			ctx.ServerError("UpdateRelease", err)
+			ctx.ServerError("UpdateReleaseOrCreatReleaseFromTag", err)
 			return
 		}
 	}
@@ -341,7 +341,7 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
 	rel.Note = form.Content
 	rel.IsDraft = len(form.Draft) > 0
 	rel.IsPrerelease = form.Prerelease
-	if err = releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, attachmentUUIDs); err != nil {
+	if err = releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, attachmentUUIDs, false); err != nil {
 		ctx.ServerError("UpdateRelease", err)
 		return
 	}
diff --git a/services/release/release.go b/services/release/release.go
@@ -95,8 +95,8 @@ func CreateRelease(gitRepo *git.Repository, rel *models.Release, attachmentUUIDs
 	return nil
 }
 
-// UpdateRelease updates information of a release.
-func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Release, attachmentUUIDs []string) (err error) {
+// UpdateReleaseOrCreatReleaseFromTag updates information of a release or create release from tag.
+func UpdateReleaseOrCreatReleaseFromTag(doer *models.User, gitRepo *git.Repository, rel *models.Release, attachmentUUIDs []string, isCreate bool) (err error) {
 	if err = createTag(gitRepo, rel); err != nil {
 		return err
 	}
@@ -110,7 +110,14 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
 		log.Error("AddReleaseAttachments: %v", err)
 	}
 
-	notification.NotifyUpdateRelease(doer, rel)
+	if !isCreate {
+		notification.NotifyUpdateRelease(doer, rel)
+		return
+	}
+
+	if !rel.IsDraft {
+		notification.NotifyNewRelease(rel)
+	}
 
 	return err
 }
diff --git a/services/release/release_test.go b/services/release/release_test.go
@@ -131,7 +131,7 @@ func TestRelease_Update(t *testing.T) {
 	releaseCreatedUnix := release.CreatedUnix
 	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
 	release.Note = "Changed note"
-	assert.NoError(t, UpdateRelease(user, gitRepo, release, nil))
+	assert.NoError(t, UpdateReleaseOrCreatReleaseFromTag(user, gitRepo, release, nil, false))
 	release, err = models.GetReleaseByID(release.ID)
 	assert.NoError(t, err)
 	assert.Equal(t, int64(releaseCreatedUnix), int64(release.CreatedUnix))
@@ -153,7 +153,7 @@ func TestRelease_Update(t *testing.T) {
 	releaseCreatedUnix = release.CreatedUnix
 	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
 	release.Title = "Changed title"
-	assert.NoError(t, UpdateRelease(user, gitRepo, release, nil))
+	assert.NoError(t, UpdateReleaseOrCreatReleaseFromTag(user, gitRepo, release, nil, false))
 	release, err = models.GetReleaseByID(release.ID)
 	assert.NoError(t, err)
 	assert.Less(t, int64(releaseCreatedUnix), int64(release.CreatedUnix))
@@ -176,7 +176,7 @@ func TestRelease_Update(t *testing.T) {
 	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
 	release.Title = "Changed title"
 	release.Note = "Changed note"
-	assert.NoError(t, UpdateRelease(user, gitRepo, release, nil))
+	assert.NoError(t, UpdateReleaseOrCreatReleaseFromTag(user, gitRepo, release, nil, false))
 	release, err = models.GetReleaseByID(release.ID)
 	assert.NoError(t, err)
 	assert.Equal(t, int64(releaseCreatedUnix), int64(release.CreatedUnix))
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
@@ -70,6 +70,10 @@
 						{{else if eq .GetOpType 23}}
 							{{ $index := index .GetIssueInfos 0}}
 							{{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}}
+						{{else if eq .GetOpType 24}}
+							{{ $branchLink := .GetBranch | EscapePound | Escape}}
+							{{ $linkText := .Content | RenderEmoji }}
+							{{$.i18n.Tr "action.publish_release" .GetRepoLink $branchLink .ShortRepoPath $linkText | Str2html}}
 						{{end}}
 					</p>
 					{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ const (`
`49`	`49`	`ActionApprovePullRequest // 21`
`50`	`50`	`ActionRejectPullRequest // 22`
`51`	`51`	`ActionCommentPull // 23`
	`52`	`+ ActionPublishRelease // 24`
`52`	`53`	`)`
`53`	`54`
`54`	`55`	`// Action represents user operation type and other information to`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ func notifyWatchers(e Engine, actions ...*Action) error {`
`252`	`252`	`act.Repo.Units = nil`
`253`	`253`
`254`	`254`	`switch act.OpType {`
`255`		`- case ActionCommitRepo, ActionPushTag, ActionDeleteTag, ActionDeleteBranch:`
	`255`	`+ case ActionCommitRepo, ActionPushTag, ActionDeleteTag, ActionPublishRelease, ActionDeleteBranch:`
`256`	`256`	`if !permCode[i] {`
`257`	`257`	`continue`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,8 @@ func ActionIcon(opType models.ActionType) string {`
`640`	`640`	`return "check"`
`641`	`641`	`case models.ActionRejectPullRequest:`
`642`	`642`	`return "diff"`
	`643`	`+ case models.ActionPublishRelease:`
	`644`	`+ return "tag"`
`643`	`645`	`default:`
`644`	`646`	`return "question"`
`645`	`647`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ func CreateRelease(ctx *context.APIContext, form api.CreateReleaseOption) {`
`194`	`194`	`rel.Repo = ctx.Repo.Repository`
`195`	`195`	`rel.Publisher = ctx.User`
`196`	`196`
`197`		`- if err = releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, nil); err != nil {`
`198`		`- ctx.ServerError("UpdateRelease", err)`
	`197`	`+ if err = releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, nil, true); err != nil {`
	`198`	`+ ctx.ServerError("UpdateReleaseOrCreatReleaseFromTag", err)`
`199`	`199`	`return`
`200`	`200`	`}`
`201`	`201`	`}`
`@@ -266,8 +266,8 @@ func EditRelease(ctx *context.APIContext, form api.EditReleaseOption) {`
`266`	`266`	`if form.IsPrerelease != nil {`
`267`	`267`	`rel.IsPrerelease = *form.IsPrerelease`
`268`	`268`	`}`
`269`		`- if err := releaseservice.UpdateRelease(ctx.User, ctx.Repo.GitRepo, rel, nil); err != nil {`
`270`		`- ctx.Error(http.StatusInternalServerError, "UpdateRelease", err)`
	`269`	`+ if err := releaseservice.UpdateReleaseOrCreatReleaseFromTag(ctx.User, ctx.Repo.GitRepo, rel, nil, false); err != nil {`
	`270`	`+ ctx.Error(http.StatusInternalServerError, "UpdateReleaseOrCreatReleaseFromTag", err)`
`271`	`271`	`return`
`272`	`272`	`}`
`273`	`273`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ func CreateRelease(gitRepo git.Repository, rel models.Release, attachmentUUIDs`
`95`	`95`	`return nil`
`96`	`96`	`}`
`97`	`97`
`98`		`-// UpdateRelease updates information of a release.`
`99`		`-func UpdateRelease(doer models.User, gitRepo git.Repository, rel *models.Release, attachmentUUIDs []string) (err error) {`
	`98`	`+// UpdateReleaseOrCreatReleaseFromTag updates information of a release or create release from tag.`
	`99`	`+func UpdateReleaseOrCreatReleaseFromTag(doer models.User, gitRepo git.Repository, rel *models.Release, attachmentUUIDs []string, isCreate bool) (err error) {`
`100`	`100`	`if err = createTag(gitRepo, rel); err != nil {`
`101`	`101`	`return err`
`102`	`102`	`}`
`@@ -110,7 +110,14 @@ func UpdateRelease(doer models.User, gitRepo git.Repository, rel *models.Relea`
`110`	`110`	`log.Error("AddReleaseAttachments: %v", err)`
`111`	`111`	`}`
`112`	`112`
`113`		`- notification.NotifyUpdateRelease(doer, rel)`
	`113`	`+ if !isCreate {`
	`114`	`+ notification.NotifyUpdateRelease(doer, rel)`
	`115`	`+ return`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ if !rel.IsDraft {`
	`119`	`+ notification.NotifyNewRelease(rel)`
	`120`	`+ }`
`114`	`121`
`115`	`122`	`return err`
`116`	`123`	`}`