Use correct context in routers/web (#19597)

Gusted · web-flow · commit cc3016f70d81 · 2022-05-03T23:38:34.000+02:00
- Don't use the `APIContext` in the web routers.
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
@@ -15,7 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/setting"
-	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/structs"
 )
 
 const (
@@ -194,6 +194,6 @@ func NotificationPurgePost(c *context.Context) {
 }
 
 // NewAvailable returns the notification counts
-func NewAvailable(ctx *context.APIContext) {
-	ctx.JSON(http.StatusOK, api.NotificationCount{New: models.CountUnread(ctx.Doer)})
+func NewAvailable(ctx *context.Context) {
+	ctx.JSON(http.StatusOK, structs.NotificationCount{New: models.CountUnread(ctx.Doer)})
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"code.gitea.io/gitea/modules/base"`
`16`	`16`	`"code.gitea.io/gitea/modules/context"`
`17`	`17`	`"code.gitea.io/gitea/modules/setting"`
`18`		`- api "code.gitea.io/gitea/modules/structs"`
	`18`	`+ "code.gitea.io/gitea/modules/structs"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`const (`
`@@ -194,6 +194,6 @@ func NotificationPurgePost(c *context.Context) {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`// NewAvailable returns the notification counts`
`197`		`-func NewAvailable(ctx *context.APIContext) {`
`198`		`- ctx.JSON(http.StatusOK, api.NotificationCount{New: models.CountUnread(ctx.Doer)})`
	`197`	`+func NewAvailable(ctx *context.Context) {`
	`198`	`+ ctx.JSON(http.StatusOK, structs.NotificationCount{New: models.CountUnread(ctx.Doer)})`
`199`	`199`	`}`