Action bug fixes (#6336)

Author: Colengms

.github/actions/StaleCloser/StaleCloser.js

@@ -55,17 +55,19 @@ export class StaleCloser extends ActionBase {
 					if (
 						!lastComment ||
 						lastComment.author.isGitHubApp ||
+						pingTimestamp == undefined ||
 						// TODO: List the collaborators once per go rather than checking a single user each issue
-						(pingTimestamp != undefined &&
-							(this.additionalTeam.includes(lastComment.author.name) ||
-							(await issue.hasWriteAccess(lastComment.author))))
+						this.additionalTeam.includes(lastComment.author.name) ||
+						await issue.hasWriteAccess(lastComment.author)
 					) {
-						if (lastComment) {
-							console.log(
-								`Last comment on issue ${hydrated.number} by ${lastComment.author.name}. Closing.`,
-							)
-						} else {
-							console.log(`No comments on issue ${hydrated.number}. Closing.`)
+						if (pingTimestamp != undefined) {
+							if (lastComment) {
+								console.log(
+									`Last comment on issue ${hydrated.number} by ${lastComment.author.name}. Closing.`,
+								)
+							} else {
+								console.log(`No comments on issue ${hydrated.number}. Closing.`)
+							}
 						}
 						if (this.closeComment) {
 							console.log(`Posting comment on issue ${hydrated.number}`)
@@ -93,7 +95,7 @@ export class StaleCloser extends ActionBase {
 							await issue.setMilestone(+this.setMilestoneId)
 						}
 						console.log(`Closing issue ${hydrated.number}.`)
-					} else if (pingTimestamp != undefined) {
+					} else {
 						// Ping 
 						if (hydrated.updatedAt < pingTimestamp && hydrated.assignee) {
 							console.log(

.github/actions/StaleCloser/StaleCloser.ts

@@ -41,9 +41,11 @@ export class ActionBase {
 		// The ID is used for comparisons with issue data, which does not include the name.
 		// TODO: Figure out a way to convert either from milestone name to ID, or vice versa.
 
-		// If inclusion and exclusion are mixed, exclusion will take precedence.
+		// If label inclusion and exclusion are mixed, exclusion will take precedence.
 		// For example, an issue with both labels A and B will not match if B is excluded, even if A is included.
 
+		// If a milestoneName/milestoneId are set, ignoreMilenameName/ignoreMilestoneIds are ignored.
+
 		// GitHub does not appear to support searching for all issues with milestones (not lacking a milestone).  "-no:milestone" does not work.
 		// GitHub does not appear to support searching for all issues with labels (not lacking a label).  "-no:label" does not work.
 
@@ -71,8 +73,11 @@ export class ActionBase {
 			}
 		}
 
-		if (this.ignoreMilestoneNames) {
-			if (this.ignoreMilestoneNames == "*" && !this.milestoneName) { // only if no milestone
+		if (this.milestoneName) {
+			query = query.concat(` milestone:"${this.milestoneName}"`)
+		}
+		else if (this.ignoreMilestoneNames) {
+			if (this.ignoreMilestoneNames == "*") {
 				query = query.concat(` no:milestone`)
 				this.ignoreAllWithMilestones = true;
 			} else if (this.ignoreMilestoneIds) {