Merge pull request #304 from watermelontools/fix/broken-deactivation-…

…text

Fix/broken deactivation text

types/watermelon.ts

@@ -25,6 +25,8 @@ export type StandardProcessedDataArray = {
   link?: string;
   number?: number | string;
   image?: string;
+  created_at?: string;
+  author?: string;
 }[];
 export type StandardAPIResponse = {
   data?: StandardProcessedDataArray;

utils/actions/getAllServices.ts

@@ -118,6 +118,7 @@ export default async function getAllServices({
         amount: AsanaTasks,
       }),
     ]);
+
   return {
     github,
     jira,

utils/actions/getGitHub.ts

@@ -21,14 +21,17 @@ async function getGitHub({
       type: "pr",
       per_page: amount,
     });
+
     return {
       fullData: issues.data?.items,
       data:
-        issues.data?.items?.map(({ title, body, html_url: link, number }) => ({
+        issues.data?.items?.map(({ title, body, html_url: link, number, created_at, user  }) => ({
           title,
           body,
           link,
           number,
+          created_at,
+          author: user?.login
         })) || [],
     };
   }

utils/actions/markdownHelpers/helper.ts

@@ -1,4 +1,5 @@
 import { MarkdownRequest, MarkdownResponse } from "../../../types/watermelon";
+import getRelativeDate from "../../getRelativeDate";
 
 type generalMarkdown = MarkdownRequest & {
   systemName: string;
@@ -11,7 +12,7 @@ const generalMarkdownHelper = ({
   systemResponseName,
 }: generalMarkdown): MarkdownResponse => {
   if (!value || value?.data?.length === 0) {
-    return `\n ${systemResponseName} deactivated by ${userLogin}`;
+    return `\n No results found in **${systemResponseName}** :( \n`;
   }
   if (value?.error?.match(/no (\w+) token/)) {
     return `\n [Click here to login to ${systemName}](https://app.watermelontools.com)`;
@@ -21,12 +22,12 @@ const generalMarkdownHelper = ({
     markdown = `\n #### ${systemResponseName}`;
     markdown += (value?.data || [])
       .map(
-        ({ number, title, link, body }) =>
-          `\n - [#${number} - ${title}](${link}) \n`
+        ({ number, title, link, body, author, created_at }) =>
+          `\n - [#${number} - ${title}](${link}) ${
+            author ? ` - By ${author}` : ""
+          } ${created_at ? `${getRelativeDate(created_at ?? "")}` : ""}\n`
       )
       .join("");
-  } else {
-    markdown += `\n No results found in **${systemResponseName}** :( \n`;
   }
   return markdown;
 };

utils/getRelativeDate.ts

@@ -0,0 +1,41 @@
+export default function getRelativeDate(isoDateString: string): string {
+
+    const date = new Date(isoDateString);
+    const now = new Date();
+
+    const diffInSeconds = (now.getTime() - date.getTime()) / 1000;
+
+    if (diffInSeconds < 60) {
+      return 'Just now';
+    }
+
+    const diffInMinutes = diffInSeconds / 60;
+    if (diffInMinutes < 60) {
+      return `${Math.floor(diffInMinutes)} minutes ago`;
+    }
+
+    const diffInHours = diffInMinutes / 60;
+    if (diffInHours < 24) {
+      return `${Math.floor(diffInHours)} hours ago`; 
+    }
+
+    const diffInDays = diffInHours / 24;
+    if (diffInDays < 7) {
+      return `${Math.floor(diffInDays)} days ago`;
+    }
+
+    const diffInWeeks = diffInDays / 7;
+    if (diffInWeeks < 5) {
+      return `${Math.floor(diffInWeeks)} weeks ago`;
+    }
+
+    const diffInMonths = diffInDays / 30;
+    if (diffInMonths < 12) {
+      return `${Math.floor(diffInMonths)} months ago`;
+    }
+
+    const diffInYears = diffInMonths / 12;
+    return `${Math.floor(diffInYears)} years ago`;
+
+  }
+