From 7a893dab396c24d7e158b190f0a0182ff75bbcfd Mon Sep 17 00:00:00 2001 From: eladyn <59307989+eladyn@users.noreply.github.com> Date: Thu, 3 Mar 2022 16:18:26 +0100 Subject: [PATCH] ignore missing comment for user notifications (#18954) * ignore missing comment for user notifications * instead fix bug in notifications model * use local variable instead Co-authored-by: Lunny Xiao Co-authored-by: 6543 <6543@obermui.de> --- models/notification.go | 7 ++++--- routers/api/v1/notify/repo.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/models/notification.go b/models/notification.go index 8f5d9d01e..b53d236e4 100644 --- a/models/notification.go +++ b/models/notification.go @@ -498,14 +498,15 @@ func (n *Notification) APIURL() string { type NotificationList []*Notification // LoadAttributes load Repo Issue User and Comment if not loaded -func (nl NotificationList) LoadAttributes() (err error) { +func (nl NotificationList) LoadAttributes() error { + var err error for i := 0; i < len(nl); i++ { err = nl[i].LoadAttributes() if err != nil && !IsErrCommentNotExist(err) { - return + return err } } - return + return nil } func (nl NotificationList) getPendingRepoIDs() []int64 { diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index 8bf5d3711..30357ebd3 100644 --- a/routers/api/v1/notify/repo.go +++ b/routers/api/v1/notify/repo.go @@ -121,7 +121,7 @@ func ListRepoNotifications(ctx *context.APIContext) { return } err = nl.LoadAttributes() - if err != nil && !models.IsErrCommentNotExist(err) { + if err != nil { ctx.InternalServerError(err) return }