fix: conditional

removed null and storing time with number
ubiquity · Sep 7, 2023 · edbbe97 · edbbe97
1 parent 03a78ac
commit edbbe97
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
@@ -91,7 +91,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     command: commandSettings,
     assign: {
       bountyHunterMax: bountyHunterMax,
-      staleBountyTime: staleBountyTime ? String(ms(staleBountyTime)) : "0",
+      staleBountyTime: ms(staleBountyTime),
     },
     sodium: {
       privateKey: process.env.X25519_PRIVATE_KEY ?? "",

diff --git a/src/handlers/comment/handlers/assign.ts b/src/handlers/comment/handlers/assign.ts
@@ -18,7 +18,7 @@ export const assign = async (body: string) => {
 
   const id = organization?.id || repository?.id; // repository?.id as fallback
 
-  const staleBounty = Number(config.assign.staleBountyTime);
+  const staleBounty = config.assign.staleBountyTime;
 
   logger.info(`Received '/start' command from user: ${payload.sender.login}, body: ${body}`);
   const issue = (_payload as Payload).issue;
@@ -112,9 +112,17 @@ export const assign = async (body: string) => {
     await addAssignees(issue.number, [payload.sender.login]);
   }
 
-  const days = Math.floor((new Date().getTime() - new Date(issue.created_at).getTime()) / (1000 * 60 * 60 * 24));
-  const staleToDays = Math.floor(staleBounty / (1000 * 60 * 60 * 24));
-  const isBountyStale = staleBounty == 0 ? null : staleToDays > days ? false : true;
+  let days;
+  Number;
+  let staleToDays;
+  Number;
+  let isBountyStale = false;
+
+  if (staleBounty !== 0) {
+    days = Math.floor((new Date().getTime() - new Date(issue.created_at).getTime()) / (1000 * 60 * 60 * 24));
+    staleToDays = Math.floor(staleBounty / (1000 * 60 * 60 * 24));
+    isBountyStale = staleToDays > days ? false : true;
+  }
 
   // double check whether the assign message has been already posted or not
   logger.info(`Creating an issue comment: ${comment.commit}`);

diff --git a/src/handlers/comment/handlers/table.ts b/src/handlers/comment/handlers/table.ts
@@ -12,16 +12,14 @@ export const tableComment = ({
   multiplier?: string;
   reason?: string;
   bounty?: string;
-  isBountyStale?: boolean | null;
+  isBountyStale?: boolean;
   days?: number;
 }) => {
   return `
 <code>
   <table>
   ${
-    isBountyStale == null
-      ? null
-      : isBountyStale
+    isBountyStale
       ? `<td>Warning!</td> <td>This task was created over ${days} days ago. Please confirm that this issue specification is accurate before starting.</td>`
       : ``
   }

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -69,7 +69,7 @@ export const ModeSchema = Type.Object({
 
 export const AssignSchema = Type.Object({
   bountyHunterMax: Type.Number(),
-  staleBountyTime: Type.String(),
+  staleBountyTime: Type.Number(),
 });
 
 export const LogConfigSchema = Type.Object({

diff --git a/ubiquibot-config-default.json b/ubiquibot-config-default.json
@@ -8,7 +8,7 @@
   "disable-analytics": false,
   "comment-incentives": false,
   "register-wallet-with-verification": false,
-  "stale-bounty-time": "30d",
+  "stale-bounty-time": "0d",
   "promotion-comment": "\n<h6>If you enjoy the DevPool experience, please follow <a href='https://github.com/ubiquity'>Ubiquity on GitHub</a> and star <a href='https://github.com/ubiquity/devpool-directory'>this repo</a> to show your support. It helps a lot!</h6>",
   "default-labels": [],
   "time-labels": [