improve

Author: wxiaoguang

models/issues/pull_list.go

@@ -14,6 +14,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 
 	"xorm.io/builder"
@@ -328,7 +329,7 @@ func HasMergedPullRequestInRepo(ctx context.Context, repoID, posterID int64) (bo
 }
 
 // HasMergedPullRequestInRepoBefore returns whether the user has a merged PR before a timestamp (0 = no limit)
-func HasMergedPullRequestInRepoBefore(ctx context.Context, repoID, posterID, beforeUnix, excludePullID int64) (bool, error) {
+func HasMergedPullRequestInRepoBefore(ctx context.Context, repoID, posterID int64, beforeUnix timeutil.TimeStamp, excludePullID int64) (bool, error) {
 	sess := db.GetEngine(ctx).
 		Join("INNER", "pull_request", "pull_request.issue_id = issue.id").
 		Where("repo_id=?", repoID).

routers/web/repo/release.go

@@ -18,7 +18,6 @@ import (
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/setting"
@@ -409,10 +408,7 @@ func GenerateReleaseNotes(ctx *context.Context) {
 		if errTr := util.ErrorAsTranslatable(err); errTr != nil {
 			ctx.JSONError(errTr.Translate(ctx.Locale))
 		} else {
-			log.Error("GenerateReleaseNotes: %v", err)
-			ctx.JSON(http.StatusInternalServerError, map[string]any{
-				"errorMessage": ctx.Tr("error.occurred"),
-			})
+			ctx.ServerError("GenerateReleaseNotes", err)
 		}
 		return
 	}

services/release/notes.go

@@ -33,49 +33,12 @@ type GenerateReleaseNotesResult struct {
 	PreviousTag string
 }
 
-// ErrReleaseNotesTagNotFound indicates a requested tag does not exist in git.
-type ErrReleaseNotesTagNotFound struct {
-	TagName string
-}
-
-func (err ErrReleaseNotesTagNotFound) Error() string {
-	return fmt.Sprintf("tag %q not found", err.TagName)
-}
-
-func (err ErrReleaseNotesTagNotFound) Unwrap() error {
-	return util.ErrNotExist
-}
-
 func newErrReleaseNotesTagNotFound(tagName string) error {
-	return util.ErrorWrapTranslatable(ErrReleaseNotesTagNotFound{TagName: tagName}, "repo.release.generate_notes_tag_not_found", tagName)
-}
-
-// ErrReleaseNotesNoBaseTag indicates there is no tag to diff against.
-type ErrReleaseNotesNoBaseTag struct{}
-
-func (err ErrReleaseNotesNoBaseTag) Error() string {
-	return "no previous tag found for release notes"
-}
-
-func (err ErrReleaseNotesNoBaseTag) Unwrap() error {
-	return util.ErrNotExist
-}
-
-// ErrReleaseNotesTargetNotFound indicates the release target ref cannot be resolved.
-type ErrReleaseNotesTargetNotFound struct {
-	Ref string
-}
-
-func (err ErrReleaseNotesTargetNotFound) Error() string {
-	return fmt.Sprintf("release target %q not found", err.Ref)
-}
-
-func (err ErrReleaseNotesTargetNotFound) Unwrap() error {
-	return util.ErrNotExist
+	return util.ErrorWrapTranslatable(util.NewNotExistErrorf("tag %q not found", tagName), "repo.release.generate_notes_tag_not_found", tagName)
 }
 
 func newErrReleaseNotesTargetNotFound(ref string) error {
-	return util.ErrorWrapTranslatable(ErrReleaseNotesTargetNotFound{Ref: ref}, "repo.release.generate_notes_target_not_found", ref)
+	return util.ErrorWrapTranslatable(util.NewNotExistErrorf("release target %q not found", ref), "repo.release.generate_notes_target_not_found", ref)
 }
 
 // GenerateReleaseNotes builds the markdown snippet for release notes.
@@ -375,7 +338,7 @@ func collectContributors(ctx context.Context, repoID int64, prs []*issues_model.
 }
 
 func isFirstContribution(ctx context.Context, repoID, posterID int64, pr *issues_model.PullRequest) (bool, error) {
-	hasMergedBefore, err := issues_model.HasMergedPullRequestInRepoBefore(ctx, repoID, posterID, int64(pr.MergedUnix), pr.ID)
+	hasMergedBefore, err := issues_model.HasMergedPullRequestInRepoBefore(ctx, repoID, posterID, pr.MergedUnix, pr.ID)
 	if err != nil {
 		return false, fmt.Errorf("check merged PRs for contributor: %w", err)
 	}

web_src/js/features/repo-release.ts

@@ -58,7 +58,7 @@ function initGenerateReleaseNotes() {
   const tagNameInput = document.querySelector<HTMLInputElement>('#tag-name');
   const targetInput = document.querySelector<HTMLInputElement>("input[name='tag_target']");
   const previousTagSelect = document.querySelector<HTMLSelectElement>('#release-previous-tag');
-  const missingTagMessage = button.getAttribute('data-missing-tag-message') || 'Tag name is required';
+  const missingTagMessage = button.getAttribute('data-missing-tag-message');
   const generateUrl = button.getAttribute('data-generate-url');
 
   button.addEventListener('click', async () => {