Removed messagetype from inputs, success messages are now notices, all other are texts.

action.yml

@@ -21,9 +21,6 @@ inputs:
     description: "Job status. Should be bound to job.status. Default to success."
     required: false
     default: ${{ job.status }}
-  messagetype:
-    description: 'Type of Matrix message (e.g. `m.text` or `m.notice`)'
-    default: 'm.notice'
 runs:
   using: 'node12'
   main: 'dist/index.js'

dist/index.js

@@ -231311,7 +231311,6 @@ try {
   const token = core.getInput('token');
   const message = core.getInput('message');
   const status = core.getInput('status');
-  const messagetype = core.getInput('messagetype');
 
   // Debug output
   core.info(`homeserver: ${homeserver}`);
@@ -231319,13 +231318,12 @@ try {
   core.info(`token: ${token}`);
   core.info(`message: ${message}`);
   core.info(`status: ${status}`);
-  core.info(`messagetype: ${messagetype}`);
 
   const ctx = github.context;
 
   const { owner, repo } = ctx.repo;
   const {
-    workflow, actor, payload, serverUrl, runNumber,
+    ref, workflow, actor, payload, serverUrl, runNumber,
   } = ctx;
 
   const repoURL = `${serverUrl}/${owner}/${repo}`;
@@ -231344,11 +231342,11 @@ try {
 
   const statusOpts = {
     success: {
-      status: 'Success',
+      status: '🟢 Success',
       color: 0x28A745,
     },
     failure: {
-      status: 'Failure',
+      status: '🔴 Failure',
       color: 0xCB2431,
     },
     cancelled: {
@@ -231360,22 +231358,23 @@ try {
   const userMention = status === 'success' ? actor : `<a href="https://matrix.to/#/@${actor}:${homeserver}">${actor}</a>`;
 
   const formattedMessage = `
-<h4 style="color: ${statusOpts[status].color}">${statusOpts[status].status} ${workflow.name}</h4>
+<h4 data-mx-color="${statusOpts[status].color}">${statusOpts[status].status} ${workflow}</h4>
 <p><strong>Repository</strong> <a href="${repoURL}">${owner}/${repo}</a><br>
 <strong>Commit</strong> <a href="${payload.head_commit.url}">${payload.head_commit.id.substring(0, 7)}</a> ${payload.head_commit.message}<br>
+<strong>Ref</strong> ${ref}<br>
 <strong>Triggered by</strong> ${userMention}<br>
-<strong>Run</strong> <a href="${runURL}">#${runNumber}</a><br>
+<strong>Run</strong> <a href="${runURL}">#${runNumber}</a>
 ${md.render(message)}`;
 
   // Send message
   const content = {
-    msgtype: messagetype,
+    msgtype: (status === 'success') ? 'm.notice' : 'm.text',
     format: 'org.matrix.custom.html',
-    body: message,
+    body: `${statusOpts[status].status} ${workflow} @${actor}`,
     formatted_body: formattedMessage,
   };
 
-  if (status === 'success') content['m.mentions'] = { user_ids: [`@${actor}:${homeserver}`] };
+  if (status !== 'success') content['m.mentions'] = { user_ids: [`@${actor}:${homeserver}`] };
 
   client.sendEvent(channel, 'm.room.message', content, '').then(() => {
     // message sent successfully

index.js

@@ -9,7 +9,6 @@ try {
   const token = core.getInput('token');
   const message = core.getInput('message');
   const status = core.getInput('status');
-  const messagetype = core.getInput('messagetype');
 
   // Debug output
   core.info(`homeserver: ${homeserver}`);
@@ -17,13 +16,12 @@ try {
   core.info(`token: ${token}`);
   core.info(`message: ${message}`);
   core.info(`status: ${status}`);
-  core.info(`messagetype: ${messagetype}`);
 
   const ctx = github.context;
 
   const { owner, repo } = ctx.repo;
   const {
-    workflow, actor, payload, serverUrl, runNumber,
+    ref, workflow, actor, payload, serverUrl, runNumber,
   } = ctx;
 
   const repoURL = `${serverUrl}/${owner}/${repo}`;
@@ -42,11 +40,11 @@ try {
 
   const statusOpts = {
     success: {
-      status: 'Success',
+      status: '🟢 Success',
       color: 0x28A745,
     },
     failure: {
-      status: 'Failure',
+      status: '🔴 Failure',
       color: 0xCB2431,
     },
     cancelled: {
@@ -58,22 +56,23 @@ try {
   const userMention = status === 'success' ? actor : `<a href="https://matrix.to/#/@${actor}:${homeserver}">${actor}</a>`;
 
   const formattedMessage = `
-<h4 style="color: ${statusOpts[status].color}">${statusOpts[status].status} ${workflow.name}</h4>
+<h4 data-mx-color="${statusOpts[status].color}">${statusOpts[status].status} ${workflow}</h4>
 <p><strong>Repository</strong> <a href="${repoURL}">${owner}/${repo}</a><br>
 <strong>Commit</strong> <a href="${payload.head_commit.url}">${payload.head_commit.id.substring(0, 7)}</a> ${payload.head_commit.message}<br>
+<strong>Ref</strong> ${ref}<br>
 <strong>Triggered by</strong> ${userMention}<br>
-<strong>Run</strong> <a href="${runURL}">#${runNumber}</a><br>
+<strong>Run</strong> <a href="${runURL}">#${runNumber}</a>
 ${md.render(message)}`;
 
   // Send message
   const content = {
-    msgtype: messagetype,
+    msgtype: (status === 'success') ? 'm.notice' : 'm.text',
     format: 'org.matrix.custom.html',
-    body: message,
+    body: `${statusOpts[status].status} ${workflow} @${actor}`,
     formatted_body: formattedMessage,
   };
 
-  if (status === 'success') content['m.mentions'] = { user_ids: [`@${actor}:${homeserver}`] };
+  if (status !== 'success') content['m.mentions'] = { user_ids: [`@${actor}:${homeserver}`] };
 
   client.sendEvent(channel, 'm.room.message', content, '').then(() => {
     // message sent successfully