peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move common status changing logic into a function

Browse Source
This commit is contained in:
Keith Rutkowski 2018-07-06 08:31:13 -04:00
parent 3be8911897
commit da4bba50ef
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
models/action.go
View File

@ -476,6 +476,26 @@ func findIssueReferencesInString(message string, repo *Repository) (map[int64]Ke
return refs, nil return refs, nil
} }
// changeIssueStatus encapsulates the logic for changing the status of an issue based on what keywords are marked in the keyword mask
func changeIssueStatus(mask KeywordMaskType, doer *User, repo *Repository, issue *Issue) error {
// take no action if both KeywordClose and KeywordOpen are set
switch mask & (KeywordReopen | KeywordClose) {
case KeywordClose:
if issue.RepoID == repo.ID && !issue.IsClosed {
if err := issue.ChangeStatus(doer, repo, true); err != nil {
return err
}
}
case KeywordReopen:
if issue.RepoID == repo.ID && issue.IsClosed {
if err := issue.ChangeStatus(doer, repo, false); err != nil {
return err
}
}
}
return nil
}
// UpdateIssuesComment checks if issues are manipulated by a comment // UpdateIssuesComment checks if issues are manipulated by a comment
func UpdateIssuesComment(doer *User, repo *Repository, commentIssue *Issue, comment *Comment, canOpenClose bool) error { func UpdateIssuesComment(doer *User, repo *Repository, commentIssue *Issue, comment *Comment, canOpenClose bool) error {
var refString string var refString string
@ -518,19 +538,8 @@ func UpdateIssuesComment(doer *User, repo *Repository, commentIssue *Issue, comm
} }
if canOpenClose { if canOpenClose {
// take no action if both KeywordClose and KeywordOpen are set if err = changeIssueStatus(mask, doer, repo, issue); err != nil {
if (mask & (KeywordReopen | KeywordClose)) == KeywordClose { return err
if issue.RepoID == repo.ID && !issue.IsClosed {
if err = issue.ChangeStatus(doer, repo, true); err != nil {
return err
}
}
} else if (mask & (KeywordReopen | KeywordClose)) == KeywordReopen {
if issue.RepoID == repo.ID && issue.IsClosed {
if err = issue.ChangeStatus(doer, repo, false); err != nil {
return err
}
}
} }
} }
} }
@ -565,19 +574,8 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit, com
} }
if commitsAreMerged { if commitsAreMerged {
// take no action if both KeywordClose and KeywordOpen are set if err = changeIssueStatus(mask, doer, repo, issue); err != nil {
if (mask & (KeywordReopen | KeywordClose)) == KeywordClose { return err
if issue.RepoID == repo.ID && !issue.IsClosed {
if err = issue.ChangeStatus(doer, repo, true); err != nil {
return err
}
}
} else if (mask & (KeywordReopen | KeywordClose)) == KeywordReopen {
if issue.RepoID == repo.ID && issue.IsClosed {
if err = issue.ChangeStatus(doer, repo, false); err != nil {
return err
}
}
} }
} }
} }