From 656f7f574dde7405afa17fee25162e398d40da7c Mon Sep 17 00:00:00 2001
From: prakhar katiyar <prkhrkat@gmail.com>
Date: Tue, 23 Dec 2025 17:50:51 +0530
Subject: [PATCH 1/3] timestamp update

---
 src/common/mustacheHelper.ts | 11 +++++++++++
 src/common/types.ts          |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/common/mustacheHelper.ts b/src/common/mustacheHelper.ts
index 200e613..6c99bb7 100644
--- a/src/common/mustacheHelper.ts
+++ b/src/common/mustacheHelper.ts
@@ -83,6 +83,11 @@ export class MustacheHelper {
             ? date.unix()
             : date.format('dddd, MMMM Do YYYY hh:mm A [GMT]Z');
 
+        // For Slack, create a formatted timestamp string with the special Slack format
+        const slackTimestamp = isSlackNotification
+            ? `<t:${date.unix()}:f>`
+            : undefined;
+
         let baseURL = event.baseUrl;
 
         // Handle approval events FIRST (before checking pipelineType)
@@ -97,6 +102,7 @@ export class MustacheHelper {
 
             return {
                 eventTime: timestamp,
+                slackTimestamp: slackTimestamp,
                 triggeredBy: event.payload.triggeredBy || "NA",
                 appName: event.payload.appName || "NA",
                 envName: event.payload.envName || "NA",
@@ -124,6 +130,7 @@ export class MustacheHelper {
            }
             return {
                 eventTime: timestamp,
+                slackTimestamp: slackTimestamp,
                 triggeredBy: event.payload.triggeredBy || "NA",
                 appName: event.payload.appName || "NA",
                 envName: envName,
@@ -179,6 +186,7 @@ export class MustacheHelper {
             if (baseURL && event.payload.buildHistoryLink) buildHistoryLink = `${baseURL}${event.payload.buildHistoryLink}`;
             const parsedEvent:ParsedCIEvent = {
                 eventTime: timestamp,
+                slackTimestamp: slackTimestamp,
                 triggeredBy: event.payload.triggeredBy || "NA",
                 appName: event.payload.appName || "NA",
                 pipelineName: event.payload.pipelineName || "NA",
@@ -200,6 +208,7 @@ export class MustacheHelper {
 
             return {
                 eventTime: timestamp,
+                slackTimestamp: slackTimestamp,
                 triggeredBy: event.payload.triggeredBy || "NA",
                 appName: event.payload.appName || "NA",
                 envName: event.payload.envName || "NA",
@@ -229,6 +238,7 @@ export class MustacheHelper {
 
             return {
                 eventTime: timestamp,
+                slackTimestamp: slackTimestamp,
                 triggeredBy: event.payload.triggeredBy || "NA",
                 appName: event.payload.appName || "NA",
                 envName: event.payload.envName || envName,
@@ -433,6 +443,7 @@ export class WebhookData {
 
 interface ParseArtifactPromotionEvent {
     eventTime: number | string;
+    slackTimestamp?: string;
     triggeredBy: string;
     appName: string;
     envName: string;
diff --git a/src/common/types.ts b/src/common/types.ts
index 0e0fbb9..e236bcd 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -26,6 +26,7 @@ export interface ciMaterials {
 }//For Slack
 export interface ParsedCIEvent {
     eventTime: number | string;
+    slackTimestamp?: string;
     triggeredBy: string;
     appName: string;
     pipelineName: string;
@@ -77,6 +78,7 @@ export interface WebhookParsedEvent {
 }
 export interface ParseApprovalEvent {
     eventTime: number | string;
+    slackTimestamp?: string;
     triggeredBy: string;
     appName: string;
     pipelineName: string;
@@ -90,6 +92,7 @@ export interface ParseApprovalEvent {
 }
 export interface ParseConfigApprovalEvent {
     eventTime: number | string;
+    slackTimestamp?: string;
     triggeredBy: string;
     appName: string;
     envName: string;
@@ -116,6 +119,7 @@ export interface ParsedScoopNotification {
 
 export interface ParsedCDEvent {
     eventTime: number | string;
+    slackTimestamp?: string;
     triggeredBy: string;
     appName: string;
     pipelineName: string;

From 2b1d096eb0541a0245be2854e9978d4bbc79dfce Mon Sep 17 00:00:00 2001
From: prakhar katiyar <prkhrkat@gmail.com>
Date: Tue, 23 Dec 2025 20:24:22 +0530
Subject: [PATCH 2/3] timestamp update

---
 src/common/mustacheHelper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/mustacheHelper.ts b/src/common/mustacheHelper.ts
index 6c99bb7..5e37167 100644
--- a/src/common/mustacheHelper.ts
+++ b/src/common/mustacheHelper.ts
@@ -84,8 +84,9 @@ export class MustacheHelper {
             : date.format('dddd, MMMM Do YYYY hh:mm A [GMT]Z');
 
         // For Slack, create a formatted timestamp string with the special Slack format
+        // Using <!date^TIMESTAMP^{date_long} {time}> format which matches CD templates
         const slackTimestamp = isSlackNotification
-            ? `<t:${date.unix()}:f>`
+            ? `<!date^${date.unix()}^{date_long} {time} | "-">`
             : undefined;
 
         let baseURL = event.baseUrl;

From 608135278a64e98207c4b4f4ba5cb3fb1fffca9e Mon Sep 17 00:00:00 2001
From: prakhar katiyar <prkhrkat@gmail.com>
Date: Wed, 24 Dec 2025 12:36:33 +0530
Subject: [PATCH 3/3] timestamp update

---
 src/common/mustacheHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/mustacheHelper.ts b/src/common/mustacheHelper.ts
index 5e37167..4d71618 100644
--- a/src/common/mustacheHelper.ts
+++ b/src/common/mustacheHelper.ts
@@ -87,7 +87,7 @@ export class MustacheHelper {
         // Using <!date^TIMESTAMP^{date_long} {time}> format which matches CD templates
         const slackTimestamp = isSlackNotification
             ? `<!date^${date.unix()}^{date_long} {time} | "-">`
-            : undefined;
+            : null;
 
         let baseURL = event.baseUrl;