Skip to content

Commit 3968c11

Browse files
ethantkoeniglafriks
authored andcommitted
Fix SQL type error for webhooks (#3424)
1 parent e189b06 commit 3968c11

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

models/webhook.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"code.gitea.io/gitea/modules/util"
2121
api "code.gitea.io/sdk/gitea"
2222

23+
"github.com/Unknwon/com"
2324
gouuid "github.com/satori/go.uuid"
2425
)
2526

@@ -677,9 +678,15 @@ func DeliverHooks() {
677678
}
678679

679680
// Start listening on new hook requests.
680-
for repoID := range HookQueue.Queue() {
681-
log.Trace("DeliverHooks [repo_id: %v]", repoID)
682-
HookQueue.Remove(repoID)
681+
for repoIDStr := range HookQueue.Queue() {
682+
log.Trace("DeliverHooks [repo_id: %v]", repoIDStr)
683+
HookQueue.Remove(repoIDStr)
684+
685+
repoID, err := com.StrTo(repoIDStr).Int64()
686+
if err != nil {
687+
log.Error(4, "Invalid repo ID: %s", repoIDStr)
688+
continue
689+
}
683690

684691
tasks = make([]*HookTask, 0, 5)
685692
if err := x.Where("repo_id=? AND is_delivered=?", repoID, false).Find(&tasks); err != nil {

0 commit comments

Comments
 (0)