From ef98b168f74851138ba16131197174a75ded3f6c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 7 Dec 2019 23:52:36 +0800 Subject: Move UpdateIssuesCommit from models to repofiles (#9276) --- models/action.go | 128 ------------------------------------------------------- 1 file changed, 128 deletions(-) (limited to 'models/action.go') diff --git a/models/action.go b/models/action.go index 8673dd2946..bd7ceb4b36 100644 --- a/models/action.go +++ b/models/action.go @@ -7,7 +7,6 @@ package models import ( "fmt" - "html" "path" "strconv" "strings" @@ -16,7 +15,6 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" @@ -409,132 +407,6 @@ func (pc *PushCommits) AvatarLink(email string) string { return pc.avatars[email] } -// getIssueFromRef returns the issue referenced by a ref. Returns a nil *Issue -// if the provided ref references a non-existent issue. -func getIssueFromRef(repo *Repository, index int64) (*Issue, error) { - issue, err := GetIssueByIndex(repo.ID, index) - if err != nil { - if IsErrIssueNotExist(err) { - return nil, nil - } - return nil, err - } - return issue, nil -} - -func changeIssueStatus(repo *Repository, issue *Issue, doer *User, status bool) error { - - stopTimerIfAvailable := func(doer *User, issue *Issue) error { - - if StopwatchExists(doer.ID, issue.ID) { - if err := CreateOrStopIssueStopwatch(doer, issue); err != nil { - return err - } - } - - return nil - } - - issue.Repo = repo - if err := issue.ChangeStatus(doer, status); err != nil { - // Don't return an error when dependencies are open as this would let the push fail - if IsErrDependenciesLeft(err) { - return stopTimerIfAvailable(doer, issue) - } - return err - } - - return stopTimerIfAvailable(doer, issue) -} - -// UpdateIssuesCommit checks if issues are manipulated by commit message. -func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit, branchName string) error { - // Commits are appended in the reverse order. - for i := len(commits) - 1; i >= 0; i-- { - c := commits[i] - - type markKey struct { - ID int64 - Action references.XRefAction - } - - refMarked := make(map[markKey]bool) - var refRepo *Repository - var refIssue *Issue - var err error - for _, ref := range references.FindAllIssueReferences(c.Message) { - - // issue is from another repo - if len(ref.Owner) > 0 && len(ref.Name) > 0 { - refRepo, err = GetRepositoryFromMatch(ref.Owner, ref.Name) - if err != nil { - continue - } - } else { - refRepo = repo - } - if refIssue, err = getIssueFromRef(refRepo, ref.Index); err != nil { - return err - } - if refIssue == nil { - continue - } - - perm, err := GetUserRepoPermission(refRepo, doer) - if err != nil { - return err - } - - key := markKey{ID: refIssue.ID, Action: ref.Action} - if refMarked[key] { - continue - } - refMarked[key] = true - - // FIXME: this kind of condition is all over the code, it should be consolidated in a single place - canclose := perm.IsAdmin() || perm.IsOwner() || perm.CanWrite(UnitTypeIssues) || refIssue.PosterID == doer.ID - cancomment := canclose || perm.CanRead(UnitTypeIssues) - - // Don't proceed if the user can't comment - if !cancomment { - continue - } - - message := fmt.Sprintf(`%s`, repo.Link(), c.Sha1, html.EscapeString(c.Message)) - if err = CreateRefComment(doer, refRepo, refIssue, message, c.Sha1); err != nil { - return err - } - - // Only issues can be closed/reopened this way, and user needs the correct permissions - if refIssue.IsPull || !canclose { - continue - } - - // Only process closing/reopening keywords - if ref.Action != references.XRefActionCloses && ref.Action != references.XRefActionReopens { - continue - } - - if !repo.CloseIssuesViaCommitInAnyBranch { - // If the issue was specified to be in a particular branch, don't allow commits in other branches to close it - if refIssue.Ref != "" { - if branchName != refIssue.Ref { - continue - } - // Otherwise, only process commits to the default branch - } else if branchName != repo.DefaultBranch { - continue - } - } - - if err := changeIssueStatus(refRepo, refIssue, doer, ref.Action == references.XRefActionCloses); err != nil { - return err - } - } - } - return nil -} - // GetFeedsOptions options for retrieving feeds type GetFeedsOptions struct { RequestedUser *User -- cgit v1.2.3