combine thread and issue labeled process functions

reporanger · Feb 21, 2022 · 827f7e2 · 827f7e2
1 parent 510dbd6
commit 827f7e2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/index.js b/index.js
@@ -53,15 +53,14 @@ module.exports = async ({ app, getRouter }) => {
     }))
     try {
       switch (job.data.action) {
-        case COMMENT:
-          return await threadLabeled.process(app)(job)
         case MERGE:
           return await pullLabeled.process(app)(job)
         case LOCK:
           return await threadClosed.process(app)(job)
+        case COMMENT:
         case CLOSE:
         default:
-          return await issueLabeled.process(app)(job)
+          return await threadLabeled.process(app)(job)
       }
     } catch (error) {
       if (process.env.NODE_ENV !== 'test') {

diff --git a/src/issue/labeled.js b/src/issue/labeled.js
@@ -5,7 +5,6 @@ const ms = require('ms')
 
 const { getLabelConfig, getEffectiveLabel, labelsByAction } = require('../thread/util')
 const { getId } = require('../util')
-const { closeIssue } = require('../api')
 const getConfig = require('../config')
 const { CLOSE } = require('../constants')
 const analytics = require('../analytics')
@@ -65,13 +64,3 @@ module.exports = (queue) => async (context) => {
   // If closable labels are removed, delete job for this issue
   return queue.removeJob(ID)
 }
-
-module.exports.process = (robot) => async ({ data /* id */ }) => {
-  const github = await robot.auth(data.installation_id)
-  return await closeIssue(github, {
-    ...data,
-    number: undefined,
-    // TODO change this to just use number
-    issue_number: data.issue_number || data.number,
-  })
-}
diff --git a/src/thread/labeled.js b/src/thread/labeled.js
@@ -5,9 +5,10 @@ const ms = require('ms')
 
 const { getId, executeAction } = require('../util')
 const getConfig = require('../config')
-const { COMMENT } = require('../constants')
+const { COMMENT, CLOSE } = require('../constants')
 const { timeToNumber, getLabelConfig, labelToAction } = require('./util')
 const analytics = require('../analytics')
+const { closeIssue } = require('../api')
 
 module.exports = (queue) => async (context) => {
   const thread = context.payload.pull_request || context.payload.issue
@@ -73,10 +74,24 @@ module.exports = (queue) => async (context) => {
 
 module.exports.process = (robot) => async ({ data /* id */ }) => {
   const github = await robot.auth(data.installation_id)
-  return await github.issues.createComment({
-    ...data,
-    number: undefined,
-    // TODO change this to just use number
-    issue_number: data.issue_number || data.number,
-  })
+
+  switch (data.action) {
+    case CLOSE: {
+      return await closeIssue(github, {
+        ...data,
+        number: undefined,
+        // TODO change this to just use number
+        issue_number: data.issue_number || data.number,
+      })
+    }
+    case COMMENT:
+    default: {
+      return await github.issues.createComment({
+        ...data,
+        number: undefined,
+        // TODO change this to just use number
+        issue_number: data.issue_number || data.number,
+      })
+    }
+  }
 }