reporanger · mfix22 · Feb 27, 2022 · Feb 27, 2022 · Feb 27, 2022 · Feb 27, 2022
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,15 +2,16 @@ module.exports = {
   env: {
     es6: true,
     node: true,
-    jest: true
+    jest: true,
   },
   extends: ['eslint:recommended'],
   parserOptions: {
-    ecmaVersion: 10
+    ecmaVersion: 10,
   },
   plugins: ['import'],
   rules: {
     'import/no-unresolved': 'error',
-    'no-duplicate-imports': 'error'
-  }
+    'no-duplicate-imports': 'error',
+    'no-console': ['error', { allow: ['warn', 'error'] }],
+  },
    }
diff --git a/src/api.js b/src/api.js
@@ -13,7 +13,7 @@ exports.closeIssue = function closeIssue(github, data) {
     })
     .then((_) => _.data)
     .catch((e) => {
-      console.log(e, data)
+      console.error(e, data)
       throw e
     })
 }
@@ -32,7 +32,7 @@ exports.getPullRequest = function getPullRequest(github, data) {
     })
     .then((_) => _.data)
     .catch((e) => {
-      console.log(e, data)
+      console.error(e, data)
       throw e
     })
 }
@@ -62,7 +62,7 @@ exports.addLabels = function addLabels(github, { labels, ...data }) {
       },
     })
     .catch((e) => {
-      console.log(e, data)
+      console.error(e, data)
       throw e
     })
 }

diff --git a/src/config.js b/src/config.js
@@ -1,5 +1,5 @@
-const ms = require('ms')
 const Sentry = require('@sentry/node')
+const ms = require('ms')
 
 const { CLOSE, MERGE } = require('./constants')
 

diff --git a/src/installation/added.js b/src/installation/added.js
@@ -1,3 +1,4 @@
+const Sentry = require('@sentry/node')
 const { createLabel } = require('../api')
 const analytics = require('../analytics')
 
@@ -85,7 +86,6 @@ module.exports = (robot) => async (context) => {
       },
     })
   } catch (e) {
-    const Sentry = require('@sentry/node')
     Sentry.configureScope((scope) => {
       scope.setUser({
         id: context.payload.installation.id,

diff --git a/src/pull/labeled.js b/src/pull/labeled.js
@@ -1,3 +1,4 @@
+const Sentry = require('@sentry/node')
 const ms = require('ms')
 
 const { getId } = require('../util')
@@ -93,7 +94,6 @@ module.exports.process = (robot) => async ({
 
     pull = await getPullRequest(github, { owner, repo, pull_number: the_number })
   } catch (error) {
-    const Sentry = require('@sentry/node')
     Sentry.configureScope((scope) => {
       scope.setUser({ username: owner, id: installation_id })
       Sentry.captureException(error)

diff --git a/src/thread/labeled.js b/src/thread/labeled.js
@@ -32,24 +32,31 @@ module.exports = (queue) => async (context) => {
 
       if (!action) return false
 
+      const { delay, message, comment } = getLabelConfig(config, label.name, action)
+      const time = timeToNumber(delay, 0)
+
+      function getCommentBody(string) {
+        if (!string || string.trim() === 'false') return ''
+
+        return string
+          .replace('$DELAY', time == null ? '' : ms(time, { long: true }))
+          .replace('$LABEL', label.name)
+          .replace('$AUTHOR', thread.user.login)
+      }
+
       async function handleUpdateThread() {
         const ID = getId(context, { action })
 
-        const { delay, comment } = getLabelConfig(config, label.name, action)
-        const time = timeToNumber(delay, -1)
-
         const jobExists = await queue.getJob(ID)
         if (!jobExists) {
-          // TODO refactor this file to use a shared "createComment" function
-          if (comment && comment.trim() !== 'false') {
-            const body = comment
-              .replace('$DELAY', time == null ? '' : ms(time, { long: true }))
-              .replace('$LABEL', label.name)
-              .replace('$AUTHOR', thread.user.login)
+          const body = getCommentBody(comment)
+          if (body) {
             await context.octokit.issues.createComment(context.issue({ body }))
           }
         }
 
+        const time = timeToNumber(delay, -1)
+
         if (time >= 0) {
           return queue
             .createJob(
@@ -89,16 +96,8 @@ module.exports = (queue) => async (context) => {
 
           // Don't create a comment if one already exists
           if (!jobExists) {
-            const { message, delay } = getLabelConfig(config, label.name, COMMENT)
-
-            const time = timeToNumber(delay, 0)
-
-            if (message && message.trim() !== 'false') {
-              const body = message
-                .replace('$LABEL', label.name)
-                .replace('$DELAY', ms(time, { long: true }))
-                .replace('$AUTHOR', thread.user.login)
-
+            const body = getCommentBody(message)
+            if (body) {
               return queue
                 .createJob(
                   context.issue({

diff --git a/src/verify-payment-plan.js b/src/verify-payment-plan.js
@@ -1,4 +1,5 @@
 // TODO add DEV flag
+const Sentry = require('@sentry/node')
 const r = require('rexrex')
 const { OPEN_SOURCE } = require('./constants')
 
@@ -72,7 +73,6 @@ module.exports = async function verifyPaymentPlan(robot, context) {
   } catch (error) {
     if (error.status !== 404) {
       robot.log.error(error, context.repo())
-      const Sentry = require('@sentry/node')
       Sentry.configureScope((scope) => {
         scope.setUser({ username: owner })
         Sentry.captureException(error)