lianguan/gitea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore missing comment for user notifications (#18954) (#19043)

Browse Source
This commit is contained in:
zeripath 2022-03-10 06:48:27 +00:00 committed by GitHub
parent 03d924238c
commit 4047c5c068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/notification.go
View File

@ -498,14 +498,15 @@ func (n *Notification) APIURL() string {
type NotificationList []*Notification type NotificationList []*Notification
// LoadAttributes load Repo Issue User and Comment if not loaded // 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++ { for i := 0; i < len(nl); i++ {
err = nl[i].LoadAttributes() err = nl[i].LoadAttributes()
if err != nil && !IsErrCommentNotExist(err) { if err != nil && !IsErrCommentNotExist(err) {
return return err
} }
} }
return return nil
} }
func (nl NotificationList) getPendingRepoIDs() []int64 { func (nl NotificationList) getPendingRepoIDs() []int64 {

2
routers/api/v1/notify/repo.go
View File

@ -121,7 +121,7 @@ func ListRepoNotifications(ctx *context.APIContext) {
return return
} }
err = nl.LoadAttributes() err = nl.LoadAttributes()
if err != nil && !models.IsErrCommentNotExist(err) { if err != nil {
ctx.InternalServerError(err) ctx.InternalServerError(err)
return return
} }