feat: allow custom comment delete delay

so they can be skipped in subsequent runs

CHANGELOG.md

@@ -1,5 +1,13 @@
 ### Changelog
 
+#### [v1.3.2](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.3.1...v1.3.2) (25 October 2018)
+- fix: correct month in log output [`07288be`](https://git.w33ble.com/w33ble/gh-action-bot/commit/07288bee33d6861aa53e88e856174868f37b1fd5)
+
+#### [v1.3.1](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.2.1...v1.3.1) (23 October 2018)
+- feat: add a clean command [`f3773f7`](https://git.w33ble.com/w33ble/gh-action-bot/commit/f3773f7ee7c0de42997a5b19cc5ee215da3f06ec)
+- feat: track processed, comments [`31b55fc`](https://git.w33ble.com/w33ble/gh-action-bot/commit/31b55fc7c2d7042e428a12f04124e1c4cd63fd28)
+- docs: add clean script to readme [`b728b8e`](https://git.w33ble.com/w33ble/gh-action-bot/commit/b728b8ef50ee1a9b79f79ccc6b27f4acaf669d15)
+
 #### [v1.2.1](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.2.0...v1.2.1) (23 October 2018)
 - feat: add more debugging output [`3db973f`](https://git.w33ble.com/w33ble/gh-action-bot/commit/3db973febc5387605279f7855976a4ec431f0362)
 - fix: correctly handle errors in logger.error [`c70e8e4`](https://git.w33ble.com/w33ble/gh-action-bot/commit/c70e8e49ecb9041b22a8f4b92398339d45871ca1)

README.md

@@ -11,6 +11,8 @@ Action bot for Github. Checks a repo's event stream and leaves a ghost comment w
 
 `yarn run force owner/repo pr_number`: force a comment on a specific pr, by number
 
+`yanr run clean owner/repo pr_number`: removed any comments that match the owner and body requirements
+
 You'll need to set some environment flags. Check `sample-env` for what is available, and you can copy the file to `.env` in the root and add your settings there as well.
 
 ### Personal Access Token

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-action-bot",
-  "version": "1.2.1",
+  "version": "1.3.2",
   "private": true,
   "description": "Action bot for Github",
   "main": "index",
@@ -10,7 +10,8 @@
     "precommit": "lint-staged",
     "version": "auto-changelog -p && auto-authors && git add CHANGELOG.md AUTHORS.md",
     "start": "node .",
-    "force": "node -r esm src/force.mjs"
+    "force": "node -r esm src/force.mjs",
+    "clean": "node -r esm src/clean.mjs"
   },
   "repository": {
     "type": "git",

src/clean.mjs

@@ -0,0 +1,28 @@
+import dotenv from 'dotenv';
+import logger from './lib/logger.mjs';
+import createRepo from './lib/create_repo.mjs';
+import getPullComments from './lib/get_pull_comments.mjs';
+import { deleteComment } from './lib/comments.mjs';
+
+dotenv.config();
+
+async function forceRetest() {
+  const [ownerRepo, prNumber] = process.argv.splice(2);
+  const { COMMENT_BODY_REGEXP, COMMENT_BODY_REGEXP_FLAGS, COMMENT_ACTOR } = process.env;
+
+  if (!ownerRepo || !prNumber) {
+    throw new Error('You must specify an owner/repo combo and a pull request number');
+  }
+
+  const repo = createRepo(ownerRepo);
+
+  const comments = await getPullComments(repo, prNumber);
+  const bodyRegexp = new RegExp(COMMENT_BODY_REGEXP, COMMENT_BODY_REGEXP_FLAGS);
+  comments
+    .filter(comment => bodyRegexp.test(comment.body) && comment.owner === COMMENT_ACTOR)
+    .forEach(async comment => {
+      await deleteComment(repo, comment.id);
+    });
+}
+
+forceRetest().catch(err => logger.error(err));

src/force.mjs

@@ -1,6 +1,7 @@
 import dotenv from 'dotenv';
+import logger from './lib/logger.mjs';
 import createRepo from './lib/create_repo.mjs';
-import { createComment, deleteComment } from './lib/comments.mjs';
+import createPullComment from './lib/create_pull_comment.mjs';
 
 dotenv.config();
 
@@ -13,8 +14,7 @@ async function forceRetest() {
   }
 
   const repo = createRepo(ownerRepo);
-  const comment = await createComment(repo, prNumber, PULL_RETEST_BODY);
-  await deleteComment(repo, comment.id);
+  await createPullComment(repo, prNumber, PULL_RETEST_BODY, { delete: true });
 }
 
-forceRetest().catch(err => console.error(err));
+forceRetest().catch(err => logger.error(err));

src/index.mjs

@@ -5,7 +5,7 @@ import getComments from './lib/get_comments.mjs';
 import getPull from './lib/get_pull.mjs';
 import getCommits from './lib/get_commits.mjs';
 import getCommitStatus from './lib/get_commit_status.mjs';
-import { createComment, deleteComment } from './lib/comments.mjs';
+import createPullComment from './lib/create_pull_comment.mjs';
 import History from './lib/history.mjs';
 
 // load env vars from .env file
@@ -31,11 +31,16 @@ async function ghActionBot() {
   const comments = (await getComments(repo, {
     body: new RegExp(COMMENT_BODY_REGEXP, COMMENT_BODY_REGEXP_FLAGS),
     actor: COMMENT_ACTOR,
-  })).filter(comment => !history.get(comment.id));
+  })).filter(comment => !history.get(comment.id)); // skip comments already processed
+
+  if (comments.length) logger.debug(`Found ${comments.length} comments to process`);
 
   // read pull data
   const pulls = (await Promise.all(
     comments.map(async comment => {
+      // keep track of comments that have been processed
+      history.add(comment);
+
       const pull = await getPull(repo, comment.number);
 
       if (pull.state !== 'open') {
@@ -75,12 +80,9 @@ async function ghActionBot() {
   }
 
   await Promise.all(
-    records.map(async record => {
-      logger.log(`Re-testing PR #${record.pull.number}`);
-      const comment = await createComment(repo, records[0].pull.number, PULL_RETEST_BODY);
-      logger.debug(`Created comment id ${comment.id}`);
-      await deleteComment(repo, comment.id);
-    })
+    records.map(record =>
+      createPullComment(repo, record.pull.number, PULL_RETEST_BODY, { delete: true })
+    )
   );
 }
 

src/lib/comments.mjs

@@ -1,7 +1,12 @@
+import logger from './logger.mjs';
+
 export async function createComment(repo, issueId, body) {
   return repo.issues(issueId).comments.create({ body });
 }
 
 export async function deleteComment(repo, commentId) {
-  return repo.issues.comments(commentId).remove();
+  const res = await repo.issues.comments(commentId).remove();
+  if (res) logger.debug(`Comment ${commentId} deleted`);
+  else logger.error(new Error(`Failed to remove comment ${commentId}`));
+  return res;
 }

src/lib/create_pull_comment.mjs

@@ -0,0 +1,19 @@
+import logger from './logger.mjs';
+import { createComment, deleteComment } from './comments.mjs';
+
+const sleep = async ms => new Promise(resolve => setTimeout(resolve, ms));
+
+export default async function createPullComment(repo, number, body, opts = {}) {
+  logger.log(`Adding comment to PR #${number}`);
+  const comment = await createComment(repo, number, body);
+  logger.debug(`Created comment id ${comment.id}`);
+
+  const options = Object.assign({ delete: false, delay: 250 }, opts);
+
+  if (options.delete) {
+    await sleep(options.delay);
+    await deleteComment(repo, comment.id);
+  }
+
+  return comment.id;
+}

src/lib/get_pull_comments.mjs

@@ -0,0 +1,9 @@
+export default async function getPull(repo, id) {
+  const { items } = await repo.issues(id).comments.fetch();
+
+  return items.map(item => ({
+    id: item.id,
+    owner: item.user.login,
+    body: item.body,
+  }));
+}

src/lib/logger.mjs

@@ -11,7 +11,7 @@ const zeroPad = (str, len) => {
 
 const getTimestamp = () => {
   const d = new Date();
-  return `${[d.getFullYear(), zeroPad(d.getMonth(), 2), zeroPad(d.getDate(), 2)].join('/')} ${[
+  return `${[d.getFullYear(), zeroPad(d.getMonth() + 1, 2), zeroPad(d.getDate(), 2)].join('/')} ${[
     zeroPad(d.getHours(), 2),
     zeroPad(d.getMinutes(), 2),
     zeroPad(d.getSeconds(), 2),