From 5eda9f099b6cbe67f8a05920426814d29001f577 Mon Sep 17 00:00:00 2001
From: zeme-wana <15709674+zeme-wana@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:25:52 +0200
Subject: [PATCH] Remove mentions to @channel in slack-message-broker.yml
 (#6583)

---
 .github/workflows/slack-message-broker.yml | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/slack-message-broker.yml b/.github/workflows/slack-message-broker.yml
index 48539c2e33d..6cf8917b3fd 100644
--- a/.github/workflows/slack-message-broker.yml
+++ b/.github/workflows/slack-message-broker.yml
@@ -47,7 +47,7 @@ jobs:
               if (senderLogin in slackMemberIds) {
                 return `<@${slackMemberIds[senderLogin]}>`;
               } else {
-                return "@here";
+                return "@{senderLogin}";
               }
             }
 
@@ -62,20 +62,14 @@ jobs:
               const url = "${{ github.event.workflow_run.html_url }}";
               const status = "${{ github.event.workflow_run.status }}";
               const conclusion = "${{ github.event.workflow_run.conclusion }}";
-              const failureConclusions = [ "failure", "null", "cancelled", "action_required", "neutral", "timed_out" ];
-
-              if (conclusion == "") {
-                message = `${name} \`${status}\` ⏳ <${url}|View Logs> ${slackMember}`;
-              } else if (conclusion == "success") {
-                message = `${name} \`${conclusion}\` ✅ <${url}|View Logs> ${slackMember}`;
-              } else if (conclusion == "skipped") {
-                message = `${name} \`${conclusion}\` ⏩ <${url}|View Logs> ${slackMember}`;
-              } else if (failureConclusions.includes(conclusion)) {
-                message = `${name} \`${conclusion}\` ❌ <${url}|View Logs> ${slackMember}`;
+              const failureConclusions = [ "failure", "null", "action_required", "neutral", "timed_out" ];
+
+              if (failureConclusions.includes(conclusion)) {
+                message = `❌ ${name} \`${conclusion}\` <${url}|View Logs> ${slackMember}`;
                 shouldSendMessage = true;
               } else {
-                message = `${name} \`${conclusion}\` ⁉️ <${url}|View Logs> Unknown Conclusion @channel`;
-                shouldSendMessage = true;
+                message = `${name} \`${status}\` \`${conclusion}\` <${url}|View Logs> ${slackMember}`;
+                shouldSendMessage = false;
               }
             }
 
@@ -93,14 +87,12 @@ jobs:
                 "ci/eval"
               ];
 
-              if (conclusion == "success") {
-                message = `${name} \`${conclusion}\` ✅ <${url}|View Logs> ${slackMember}`;
-              } else if (conclusion == "failure" && checkRunWatchlist.includes(name)) {
-                message = `${name} \`${conclusion}\` ❌ <${url}|View Logs> ${slackMember}`;
+              if (conclusion == "failure" && checkRunWatchlist.includes(name)) {
+                message = `❌ ${name} \`${conclusion}\` <${url}|View Logs> ${slackMember}`;
                 shouldSendMessage = true;
               } else {
-                message = `${name} \`${conclusion}\` ⁉️ <${url}|View Logs> Unknown Conclusion @channel`;
-                shouldSendMessage = true;
+                message = `${name} \`${status}\` \`${conclusion}\` <${url}|View Logs> ${slackMember}`;
+                shouldSendMessage = false;
               }
             }