From 85992ceb6cb8ad6ecd708881367387c4cce646df Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Wed, 28 Jun 2023 22:26:56 +0800
Subject: [PATCH] Fix bugs related to notification endpoints (#25548)

---
 routers/api/v1/api.go         | 4 ++--
 routers/api/v1/notify/repo.go | 2 +-
 routers/api/v1/notify/user.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 37361a8b963bd..52323cef76dbe 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -783,11 +783,11 @@ func Routes(ctx gocontext.Context) *web.Route {
 		m.Group("/notifications", func() {
 			m.Combo("").
 				Get(notify.ListNotifications).
-				Put(notify.ReadNotifications, reqToken())
+				Put(reqToken(), notify.ReadNotifications)
 			m.Get("/new", notify.NewAvailable)
 			m.Combo("/threads/{id}").
 				Get(notify.GetThread).
-				Patch(notify.ReadThread, reqToken())
+				Patch(reqToken(), notify.ReadThread)
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification))
 
 		// Users (requires user scope)
diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go
index bd3b86a6f1525..e16c54a2c0bb4 100644
--- a/routers/api/v1/notify/repo.go
+++ b/routers/api/v1/notify/repo.go
@@ -183,7 +183,7 @@ func ReadRepoNotifications(ctx *context.APIContext) {
 	if len(qLastRead) > 0 {
 		tmpLastRead, err := time.Parse(time.RFC3339, qLastRead)
 		if err != nil {
-			ctx.InternalServerError(err)
+			ctx.Error(http.StatusBadRequest, "Parse", err)
 			return
 		}
 		if !tmpLastRead.IsZero() {
diff --git a/routers/api/v1/notify/user.go b/routers/api/v1/notify/user.go
index 2261610c09238..a9c6b4361794d 100644
--- a/routers/api/v1/notify/user.go
+++ b/routers/api/v1/notify/user.go
@@ -132,7 +132,7 @@ func ReadNotifications(ctx *context.APIContext) {
 	if len(qLastRead) > 0 {
 		tmpLastRead, err := time.Parse(time.RFC3339, qLastRead)
 		if err != nil {
-			ctx.InternalServerError(err)
+			ctx.Error(http.StatusBadRequest, "Parse", err)
 			return
 		}
 		if !tmpLastRead.IsZero() {