fixed version override

Author: Tom Hieß

src/acigithub/issues.go

@@ -14,16 +14,33 @@ var (
 )
 
 func GetIssueComments(issueNumber int) (issueComments []*github.IssueComment, err error) {
+
+	//FIXME: currently the GitHub API ignores Direction and Sort
+	// so, we are using the default settings for the query and sorting the response afterwards
 	var commentOpts = &github.IssueListCommentsOptions{
 		Direction: &direction,
-		// Sort:      &sort,
+		Sort:      &sort,
 		ListOptions: github.ListOptions{
 			PerPage: 100,
 			Page:    1,
 		},
 	}
 	issueComments, _, err = GithubClient.Issues.ListComments(ctx, owner, repo, issueNumber, commentOpts)
-	return
+
+	if err == nil {
+		icCount := len(issueComments)
+		issueCommentsSorted := make([]*github.IssueComment, icCount)
+
+		for i, n := range issueComments {
+			j := icCount - i - 1
+
+			issueCommentsSorted[j] = n
+		}
+
+		return issueCommentsSorted, err
+	}
+
+	return nil, err
 }
 
 func CommentHelpToPullRequest(number int) (err error) {
@@ -35,7 +52,7 @@ func CommentHelpToPullRequest(number int) (err error) {
 		Direction: &direction,
 		Sort:      &sort,
 		ListOptions: github.ListOptions{
-			PerPage: 30,
+			PerPage: 100,
 			Page:    1,
 		},
 	}

src/acigithub/pullrequest.go

@@ -79,18 +79,20 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
 	for _, comment := range issueComments {
 		// Must have permission in the repo to create a major version
 		// MANNEQUIN|NONE https://docs.github.com/en/graphql/reference/enums#commentauthorassociation
-		if strings.Contains("OWNER|CONTRIBUTOR|COLLABORATOR", *comment.AuthorAssociation) {
+		if strings.Contains("MEMBER|OWNER|CONTRIBUTOR|COLLABORATOR", *comment.AuthorAssociation) {
 			aciVersionOverride := regexp.MustCompile(`aci_version_override: ([0-9]+\.[0-9]+\.[0-9]+)`)
 			aciPatchLevel := regexp.MustCompile(`aci_patch_level: ([a-zA-Z]+)`)
 
-			if aciPatchLevel.MatchString(*comment.Body) {
-				patchLevel = semver.ParsePatchLevel(aciPatchLevel.FindStringSubmatch(*comment.Body)[1])
-				break
-			}
 			if aciVersionOverride.MatchString(*comment.Body) {
 				version = aciVersionOverride.FindStringSubmatch(*comment.Body)[1]
 				break
 			}
+
+			if aciPatchLevel.MatchString(*comment.Body) {
+				patchLevel = semver.ParsePatchLevel(aciPatchLevel.FindStringSubmatch(*comment.Body)[1])
+				break
+			}
+
 		}
 	}