From 649abac7da5075cb3e12f74c227933001f97fbd7 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Tue, 9 May 2023 15:45:00 +0200
Subject: [PATCH 1/7] Automations bug fixes & improvements

---
 backend/src/api/automation/automationSlackCallback.ts       | 2 +-
 backend/src/database/repositories/automationRepository.ts   | 1 +
 .../modules/automation/components/automation-dropdown.vue   | 6 +++---
 .../src/modules/automation/pages/automation-list-page.vue   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/src/api/automation/automationSlackCallback.ts b/backend/src/api/automation/automationSlackCallback.ts
index 1fe1cdb0aa..b8b7d84615 100644
--- a/backend/src/api/automation/automationSlackCallback.ts
+++ b/backend/src/api/automation/automationSlackCallback.ts
@@ -11,7 +11,7 @@ export default async (req, res) => {
 
   await SettingsService.save({ slackWebHook: url }, req)
   await Axios.post(url, {
-    text: 'Crowd.dev Notifier has been successfully connected.',
+    text: 'crowd.dev notifier has been successfully connected.',
   })
 
   res.redirect(redirectUrl)
diff --git a/backend/src/database/repositories/automationRepository.ts b/backend/src/database/repositories/automationRepository.ts
index 8b14e7ccb3..4c93b1b7f6 100644
--- a/backend/src/database/repositories/automationRepository.ts
+++ b/backend/src/database/repositories/automationRepository.ts
@@ -189,6 +189,7 @@ export default class AutomationRepository extends RepositoryBase<
               left join latest_executions le on a.id = le."automationId"
       where ${conditionsString}
       ${this.getPaginationString(criteria)}
+      order by "updatedAt" desc
     `
     // fetch all automations for a tenant
     // and include the latest execution data if available
diff --git a/frontend/src/modules/automation/components/automation-dropdown.vue b/frontend/src/modules/automation/components/automation-dropdown.vue
index 3bd8c16ecf..7f46f7c1c7 100644
--- a/frontend/src/modules/automation/components/automation-dropdown.vue
+++ b/frontend/src/modules/automation/components/automation-dropdown.vue
@@ -21,7 +21,7 @@
       >
         <i class="ri-pencil-line mr-2" /><span
           class="text-xs"
-        >Edit webhook</span>
+        >Edit automation</span>
       </el-dropdown-item>
       <el-divider class="border-gray-200 my-2" />
       <el-dropdown-item
@@ -30,7 +30,7 @@
       >
         <i
           class="ri-delete-bin-line mr-2 text-red-500"
-        /><span class="text-xs text-red-500">Delete webhook</span>
+        /><span class="text-xs text-red-500">Delete automation</span>
       </el-dropdown-item>
     </template>
   </el-dropdown>
@@ -68,7 +68,7 @@ const isReadOnly = computed(() => new AutomationPermissions(
 
 const doDestroyWithConfirm = () => ConfirmDialog({
   type: 'danger',
-  title: 'Delete webhook',
+  title: 'Delete automation',
   message:
             "Are you sure you want to proceed? You can't undo this action",
   confirmButtonText: 'Confirm',
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index 83eaedd2c7..bef0eb5de8 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -95,7 +95,7 @@
       description="Send Slack notifications when a new activity happens, or a new member joins your community"
     />
     <app-empty-state-cta
-      v-else-if="filter.type === 'webhooks'"
+      v-else-if="filter.type === 'webhook'"
       icon="ri-flow-chart"
       title="No Webhooks yet"
       description="Create webhook actions when a new activity happens, or a new member joins your community"
@@ -143,7 +143,7 @@ const options = ref([
   },
   {
     label: 'Webhooks',
-    value: 'webhooks',
+    value: 'webhook',
   },
 ]);
 const openAutomationForm = ref(false);

From b578e8fdef6a9ced7992813c0396ccaa0df3f163 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Tue, 9 May 2023 16:27:39 +0200
Subject: [PATCH 2/7] Automation table sortable

---
 .../repositories/automationRepository.ts      |  2 ++
 .../components/list/automation-list-table.vue | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/backend/src/database/repositories/automationRepository.ts b/backend/src/database/repositories/automationRepository.ts
index 4c93b1b7f6..23460ed2b9 100644
--- a/backend/src/database/repositories/automationRepository.ts
+++ b/backend/src/database/repositories/automationRepository.ts
@@ -181,6 +181,7 @@ export default class AutomationRepository extends RepositoryBase<
             a.settings,
             a.state,
             a."createdAt",
+            a."updatedAt",
             le."executedAt" as "lastExecutionAt",
             le.state        as "lastExecutionState",
             le.error        as "lastExecutionError",
@@ -220,6 +221,7 @@ export default class AutomationRepository extends RepositoryBase<
         settings: row.settings,
         state: row.state,
         createdAt: row.createdAt,
+        updatedAt: row.updatedAt,
         lastExecutionAt: row.lastExecutionAt,
         lastExecutionState: row.lastExecutionState,
         lastExecutionError: row.lastExecutionError,
diff --git a/frontend/src/modules/automation/components/list/automation-list-table.vue b/frontend/src/modules/automation/components/list/automation-list-table.vue
index f098faa99b..f85677e740 100644
--- a/frontend/src/modules/automation/components/list/automation-list-table.vue
+++ b/frontend/src/modules/automation/components/list/automation-list-table.vue
@@ -7,8 +7,9 @@
         :data="automations"
         row-key="id"
         border
+        :default-sort="{ prop: 'updatedAt', order: 'descending' }"
       >
-        <el-table-column label="Name">
+        <el-table-column label="Name" prop="name" sortable>
           <template #default="scope">
             <div class="flex items-center py-4">
               <div class="w-6">
@@ -32,7 +33,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="Created on" width="150">
+        <el-table-column label="Created on" width="150" prop="createdAt" sortable>
           <template #default="scope">
             <div class="h-full flex items-center">
               <el-tooltip
@@ -44,7 +45,19 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="Last execution" width="155">
+        <el-table-column label="Last updated" width="150" prop="updatedAt" sortable>
+          <template #default="scope">
+            <div class="h-full flex items-center">
+              <el-tooltip
+                :content="formattedDate(scope.row.updatedAt)"
+                placement="top"
+              >
+                {{ timeAgo(scope.row.updatedAt) }}
+              </el-tooltip>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="Last execution" width="165" prop="lastExecutionAt" sortable>
           <template #default="scope">
             <div class="h-full flex items-center">
               <el-tooltip
@@ -63,7 +76,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="Status" width="130">
+        <el-table-column label="Status" width="130" prop="status" sortable>
           <template #default="scope">
             <div class="h-full flex items-center">
               <app-automation-toggle :automation="scope.row" />
@@ -113,6 +126,7 @@ const { automations } = storeToRefs(automationsStore);
 const timeAgo = (date) => formatDateToTimeAgo(date);
 const formattedDate = (date) => moment(date).format('YYYY-MM-DD HH:mm:ss');
 const translate = (key) => i18n(key);
+
 </script>
 
 <script>

From 9f07d99e8ee2f33716b489abc8a84a8b5f9f4825 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 10 May 2023 08:14:57 +0200
Subject: [PATCH 3/7] Fix message formatting

---
 .../workers/slack/newActivityBlocks.ts        |  20 ++-
 .../workers/slack/newMemberBlocks.ts          | 142 +++++++++---------
 2 files changed, 93 insertions(+), 69 deletions(-)

diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
index 7091d642a1..79e404c553 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
@@ -21,8 +21,26 @@ const computeEngagementLevel = (score) => {
   return ''
 }
 
+const replacements: Record<string, string> = {
+  '/images/integrations/linkedin-reactions/like.svg': ':thumbsup:',
+  '/images/integrations/linkedin-reactions/maybe.svg': ':thinking_face:',
+  '/images/integrations/linkedin-reactions/praise.svg': ':clap:',
+  '/images/integrations/linkedin-reactions/appreciation.svg': ':heart_hands:',
+  '/images/integrations/linkedin-reactions/empathy.svg': ':heart:',
+  '/images/integrations/linkedin-reactions/entertainment.svg': ':laughing:',
+  '/images/integrations/linkedin-reactions/interest.svg': ':bulb:',
+  'href="/': `href="${API_CONFIG.frontendUrl}/`,
+}
+
+const replaceHeadline = (text) => {
+  Object.keys(replacements).forEach((key) => {
+    text = text.replaceAll(key, replacements[key])
+  })
+  return text
+}
+
 export const newActivityBlocks = (activity) => {
-  const display = htmlToMrkdwn(`${activity.display.default}`)
+  const display = htmlToMrkdwn(replaceHeadline(`${activity.display.default}`))
   const reach = activity.member.reach?.[activity.platform] || activity.member.reach?.total
   const memberProperties = []
   if (activity.member.attributes.jobTitle?.default) {
diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
index a3af7d4eaf..80ac320bba 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
@@ -39,75 +39,81 @@ export const newMemberBlocks = (member) => {
       {
         type: 'divider',
       },
-      {
-        type: 'section',
-        fields: [
-          {
-            type: 'mrkdwn',
-            text: '*Title/Role:*',
-          },
-          {
-            type: 'mrkdwn',
-            text: member.attributes.jobTitle?.default || '-',
-          },
-        ],
-      },
-      {
-        type: 'divider',
-      },
-      {
-        type: 'section',
-        fields: [
-          {
-            type: 'mrkdwn',
-            text: '*Organization:*',
-          },
-          {
-            type: 'mrkdwn',
-            text:
-              member.organizations.length > 0
-                ? `<${`${API_CONFIG.frontendUrl}/organizations/${member.organizations[0].id}`}|${
-                    member.organizations[0].name
-                  }>`
-                : '-',
-          },
-        ],
-      },
-      {
-        type: 'divider',
-      },
-      {
-        type: 'section',
-        fields: [
-          {
-            type: 'mrkdwn',
-            text: '*Followers:*',
-          },
-          {
-            type: 'mrkdwn',
-            text: reach > 0 ? `${reach}` : '-',
-          },
-        ],
-      },
-      {
-        type: 'divider',
-      },
-      {
-        type: 'section',
-        fields: [
-          {
-            type: 'mrkdwn',
-            text: '*Location:*',
-          },
+        ...(member.attributes.jobTitle?.default
+            ? [{
+          type: 'section',
+          fields: [
+            {
+              type: 'mrkdwn',
+              text: '*Title/Role:*',
+            },
+            {
+              type: 'mrkdwn',
+              text: member.attributes.jobTitle?.default || '-',
+            },
+          ],
+        },
           {
-            type: 'mrkdwn',
-            text: member.attributes?.location?.default || '-',
-          },
-        ],
-      },
-      {
-        type: 'divider',
-      },
+            type: 'divider',
+          },]
+            : []),
+        ...(member.organizations.length > 0
+            ? [{
+            type: 'section',
+            fields: [
+                {
+                    type: 'mrkdwn',
+                    text: '*Organization:*',
+                },
+                {
+                    type: 'mrkdwn',
+                    text: `<${`${API_CONFIG.frontendUrl}/organizations/${member.organizations[0].id}`}|${
+                                member.organizations[0].name
+                            }>`,
+                },
+            ],
+        },
+            {
+                type: 'divider',
+            }]
+            : []),
+        ...(reach > 0
+            ? [{
+                type: 'section',
+                fields: [
+                    {
+                        type: 'mrkdwn',
+                        text: '*Followers:*',
+                    },
+                    {
+                        type: 'mrkdwn',
+                        text: reach > 0 ? `${reach}` : '-',
+                    },
+                ],
+            },
+                {
+                    type: 'divider',
+                }]
+            : []
+        ),
+        ...(member.attributes?.location?.default
+            ? [{
+                type: 'section',
+                fields: [
+                    {
+                        type: 'mrkdwn',
+                        text: '*Location:*',
+                    },
+                    {
+                        type: 'mrkdwn',
+                        text: member.attributes?.location?.default || '-',
+                    },
+                ],
+            },
+                {
+                    type: 'divider',
+                }]
+            : []),
       {
         type: 'actions',
         elements: [

From 697baef0d128b748bac07925c20e0d8a502994fc Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 10 May 2023 08:39:47 +0200
Subject: [PATCH 4/7] Fix formatting

---
 .../workers/slack/newMemberBlocks.ts          | 131 +++++++++---------
 1 file changed, 69 insertions(+), 62 deletions(-)

diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
index 80ac320bba..523bd7650d 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
@@ -39,81 +39,88 @@ export const newMemberBlocks = (member) => {
       {
         type: 'divider',
       },
-        ...(member.attributes.jobTitle?.default
-            ? [{
-          type: 'section',
-          fields: [
+      ...(member.attributes.jobTitle?.default
+        ? [
             {
-              type: 'mrkdwn',
-              text: '*Title/Role:*',
+              type: 'section',
+              fields: [
+                {
+                  type: 'mrkdwn',
+                  text: '*Title/Role:*',
+                },
+                {
+                  type: 'mrkdwn',
+                  text: member.attributes.jobTitle?.default || '-',
+                },
+              ],
             },
             {
-              type: 'mrkdwn',
-              text: member.attributes.jobTitle?.default || '-',
+              type: 'divider',
             },
-          ],
-        },
-          {
-            type: 'divider',
-          },]
-            : []),
-        ...(member.organizations.length > 0
-            ? [{
-            type: 'section',
-            fields: [
+          ]
+        : []),
+      ...(member.organizations.length > 0
+        ? [
+            {
+              type: 'section',
+              fields: [
                 {
-                    type: 'mrkdwn',
-                    text: '*Organization:*',
+                  type: 'mrkdwn',
+                  text: '*Organization:*',
                 },
                 {
-                    type: 'mrkdwn',
-                    text: `<${`${API_CONFIG.frontendUrl}/organizations/${member.organizations[0].id}`}|${
-                                member.organizations[0].name
-                            }>`,
+                  type: 'mrkdwn',
+                  text: `<${`${API_CONFIG.frontendUrl}/organizations/${member.organizations[0].id}`}|${
+                    member.organizations[0].name
+                  }>`,
                 },
-            ],
-        },
+              ],
+            },
             {
-                type: 'divider',
-            }]
-            : []),
-        ...(reach > 0
-            ? [{
-                type: 'section',
-                fields: [
-                    {
-                        type: 'mrkdwn',
-                        text: '*Followers:*',
-                    },
-                    {
-                        type: 'mrkdwn',
-                        text: reach > 0 ? `${reach}` : '-',
-                    },
-                ],
+              type: 'divider',
             },
+          ]
+        : []),
+      ...(reach > 0
+        ? [
+            {
+              type: 'section',
+              fields: [
                 {
-                    type: 'divider',
-                }]
-            : []
-        ),
-        ...(member.attributes?.location?.default
-            ? [{
-                type: 'section',
-                fields: [
-                    {
-                        type: 'mrkdwn',
-                        text: '*Location:*',
-                    },
-                    {
-                        type: 'mrkdwn',
-                        text: member.attributes?.location?.default || '-',
-                    },
-                ],
+                  type: 'mrkdwn',
+                  text: '*Followers:*',
+                },
+                {
+                  type: 'mrkdwn',
+                  text: reach > 0 ? `${reach}` : '-',
+                },
+              ],
             },
+            {
+              type: 'divider',
+            },
+          ]
+        : []),
+      ...(member.attributes?.location?.default
+        ? [
+            {
+              type: 'section',
+              fields: [
                 {
-                    type: 'divider',
-                }]
-            : []),
+                  type: 'mrkdwn',
+                  text: '*Location:*',
+                },
+                {
+                  type: 'mrkdwn',
+                  text: member.attributes?.location?.default || '-',
+                },
+              ],
+            },
+            {
+              type: 'divider',
+            },
+          ]
+        : []),
       {
         type: 'actions',
         elements: [

From 6afed0f89210a175f46263183ef1cd9e2ee99052 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 10 May 2023 09:34:46 +0200
Subject: [PATCH 5/7] Fix platforms & custom activities

---
 .../nodejs/automation/workers/slack/newActivityBlocks.ts | 9 ++++++---
 .../nodejs/automation/workers/slack/newMemberBlocks.ts   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
index 79e404c553..09aeb87850 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
@@ -40,7 +40,9 @@ const replaceHeadline = (text) => {
 }
 
 export const newActivityBlocks = (activity) => {
-  const display = htmlToMrkdwn(replaceHeadline(`${activity.display.default}`))
+  const isCustomActivity = activity.display.default === "Conducted an activity" && activity.title?.length > 0
+  const headline = isCustomActivity ? activity.title : activity.display.default
+  const display = htmlToMrkdwn(replaceHeadline(`${headline}`))
   const reach = activity.member.reach?.[activity.platform] || activity.member.reach?.total
   const memberProperties = []
   if (activity.member.attributes.jobTitle?.default) {
@@ -55,6 +57,7 @@ export const newActivityBlocks = (activity) => {
   }
   if (activity.member.username) {
     const platforms = Object.keys(activity.member.username)
+      .filter((platform) => !['email'].includes(platform))
       .map((platform) => integrationLabel[platform] || platform)
       .join(' | ')
     memberProperties.push(`*Active on:* ${platforms}`)
@@ -76,7 +79,7 @@ export const newActivityBlocks = (activity) => {
         type: 'section',
         text: {
           type: 'mrkdwn',
-          text: `*<${API_CONFIG.frontendUrl}/members/${activity.member.id}|${activity.member.displayName}>* \n *${display.text}*`,
+          text: `*<${API_CONFIG.frontendUrl}/members/${activity.member.id}|${activity.member.displayName}>* \n*${display.text}*`,
         },
         ...(activity.url
           ? {
@@ -116,7 +119,7 @@ export const newActivityBlocks = (activity) => {
                   type: 'section',
                   text: {
                     type: 'mrkdwn',
-                    text: `${activity.title ? `*${htmlToMrkdwn(activity.title).text}* \n ` : ''}${
+                    text: `${activity.title && !isCustomActivity ? `*${htmlToMrkdwn(activity.title).text}* \n ` : ''}${
                       htmlToMrkdwn(activity.body).text
                     }`,
                   },
diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
index 523bd7650d..e5e6421b98 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
@@ -2,7 +2,7 @@ import { API_CONFIG } from '../../../../../../config'
 import { integrationLabel } from '../../../../../../types/integrationEnums'
 
 export const newMemberBlocks = (member) => {
-  const platforms = Object.keys(member.username)
+  const platforms = Object.keys(member.username).filter((platform) => !['email'].includes(platform))
   const reach = member.reach?.[platforms[0]] || member.reach?.total
   return {
     blocks: [

From e12d83e91255dbf054f3acc1697ab95267f6268e Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 10 May 2023 10:04:45 +0200
Subject: [PATCH 6/7] Fix platform and title display

---
 .../automation/workers/slack/newActivityBlocks.ts   | 13 +++++--------
 .../automation/workers/slack/newMemberBlocks.ts     |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
index 09aeb87850..0d89406c33 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
@@ -40,9 +40,7 @@ const replaceHeadline = (text) => {
 }
 
 export const newActivityBlocks = (activity) => {
-  const isCustomActivity = activity.display.default === "Conducted an activity" && activity.title?.length > 0
-  const headline = isCustomActivity ? activity.title : activity.display.default
-  const display = htmlToMrkdwn(replaceHeadline(`${headline}`))
+  const display = htmlToMrkdwn(replaceHeadline(`${activity.display.default}`))
   const reach = activity.member.reach?.[activity.platform] || activity.member.reach?.total
   const memberProperties = []
   if (activity.member.attributes.jobTitle?.default) {
@@ -55,9 +53,8 @@ export const newActivityBlocks = (activity) => {
   if (engagementLevel.length > 0) {
     memberProperties.push(`*Engagement level:* ${engagementLevel}`)
   }
-  if (activity.member.username) {
-    const platforms = Object.keys(activity.member.username)
-      .filter((platform) => !['email'].includes(platform))
+  if (activity.member.activeOn) {
+    const platforms = activity.member.activeOn
       .map((platform) => integrationLabel[platform] || platform)
       .join(' | ')
     memberProperties.push(`*Active on:* ${platforms}`)
@@ -79,7 +76,7 @@ export const newActivityBlocks = (activity) => {
         type: 'section',
         text: {
           type: 'mrkdwn',
-          text: `*<${API_CONFIG.frontendUrl}/members/${activity.member.id}|${activity.member.displayName}>* \n*${display.text}*`,
+          text: `*<${API_CONFIG.frontendUrl}/members/${activity.member.id}|${activity.member.displayName}>* \n *${display.text}*`,
         },
         ...(activity.url
           ? {
@@ -119,7 +116,7 @@ export const newActivityBlocks = (activity) => {
                   type: 'section',
                   text: {
                     type: 'mrkdwn',
-                    text: `${activity.title && !isCustomActivity ? `*${htmlToMrkdwn(activity.title).text}* \n ` : ''}${
+                    text: `${activity.title && activity.title !== activity.display.default ? `*${htmlToMrkdwn(activity.title).text}* \n ` : ''}${
                       htmlToMrkdwn(activity.body).text
                     }`,
                   },
diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
index e5e6421b98..28045eeb48 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newMemberBlocks.ts
@@ -2,7 +2,7 @@ import { API_CONFIG } from '../../../../../../config'
 import { integrationLabel } from '../../../../../../types/integrationEnums'
 
 export const newMemberBlocks = (member) => {
-  const platforms = Object.keys(member.username).filter((platform) => !['email'].includes(platform))
+  const platforms = member.activeOn
   const reach = member.reach?.[platforms[0]] || member.reach?.total
   return {
     blocks: [

From 5518a52a76c411e8f3124a40c00b7a1a872443c9 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 10 May 2023 10:06:42 +0200
Subject: [PATCH 7/7] Fix formatting

---
 .../nodejs/automation/workers/slack/newActivityBlocks.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
index 0d89406c33..e8972aa68f 100644
--- a/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
+++ b/backend/src/serverless/microservices/nodejs/automation/workers/slack/newActivityBlocks.ts
@@ -116,9 +116,11 @@ export const newActivityBlocks = (activity) => {
                   type: 'section',
                   text: {
                     type: 'mrkdwn',
-                    text: `${activity.title && activity.title !== activity.display.default ? `*${htmlToMrkdwn(activity.title).text}* \n ` : ''}${
-                      htmlToMrkdwn(activity.body).text
-                    }`,
+                    text: `${
+                      activity.title && activity.title !== activity.display.default
+                        ? `*${htmlToMrkdwn(activity.title).text}* \n `
+                        : ''
+                    }${htmlToMrkdwn(activity.body).text}`,
                   },
                 },
               ],