From 72366a5b27140647eef4694fd9edb952b120ee9c Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 18 Oct 2023 20:06:07 +0200 Subject: [PATCH] feat(webhooks): add created by user object when returning all webhooks --- pkg/models/webhooks.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/models/webhooks.go b/pkg/models/webhooks.go index 15f45ed7d4e..cc8884d437b 100644 --- a/pkg/models/webhooks.go +++ b/pkg/models/webhooks.go @@ -156,6 +156,21 @@ func (w *Webhook) ReadAll(s *xorm.Session, a web.Auth, _ string, page int, perPa return } + userIDs := []int64{} + for _, webhook := range ws { + userIDs = append(userIDs, webhook.CreatedByID) + } + + users, err := user.GetUsersByIDs(s, userIDs) + if err != nil { + return nil, 0, 0, err + } + + for _, webhook := range ws { + webhook.Secret = "" + webhook.CreatedBy = users[webhook.CreatedByID] + } + return ws, len(ws), total, err }