diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-10 13:48:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 13:48:45 +0800 |
| commit | 43bbc5478370cbfe3ab1eed730ea002ccec74708 (patch) | |
| tree | a61e1a93843b727c40ef49b68ec75898a72e78e4 /routers | |
| parent | 33fca2b537d36cf998dd27425b2bb8ed5b0965f3 (diff) | |
| download | gitea-43bbc5478370cbfe3ab1eed730ea002ccec74708.tar.gz gitea-43bbc5478370cbfe3ab1eed730ea002ccec74708.zip | |
Fix 500 when a comment was deleted which has a notification (#17550)
* Fix 500 when a comment was deleted which has a notification
* Tolerate missing Comment in other places too
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/notify/repo.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/notify/threads.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index 382d221b85..83d0fa5555 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 { + if err != nil && !models.IsErrCommentNotExist(err) { ctx.InternalServerError(err) return } diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index 2e241080b4..5bfdd4d963 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -40,7 +40,7 @@ func GetThread(ctx *context.APIContext) { if n == nil { return } - if err := n.LoadAttributes(); err != nil { + if err := n.LoadAttributes(); err != nil && !models.IsErrCommentNotExist(err) { ctx.InternalServerError(err) return } @@ -92,7 +92,7 @@ func ReadThread(ctx *context.APIContext) { ctx.InternalServerError(err) return } - if err = notif.LoadAttributes(); err != nil { + if err = notif.LoadAttributes(); err != nil && !models.IsErrCommentNotExist(err) { ctx.InternalServerError(err) return } |