Fix bugs related to notification endpoints (go-gitea#25548)

GiteaBot · Jun 28, 2023 · 85992ce · 85992ce
1 parent 0eb4ab4
commit 85992ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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() {