Fixes event callback for slack dm (#1303)

Signed-off-by: Marcos Candeia <marrcooos@gmail.com>

Author: mcandeia

airtable/utils/ui-templates/selection-page.template.html

@@ -12,11 +12,7 @@
 
       body {
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
         margin: 0;
         padding: 20px;
@@ -94,11 +90,7 @@
         text-align: left;
         margin: 0 16px;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -156,11 +148,7 @@
         font-size: 14px;
         text-align: left;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -195,11 +183,7 @@
         color: #f5f5f4;
         transition: border-color 0.2s;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -352,11 +336,7 @@
         font-size: 14px;
         color: #f5f5f4;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -491,11 +471,7 @@
         font-size: 14px;
         color: #f5f5f4;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -510,11 +486,7 @@
         color: #737373;
         font-size: 14px;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 
@@ -547,11 +519,7 @@
         align-items: center;
         justify-content: center;
         font-family:
-          Inter,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
+          Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
           sans-serif;
       }
 

google-calendar/actions/events/create.ts

@@ -34,14 +34,18 @@ export default async function createEvent(
   // Configura o Google Meet automaticamente se solicitado
   const eventWithMeet: Event = {
     ...event,
-    conferenceData: addGoogleMeet ? {
-      createRequest: {
-        requestId: `meet-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
-        conferenceSolutionKey: {
-          type: "hangoutsMeet"
-        }
+    conferenceData: addGoogleMeet
+      ? {
+        createRequest: {
+          requestId: `meet-${Date.now()}-${
+            Math.random().toString(36).substr(2, 9)
+          }`,
+          conferenceSolutionKey: {
+            type: "hangoutsMeet",
+          },
+        },
       }
-    } : event.conferenceData,
+      : event.conferenceData,
   } as Event;
 
   const response = await ctx.client["POST /calendars/:calendarId/events"]({
@@ -60,11 +64,11 @@ export default async function createEvent(
   }
 
   const createdEvent = await response.json();
-  
+
   return {
     ...createdEvent,
     meetLink: addGoogleMeet && createdEvent.conferenceData?.entryPoints?.find(
-      (ep: any) => ep.entryPointType === "video"
+      (ep: any) => ep.entryPointType === "video",
     )?.uri,
   };
 }

google-calendar/actions/events/quickAdd.ts

@@ -20,7 +20,8 @@ export default async function quickAddEvent(
   _req: Request,
   ctx: AppContext,
 ) {
-  const { calendarId, text, sendNotifications = false, addGoogleMeet = false } = props;
+  const { calendarId, text, sendNotifications = false, addGoogleMeet = false } =
+    props;
 
   // Primeiro cria o evento com quickAdd
   const quickAddResponse = await ctx.client
@@ -51,12 +52,14 @@ export default async function quickAddEvent(
         body: {
           conferenceData: {
             createRequest: {
-              requestId: `meet-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+              requestId: `meet-${Date.now()}-${
+                Math.random().toString(36).substr(2, 9)
+              }`,
               conferenceSolutionKey: {
-                type: "hangoutsMeet"
-              }
-            }
-          }
+                type: "hangoutsMeet",
+              },
+            },
+          },
         },
       });
 
@@ -68,11 +71,11 @@ export default async function quickAddEvent(
     }
 
     const updatedEvent = await updateResponse.json();
-    
+
     return {
       ...updatedEvent,
       meetLink: updatedEvent.conferenceData?.entryPoints?.find(
-        (ep: any) => ep.entryPointType === "video"
+        (ep: any) => ep.entryPointType === "video",
       )?.uri,
     };
   }

slack/actions/deco-chat/channels/invoke.ts

@@ -10,14 +10,17 @@ export default async function invoke(
   _req: Request,
   ctx: AppContext,
 ) {
-  console.log("slack request", { props });
   const challenge = props.challenge;
   if (challenge) {
     return { challenge };
   }
+
+  const [channel, thread] = props.type === "event_callback"
+    ? [props.event.user, props.event.channel]
+    : [props.event.channel, props.event.channel];
   const linkProps =
     await ctx.appStorage.getItem<JoinChannelProps & { installId: string }>(
-      ctx.cb.forTeam(props.event.team, props.event.channel),
+      ctx.cb.forTeam(props.event.team, channel),
     ) ??
       undefined;
   if (!linkProps) {
@@ -40,7 +43,7 @@ export default async function invoke(
   const streamURL = new URL(streamCallbackUrl);
   streamURL.searchParams.set(
     "__d",
-    `slack-${props.event.team}-${props.event.channel}`,
+    `slack-${props.event.team}-${channel}`,
   );
   const toolCallMessageTs: Record<
     string,
@@ -55,8 +58,8 @@ export default async function invoke(
         role: "user",
       }],
       options: {
-        threadId: props.event.channel,
-        resourceId: props.event.channel,
+        threadId: thread,
+        resourceId: thread,
       },
     },
     onToolCallPart: async (toolCall) => {
@@ -92,7 +95,7 @@ export default async function invoke(
           ],
         },
       ];
