change the logic of

detecting first time contributor

Author: yp05327

modules/git/commit.go

@@ -258,12 +258,10 @@ func (c *Commit) CommitsBeforeUntil(commitID string) ([]*Commit, error) {
 
 // SearchCommitsOptions specify the parameters for SearchCommits
 type SearchCommitsOptions struct {
-	CommitID            SHA1
 	Keywords            []string
 	Authors, Committers []string
 	After, Before       string
 	All                 bool
-	Limit               int
 }
 
 // NewSearchCommitsOptions construct a SearchCommitsOption from a space-delimited search string
@@ -299,8 +297,7 @@ func NewSearchCommitsOptions(searchString string, forAllRefs bool) SearchCommits
 
 // SearchCommits returns the commits match the keyword before current revision
 func (c *Commit) SearchCommits(opts SearchCommitsOptions) ([]*Commit, error) {
-	opts.CommitID = c.ID
-	return c.repo.SearchCommits(opts)
+	return c.repo.searchCommits(c.ID, opts)
 }
 
 // GetFilesChangedSinceCommit get all changed file names between pastCommit to current revision

modules/git/repo_commit.go

@@ -109,7 +109,7 @@ func (repo *Repository) commitsByRange(id SHA1, page, pageSize int, not string)
 	return repo.parsePrettyFormatLogToList(stdout)
 }
 
-func (repo *Repository) SearchCommits(opts SearchCommitsOptions) ([]*Commit, error) {
+func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Commit, error) {
 	// add common arguments to git command
 	addCommonSearchArgs := func(c *Command) {
 		// ignore case
@@ -138,19 +138,8 @@ func (repo *Repository) SearchCommits(opts SearchCommitsOptions) ([]*Commit, err
 		}
 	}
 
-	// create new git log command
-	cmd := NewCommand(repo.Ctx, "log")
-
-	// By default, limit 100 commits
-	limit := 100
-	if opts.Limit > 0 {
-		limit = opts.Limit
-	}
-	cmd = cmd.AddOptionFormat("-%d", limit).AddArguments(prettyLogFormat)
-
-	if !opts.CommitID.IsZero() {
-		cmd = cmd.AddDynamicArguments(opts.CommitID.String())
-	}
+	// create new git log command with limit of 100 commits
+	cmd := NewCommand(repo.Ctx, "log", "-100", prettyLogFormat).AddDynamicArguments(id.String())
 
 	// pretend that all refs along with HEAD were listed on command line as <commis>
 	// https://git-scm.com/docs/git-log#Documentation/git-log.txt---all

routers/web/repo/issue.go

@@ -1229,7 +1229,7 @@ func NewIssuePost(ctx *context.Context) {
 }
 
 // roleDescriptor returns the Role Descriptor for a comment in/with the given repo, poster and issue
-func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue, gitRepo *git.Repository, hasOriginalAuthor bool) (issues_model.RoleDescriptor, error) {
+func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue, hasOriginalAuthor bool) (issues_model.RoleDescriptor, error) {
 	if hasOriginalAuthor {
 		return issues_model.RoleDescriptorNone, nil
 	}
@@ -1287,15 +1287,21 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 		return roleDescriptor, nil
 	}
 
-	if commits, err := gitRepo.SearchCommits(git.SearchCommitsOptions{
-		Authors: []string{poster.Name},
-		All:     true,
-		Limit:   2,
-	}); err != nil {
+	// If the poster is the contributor of the repo
+	searchOpt := &issue_indexer.SearchOptions{
+		Paginator: &db.ListOptions{
+			Page:     1,
+			PageSize: 2,
+		},
+		RepoIDs:  []int64{repo.ID},
+		IsPull:   util.OptionalBoolTrue,
+		PosterID: &poster.ID,
+	}
+	if _, total, err := issue_indexer.SearchIssues(ctx, searchOpt); err != nil {
 		return issues_model.RoleDescriptorNone, err
-	} else if len(commits) == 1 {
+	} else if total == 1 {
 		roleDescriptor = roleDescriptor.WithRole(issues_model.RoleDescriptorFirstTimeContributor)
-	} else if len(commits) > 1 {
+	} else if total > 1 {
 		roleDescriptor = roleDescriptor.WithRole(issues_model.RoleDescriptorContributor)
 	}
 
@@ -1554,7 +1560,7 @@ func ViewIssue(ctx *context.Context) {
 	// check if dependencies can be created across repositories
 	ctx.Data["AllowCrossRepositoryDependencies"] = setting.Service.AllowCrossRepositoryDependencies
 
-	if issue.ShowRole, err = roleDescriptor(ctx, repo, issue.Poster, issue, ctx.Repo.GitRepo, issue.HasOriginalAuthor()); err != nil {
+	if issue.ShowRole, err = roleDescriptor(ctx, repo, issue.Poster, issue, issue.HasOriginalAuthor()); err != nil {
 		ctx.ServerError("roleDescriptor", err)
 		return
 	}
@@ -1593,7 +1599,7 @@ func ViewIssue(ctx *context.Context) {
 				continue
 			}
 
-			comment.ShowRole, err = roleDescriptor(ctx, repo, comment.Poster, issue, ctx.Repo.GitRepo, comment.HasOriginalAuthor())
+			comment.ShowRole, err = roleDescriptor(ctx, repo, comment.Poster, issue, comment.HasOriginalAuthor())
 			if err != nil {
 				ctx.ServerError("roleDescriptor", err)
 				return
@@ -1692,7 +1698,7 @@ func ViewIssue(ctx *context.Context) {
 							continue
 						}
 
-						c.ShowRole, err = roleDescriptor(ctx, repo, c.Poster, issue, ctx.Repo.GitRepo, c.HasOriginalAuthor())
+						c.ShowRole, err = roleDescriptor(ctx, repo, c.Poster, issue, c.HasOriginalAuthor())
 						if err != nil {
 							ctx.ServerError("roleDescriptor", err)
 							return