feat: vendor gitea 1.16.2

package/gitea/source/models/webhook/webhook.go

@@ -126,6 +126,7 @@ type Webhook struct {
 	OwnerID                   int64 `xorm:"INDEX"`
 	IsSystemWebhook           bool
 	URL                       string `xorm:"url TEXT"`
+	Name                      string `xorm:"VARCHAR(255) NOT NULL DEFAULT ''"`
 	HTTPMethod                string `xorm:"http_method"`
 	ContentType               HookContentType
 	Secret                    string `xorm:"TEXT"`

package/gitea/source/models/webhook/webhook_system.go

@@ -9,19 +9,32 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/optional"
+
+	"xorm.io/builder"
 )
 
-// GetSystemOrDefaultWebhooks returns webhooks by given argument or all if argument is missing.
-func GetSystemOrDefaultWebhooks(ctx context.Context, isSystemWebhook optional.Option[bool]) ([]*Webhook, error) {
-	webhooks := make([]*Webhook, 0, 5)
-	if !isSystemWebhook.Has() {
-		return webhooks, db.GetEngine(ctx).Where("repo_id=? AND owner_id=?", 0, 0).
-			Find(&webhooks)
-	}
+// ListSystemWebhookOptions options for listing system or default webhooks
+type ListSystemWebhookOptions struct {
+	db.ListOptions
+	IsActive optional.Option[bool]
+	IsSystem optional.Option[bool]
+}
 
-	return webhooks, db.GetEngine(ctx).
-		Where("repo_id=? AND owner_id=? AND is_system_webhook=?", 0, 0, isSystemWebhook.Value()).
-		Find(&webhooks)
+func (opts ListSystemWebhookOptions) ToConds() builder.Cond {
+	cond := builder.NewCond()
+	cond = cond.And(builder.Eq{"webhook.repo_id": 0}, builder.Eq{"webhook.owner_id": 0})
+	if opts.IsActive.Has() {
+		cond = cond.And(builder.Eq{"webhook.is_active": opts.IsActive.Value()})
+	}
+	if opts.IsSystem.Has() {
+		cond = cond.And(builder.Eq{"is_system_webhook": opts.IsSystem.Value()})
+	}
+	return cond
+}
+
+// GetGlobalWebhooks returns global (default and/or system) webhooks
+func GetGlobalWebhooks(ctx context.Context, opts *ListSystemWebhookOptions) ([]*Webhook, int64, error) {
+	return db.FindAndCount[Webhook](ctx, opts)
 }
 
 // GetDefaultWebhooks returns all admin-default webhooks.

package/gitea/source/models/webhook/webhook_system_test.go

@@ -12,23 +12,24 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetSystemOrDefaultWebhooks(t *testing.T) {
+func TestListSystemWebhookOptions(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	hooks, err := GetSystemOrDefaultWebhooks(t.Context(), optional.None[bool]())
+	opts := ListSystemWebhookOptions{IsSystem: optional.None[bool]()}
+	hooks, _, err := GetGlobalWebhooks(t.Context(), &opts)
 	assert.NoError(t, err)
 	if assert.Len(t, hooks, 2) {
 		assert.Equal(t, int64(5), hooks[0].ID)
 		assert.Equal(t, int64(6), hooks[1].ID)
 	}
-
-	hooks, err = GetSystemOrDefaultWebhooks(t.Context(), optional.Some(true))
+	opts.IsSystem = optional.Some(true)
+	hooks, _, err = GetGlobalWebhooks(t.Context(), &opts)
 	assert.NoError(t, err)
 	if assert.Len(t, hooks, 1) {
 		assert.Equal(t, int64(5), hooks[0].ID)
 	}
 
-	hooks, err = GetSystemOrDefaultWebhooks(t.Context(), optional.Some(false))
+	opts.IsSystem = optional.Some(false)
+	hooks, _, err = GetGlobalWebhooks(t.Context(), &opts)
 	assert.NoError(t, err)
 	if assert.Len(t, hooks, 1) {
 		assert.Equal(t, int64(6), hooks[0].ID)