-      const response = await client.postMessage(props.event.channel, "", {
+      const response = await client.postMessage(channel, "", {
         thread_ts: props.event.ts,
         blocks,
       });
@@ -153,7 +156,7 @@ export default async function invoke(
             ],
           },
         ];
-        await client.updateMessage(props.event.channel, call.ts, "", {
+        await client.updateMessage(channel, call.ts, "", {
           blocks,
         });
       }
@@ -162,15 +165,15 @@ export default async function invoke(
       buffer += part;
     },
     onErrorPart: async (err: string) => {
-      await client.postMessage(props.event.channel, `❌ Error: ${err}`, {
+      await client.postMessage(channel, `❌ Error: ${err}`, {
         thread_ts: props.event.ts,
       });
     },
     onFinishMessagePart: async () => {
       if (linkProps.agentLink && linkProps.agentName) {
         buffer = `<${linkProps.agentLink}|${linkProps.agentName}>: ${buffer}`;
       }
-      await client.postMessage(props.event.channel, buffer, {
+      await client.postMessage(channel, buffer, {
         thread_ts: props.event.ts,
       }).then((response) => {
         if (!response.ok) {

slack/loaders/deco-chat/channels/list.ts

@@ -8,22 +8,26 @@ import type { AppContext } from "../../../mod.ts";
  * @name DECO_CHAT_CHANNELS_LIST
  * @description This action is triggered when slack channels are needed
  */
-export default async function leave(
+export default async function list(
   _props: ListChannelsProps,
   _req: Request,
   ctx: AppContext,
 ): Promise<ListChannelsResponse> {
   const channels = await ctx.invoke.slack.loaders.channels({});
   return {
-    channels: [...channels.channels.map((ch) => {
-      return {
-        label: ch.name,
-        value: ch.id,
-      };
-    }),
-    ...ctx.botUserId ? [{
-      label: "@deco.chat",
-      value: ctx.botUserId!,
-    }] : []],
+    channels: [
+      ...channels.channels.map((ch) => {
+        return {
+          label: ch.name,
+          value: ch.id,
+        };
+      }),
+      ...ctx.botUserId
+        ? [{
+          label: "@deco.chat",
+          value: ctx.botUserId!,
+        }]
+        : [],
+    ],
   };
 }

slack/mod.ts

@@ -32,6 +32,7 @@ export interface SlackWebhookPayload {
   user: string;
   bot_id: string;
   event: {
+    user: string;
     text: string;
     team: string;
     channel: string;

vtex/actions/authentication/refreshToken.ts

@@ -51,7 +51,7 @@ export default async function refreshToken(
       cookie.name.startsWith("VtexIdclientAutCookie")
     ),
   ].filter((cookie) => cookie !== undefined);
-  
+
   for (const cookie of cookiesToBeSet) {
     if (cookie) {
       setCookie(ctx.response.headers, {

vtex/utils/login/getLoginCookies.ts

@@ -1,18 +1,18 @@
 function getLoginCookies({ cookies }: { cookies: Record<string, string> }) {
-    const vid_rt = cookies.vid_rt;
+  const vid_rt = cookies.vid_rt;
 
-    const vtexAuthCookies: Record<string, string> = {};
+  const vtexAuthCookies: Record<string, string> = {};
 
-    Object.keys(cookies).forEach((cookieName) => {
-        if (cookieName.startsWith("VtexIdclientAutCookie_")) {
-            vtexAuthCookies[cookieName] = cookies[cookieName];
-        }
-    });
+  Object.keys(cookies).forEach((cookieName) => {
+    if (cookieName.startsWith("VtexIdclientAutCookie_")) {
+      vtexAuthCookies[cookieName] = cookies[cookieName];
+    }
+  });
 
-    return {
-        vid_rt,
-        ...vtexAuthCookies,
-    };
+  return {
+    vid_rt,
+    ...vtexAuthCookies,
+  };
 }
 
 export default getLoginCookies;