Remove all lock reason checks

Author: YaFou

models/issues/issue_lock.go

@@ -5,12 +5,9 @@ package issues
 
 import (
 	"context"
-	"slices"
-	"strings"
 
 	"code.gitea.io/gitea/models/db"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/setting"
 )
 
 // IssueLockOptions defines options for locking and/or unlocking an issue/PR
@@ -67,13 +64,3 @@ func updateIssueLock(ctx context.Context, opts *IssueLockOptions, lock bool) err
 
 	return committer.Commit()
 }
-
-// IsValidReason checks to make sure that the reason submitted
-// matches any of the values in the config
-func IsValidReason(reason string) bool {
-	if strings.TrimSpace(reason) == "" {
-		return true
-	}
-
-	return slices.Contains(setting.Repository.Issue.LockReasons, reason)
-}

models/issues/issue_test.go

@@ -466,23 +466,3 @@ func TestMigrate_CreateIssuesIsPullFalse(t *testing.T) {
 func TestMigrate_CreateIssuesIsPullTrue(t *testing.T) {
 	assertCreateIssues(t, true)
 }
-
-func TestIssueLock_IsValidReason(t *testing.T) {
-	cases := []struct {
-		reason   string
-		expected bool
-	}{
-		{"", true}, // an empty reason is accepted
-		{"Off-topic", true},
-		{"Too heated", true},
-		{"Spam", true},
-		{"Resolved", true},
-
-		{"ZZZZ", false},
-		{"I want to lock this issue", false},
-	}
-
-	for _, v := range cases {
-		assert.Equal(t, v.expected, issues_model.IsValidReason(v.reason))
-	}
-}

routers/api/v1/repo/issue_lock.go

@@ -50,8 +50,6 @@ func LockIssue(ctx *context.APIContext) {
 	// responses:
 	//   "204":
 	//     "$ref": "#/responses/empty"
-	//   "400":
-	//     "$ref": "#/responses/error"
 	//   "403":
 	//     "$ref": "#/responses/forbidden"
 	//   "404":
@@ -64,11 +62,6 @@ func LockIssue(ctx *context.APIContext) {
 	reasonParts[0] = caser.String(reasonParts[0])
 	reason = strings.Join(reasonParts, " ")
 
-	if !issues_model.IsValidReason(reason) {
-		ctx.APIError(http.StatusBadRequest, errors.New("reason not valid"))
-		return
-	}
-
 	issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index"))
 	if err != nil {
 		if issues_model.IsErrIssueNotExist(err) {

routers/web/repo/issue_lock.go

@@ -24,11 +24,6 @@ func LockIssue(ctx *context.Context) {
 		return
 	}
 
-	if !issues_model.IsValidReason(form.Reason) {
-		ctx.JSONError(ctx.Tr("repo.issues.lock.unknown_reason"))
-		return
-	}
-
 	if err := issues_model.LockIssue(ctx, &issues_model.IssueLockOptions{
 		Doer:   ctx.Doer,
 		Issue:  issue,

templates/swagger/v1_json.tmpl

@@ -31,12 +31,8 @@ func TestAPILockIssue(t *testing.T) {
 	session := loginUser(t, owner.Name)
 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
 
-	// check invalid reason
-	req := NewRequestWithJSON(t, "PUT", urlStr, api.LockIssueOption{Reason: "Not valid"}).AddTokenAuth(token)
-	MakeRequest(t, req, http.StatusBadRequest)
-
 	// check lock issue
-	req = NewRequestWithJSON(t, "PUT", urlStr, api.LockIssueOption{Reason: "Spam"}).AddTokenAuth(token)
+	req := NewRequestWithJSON(t, "PUT", urlStr, api.LockIssueOption{Reason: "Spam"}).AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusNoContent)
 	issueAfter := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
 	assert.True(t, issueAfter.IsLocked)