pull requests: Remove merge conflict warnings when PR can merge again.

Fixes #102

Author: synicalsyntax

src/automations/checkMergeConflicts.js

@@ -22,11 +22,9 @@ exports.check = (client, number, repoName, repoOwner) => {
     owner: repoOwner, repo: repoName, number: number
   }).then((pull) => {
     const mergeable = pull.data.mergeable;
-    if (mergeable) return;
     const author = pull.data.user.login;
     const comment = client.templates.get("mergeConflictWarning").replace("[username]", author)
     .replace("[repoOwner]", repoOwner).replace("[repoName]", repoName);
-    const oldComment = "merge conflict";
     client.pullRequests.getCommits({
       owner: repoOwner, repo: repoName, number: number, per_page: 100
     }).then((commits) => {
@@ -36,9 +34,20 @@ exports.check = (client, number, repoName, repoOwner) => {
       }).then((comments) => {
         const labelComment = comments.data.find((c) => {
           const synchCheck = lastCommitTime < Date.parse(c.updated_at);
-          return c.body.includes(oldComment) && synchCheck && c.user.login === client.cfg.username;
+          return c.body.includes(comment) && synchCheck && c.user.login === client.cfg.username;
         });
-        if (!labelComment) client.newComment(pull.data, pull.data.base.repo, comment);
+        if (!labelComment) {
+          client.newComment(pull.data, pull.data.base.repo, comment);
+        } else if (mergeable) {
+          const oldComments = comments.data.filter((c) => {
+            return c.body.includes(comment) && c.user.login === client.cfg.username;
+          }).map(c => c.id);
+          oldComments.forEach((c) => {
+            client.issues.deleteComment({
+              owner: repoOwner, repo: repoName, id: c
+            });
+          });
+        }
       });
     });
   });

src/events/pullRequests.js

@@ -26,16 +26,18 @@ exports.run = (client, payload) => {
     client.automations.get("issueReferenced").run(client, pullRequest, repository);
   } else if (action === "synchronize") {
     client.automations.get("issueReferenced").run(client, pullRequest, repository);
+    if (client.cfg.checkMergeConflicts) {
+      client.automations.get("checkMergeConflicts").check(client, number, repoName, repoOwner);
+    }
   }
 };
 
 exports.managePRLabels = (client, action, pullRequest, review, repository) => {
   const number = pullRequest.number;
   const repoName = repository.name;
   const repoOwner = repository.owner.login;
-  client.issues.getIssueLabels({
-    owner: repoOwner, repo: repoName, number: number
-  }).then((response) => {
+  client.issues.getIssueLabels({owner: repoOwner, repo: repoName, number: number})
+  .then((response) => {
     let labels = response.data.map(label => label.name);
     const needsReview = labels.includes(client.cfg.needsReviewLabel);
     const reviewed = labels.includes(client.cfg.reviewedLabel);