mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 00:20:25 +08:00 
			
		
		
		
	Move macaron to chi (#14293)
Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
		@@ -13,6 +13,7 @@ import (
 | 
			
		||||
	"code.gitea.io/gitea/modules/context"
 | 
			
		||||
	"code.gitea.io/gitea/modules/convert"
 | 
			
		||||
	api "code.gitea.io/gitea/modules/structs"
 | 
			
		||||
	"code.gitea.io/gitea/modules/web"
 | 
			
		||||
	"code.gitea.io/gitea/routers/api/v1/utils"
 | 
			
		||||
	comment_service "code.gitea.io/gitea/services/comments"
 | 
			
		||||
)
 | 
			
		||||
@@ -174,7 +175,7 @@ func ListRepoIssueComments(ctx *context.APIContext) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// CreateIssueComment create a comment for an issue
 | 
			
		||||
func CreateIssueComment(ctx *context.APIContext, form api.CreateIssueCommentOption) {
 | 
			
		||||
func CreateIssueComment(ctx *context.APIContext) {
 | 
			
		||||
	// swagger:operation POST /repos/{owner}/{repo}/issues/{index}/comments issue issueCreateComment
 | 
			
		||||
	// ---
 | 
			
		||||
	// summary: Add a comment to an issue
 | 
			
		||||
@@ -208,7 +209,7 @@ func CreateIssueComment(ctx *context.APIContext, form api.CreateIssueCommentOpti
 | 
			
		||||
	//     "$ref": "#/responses/Comment"
 | 
			
		||||
	//   "403":
 | 
			
		||||
	//     "$ref": "#/responses/forbidden"
 | 
			
		||||
 | 
			
		||||
	form := web.GetForm(ctx).(*api.CreateIssueCommentOption)
 | 
			
		||||
	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err)
 | 
			
		||||
@@ -298,7 +299,7 @@ func GetIssueComment(ctx *context.APIContext) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// EditIssueComment modify a comment of an issue
 | 
			
		||||
func EditIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption) {
 | 
			
		||||
func EditIssueComment(ctx *context.APIContext) {
 | 
			
		||||
	// swagger:operation PATCH /repos/{owner}/{repo}/issues/comments/{id} issue issueEditComment
 | 
			
		||||
	// ---
 | 
			
		||||
	// summary: Edit a comment
 | 
			
		||||
@@ -337,11 +338,12 @@ func EditIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
 | 
			
		||||
	//   "404":
 | 
			
		||||
	//     "$ref": "#/responses/notFound"
 | 
			
		||||
 | 
			
		||||
	editIssueComment(ctx, form)
 | 
			
		||||
	form := web.GetForm(ctx).(*api.EditIssueCommentOption)
 | 
			
		||||
	editIssueComment(ctx, *form)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// EditIssueCommentDeprecated modify a comment of an issue
 | 
			
		||||
func EditIssueCommentDeprecated(ctx *context.APIContext, form api.EditIssueCommentOption) {
 | 
			
		||||
func EditIssueCommentDeprecated(ctx *context.APIContext) {
 | 
			
		||||
	// swagger:operation PATCH /repos/{owner}/{repo}/issues/{index}/comments/{id} issue issueEditCommentDeprecated
 | 
			
		||||
	// ---
 | 
			
		||||
	// summary: Edit a comment
 | 
			
		||||
@@ -386,7 +388,8 @@ func EditIssueCommentDeprecated(ctx *context.APIContext, form api.EditIssueComme
 | 
			
		||||
	//   "404":
 | 
			
		||||
	//     "$ref": "#/responses/notFound"
 | 
			
		||||
 | 
			
		||||
	editIssueComment(ctx, form)
 | 
			
		||||
	form := web.GetForm(ctx).(*api.EditIssueCommentOption)
 | 
			
		||||
	editIssueComment(ctx, *form)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user