From 4047c5c068b80b66e0e61247ec239dc388615a02 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 10 Mar 2022 06:48:27 +0000
Subject: [PATCH] Ignore missing comment for user notifications (#18954)
(#19043)
---
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 8f5d9d01e6..b53d236e43 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 8bf5d37116..30357ebd3f 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
}