femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix bugs related to notification endpoints (#25548) (#25562)

Browse source 
Backport #25548 by @Zettat123

This PR
- fixes #25545
- fixes two incorrect `reqToken()` in `/notifications` endpoints (caused
by #24767)

Co-authored-by: Zettat123 <zettat123@gmail.com>
This commit is contained in:
Giteabot 2023-06-28 12:24:48 -04:00 committed by GitHub
parent 7222bac4e3
commit 77db40e084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routers/api/v1/api.go
View file

@ -783,11 +783,11 @@ func Routes(ctx gocontext.Context) *web.Route {
m.Group("/notifications", func() { m.Group("/notifications", func() {
m.Combo(""). m.Combo("").
Get(notify.ListNotifications). Get(notify.ListNotifications).
Put(notify.ReadNotifications, reqToken()) Put(reqToken(), notify.ReadNotifications)
m.Get("/new", notify.NewAvailable) m.Get("/new", notify.NewAvailable)
m.Combo("/threads/{id}"). m.Combo("/threads/{id}").
Get(notify.GetThread). Get(notify.GetThread).
Patch(notify.ReadThread, reqToken()) Patch(reqToken(), notify.ReadThread)
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification)) }, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification))
// Users (requires user scope) // Users (requires user scope)

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

@ -183,7 +183,7 @@ func ReadRepoNotifications(ctx *context.APIContext) {
if len(qLastRead) > 0 { if len(qLastRead) > 0 {
tmpLastRead, err := time.Parse(time.RFC3339, qLastRead) tmpLastRead, err := time.Parse(time.RFC3339, qLastRead)
if err != nil { if err != nil {
ctx.InternalServerError(err) ctx.Error(http.StatusBadRequest, "Parse", err)
return return
} }
if !tmpLastRead.IsZero() { if !tmpLastRead.IsZero() {

2
routers/api/v1/notify/user.go
View file

@ -132,7 +132,7 @@ func ReadNotifications(ctx *context.APIContext) {
if len(qLastRead) > 0 { if len(qLastRead) > 0 {
tmpLastRead, err := time.Parse(time.RFC3339, qLastRead) tmpLastRead, err := time.Parse(time.RFC3339, qLastRead)
if err != nil { if err != nil {
ctx.InternalServerError(err) ctx.Error(http.StatusBadRequest, "Parse", err)
return return
} }
if !tmpLastRead.IsZero() { if !tmpLastRead.IsZero() {