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>
		
			
				
	
	
		
			225 lines
		
	
	
	
		
			5.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			225 lines
		
	
	
	
		
			5.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2018 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package repo
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	"code.gitea.io/gitea/modules/base"
 | |
| 	"code.gitea.io/gitea/modules/context"
 | |
| 	auth "code.gitea.io/gitea/modules/forms"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	"code.gitea.io/gitea/modules/web"
 | |
| 	pull_service "code.gitea.io/gitea/services/pull"
 | |
| )
 | |
| 
 | |
| const (
 | |
| 	tplConversation base.TplName = "repo/diff/conversation"
 | |
| 	tplNewComment   base.TplName = "repo/diff/new_comment"
 | |
| )
 | |
| 
 | |
| // RenderNewCodeCommentForm will render the form for creating a new review comment
 | |
| func RenderNewCodeCommentForm(ctx *context.Context) {
 | |
| 	issue := GetActionIssue(ctx)
 | |
| 	if !issue.IsPull {
 | |
| 		return
 | |
| 	}
 | |
| 	currentReview, err := models.GetCurrentReview(ctx.User, issue)
 | |
| 	if err != nil && !models.IsErrReviewNotExist(err) {
 | |
| 		ctx.ServerError("GetCurrentReview", err)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Data["PageIsPullFiles"] = true
 | |
| 	ctx.Data["Issue"] = issue
 | |
| 	ctx.Data["CurrentReview"] = currentReview
 | |
| 	pullHeadCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(issue.PullRequest.GetGitRefName())
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("GetRefCommitID", err)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Data["AfterCommitID"] = pullHeadCommitID
 | |
| 	ctx.HTML(200, tplNewComment)
 | |
| }
 | |
| 
 | |
| // CreateCodeComment will create a code comment including an pending review if required
 | |
| func CreateCodeComment(ctx *context.Context) {
 | |
| 	form := web.GetForm(ctx).(*auth.CodeCommentForm)
 | |
| 	issue := GetActionIssue(ctx)
 | |
| 	if !issue.IsPull {
 | |
| 		return
 | |
| 	}
 | |
| 	if ctx.Written() {
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if ctx.HasError() {
 | |
| 		ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
 | |
| 		ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	signedLine := form.Line
 | |
| 	if form.Side == "previous" {
 | |
| 		signedLine *= -1
 | |
| 	}
 | |
| 
 | |
| 	comment, err := pull_service.CreateCodeComment(
 | |
| 		ctx.User,
 | |
| 		ctx.Repo.GitRepo,
 | |
| 		issue,
 | |
| 		signedLine,
 | |
| 		form.Content,
 | |
| 		form.TreePath,
 | |
| 		form.IsReview,
 | |
| 		form.Reply,
 | |
| 		form.LatestCommitID,
 | |
| 	)
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("CreateCodeComment", err)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if comment == nil {
 | |
| 		log.Trace("Comment not created: %-v #%d[%d]", ctx.Repo.Repository, issue.Index, issue.ID)
 | |
| 		ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	log.Trace("Comment created: %-v #%d[%d] Comment[%d]", ctx.Repo.Repository, issue.Index, issue.ID, comment.ID)
 | |
| 
 | |
| 	if form.Origin == "diff" {
 | |
| 		renderConversation(ctx, comment)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Redirect(comment.HTMLURL())
 | |
| }
 | |
| 
 | |
| // UpdateResolveConversation add or remove an Conversation resolved mark
 | |
| func UpdateResolveConversation(ctx *context.Context) {
 | |
| 	origin := ctx.Query("origin")
 | |
| 	action := ctx.Query("action")
 | |
| 	commentID := ctx.QueryInt64("comment_id")
 | |
| 
 | |
| 	comment, err := models.GetCommentByID(commentID)
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("GetIssueByID", err)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if err = comment.LoadIssue(); err != nil {
 | |
| 		ctx.ServerError("comment.LoadIssue", err)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	var permResult bool
 | |
| 	if permResult, err = models.CanMarkConversation(comment.Issue, ctx.User); err != nil {
 | |
| 		ctx.ServerError("CanMarkConversation", err)
 | |
| 		return
 | |
| 	}
 | |
| 	if !permResult {
 | |
| 		ctx.Error(403)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if !comment.Issue.IsPull {
 | |
| 		ctx.Error(400)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if action == "Resolve" || action == "UnResolve" {
 | |
| 		err = models.MarkConversation(comment, ctx.User, action == "Resolve")
 | |
| 		if err != nil {
 | |
| 			ctx.ServerError("MarkConversation", err)
 | |
| 			return
 | |
| 		}
 | |
| 	} else {
 | |
| 		ctx.Error(400)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	if origin == "diff" {
 | |
| 		renderConversation(ctx, comment)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.JSON(200, map[string]interface{}{
 | |
| 		"ok": true,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func renderConversation(ctx *context.Context, comment *models.Comment) {
 | |
| 	comments, err := models.FetchCodeCommentsByLine(comment.Issue, ctx.User, comment.TreePath, comment.Line)
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("FetchCodeCommentsByLine", err)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Data["PageIsPullFiles"] = true
 | |
| 	ctx.Data["comments"] = comments
 | |
| 	ctx.Data["CanMarkConversation"] = true
 | |
| 	ctx.Data["Issue"] = comment.Issue
 | |
| 	if err = comment.Issue.LoadPullRequest(); err != nil {
 | |
| 		ctx.ServerError("comment.Issue.LoadPullRequest", err)
 | |
| 		return
 | |
| 	}
 | |
| 	pullHeadCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(comment.Issue.PullRequest.GetGitRefName())
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("GetRefCommitID", err)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Data["AfterCommitID"] = pullHeadCommitID
 | |
| 	ctx.HTML(200, tplConversation)
 | |
| }
 | |
| 
 | |
| // SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
 | |
| func SubmitReview(ctx *context.Context) {
 | |
| 	form := web.GetForm(ctx).(*auth.SubmitReviewForm)
 | |
| 	issue := GetActionIssue(ctx)
 | |
| 	if !issue.IsPull {
 | |
| 		return
 | |
| 	}
 | |
| 	if ctx.Written() {
 | |
| 		return
 | |
| 	}
 | |
| 	if ctx.HasError() {
 | |
| 		ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
 | |
| 		ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	reviewType := form.ReviewType()
 | |
| 	switch reviewType {
 | |
| 	case models.ReviewTypeUnknown:
 | |
| 		ctx.ServerError("ReviewType", fmt.Errorf("unknown ReviewType: %s", form.Type))
 | |
| 		return
 | |
| 
 | |
| 	// can not approve/reject your own PR
 | |
| 	case models.ReviewTypeApprove, models.ReviewTypeReject:
 | |
| 		if issue.IsPoster(ctx.User.ID) {
 | |
| 			var translated string
 | |
| 			if reviewType == models.ReviewTypeApprove {
 | |
| 				translated = ctx.Tr("repo.issues.review.self.approval")
 | |
| 			} else {
 | |
| 				translated = ctx.Tr("repo.issues.review.self.rejection")
 | |
| 			}
 | |
| 
 | |
| 			ctx.Flash.Error(translated)
 | |
| 			ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
 | |
| 			return
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	_, comm, err := pull_service.SubmitReview(ctx.User, ctx.Repo.GitRepo, issue, reviewType, form.Content, form.CommitID)
 | |
| 	if err != nil {
 | |
| 		if models.IsContentEmptyErr(err) {
 | |
| 			ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty"))
 | |
| 			ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
 | |
| 		} else {
 | |
| 			ctx.ServerError("SubmitReview", err)
 | |
| 		}
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	ctx.Redirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, issue.Index, comm.HashTag()))
 | |
| }
 |