Fix member add handler in discord-ws (#1967)

backend/package.json

@@ -56,6 +56,7 @@
     "@aws-sdk/util-format-url": "^3.226.0",
     "@crowd/alerting": "file:../services/libs/alerting",
     "@crowd/common": "file:../services/libs/common",
+    "@crowd/common_services": "file:../services/libs/common_services",
     "@crowd/cubejs": "file:../services/libs/cubejs",
     "@crowd/feature-flags": "file:../services/libs/feature-flags",
     "@crowd/integrations": "file:../services/libs/integrations",
@@ -67,7 +68,6 @@
     "@crowd/temporal": "file:../services/libs/temporal",
     "@crowd/tracing": "file:../services/libs/tracing",
     "@crowd/types": "file:../services/libs/types",
-    "@crowd/common_services": "file:../services/libs/common_services",
     "@cubejs-client/core": "^0.30.4",
     "@google-cloud/storage": "5.3.0",
     "@octokit/auth-app": "^3.6.1",
@@ -99,7 +99,7 @@
     "cron-time-generator": "^1.3.0",
     "crowd-sentiment": "^1.1.7",
     "crypto-js": "^4.1.1",
-    "discord.js": "^14.7.1",
+    "discord.js": "^14.14.1",
     "dotenv": "8.2.0",
     "dotenv-expand": "^8.0.3",
     "emoji-dictionary": "^1.0.11",

backend/src/bin/discord-ws.ts

@@ -140,25 +140,24 @@ async function spawnClient(
   })
 
   // listen to discord events
-  client.on(Events.GuildMemberAdd, async (m) => {
-    const member = m as any
+  client.on(Events.GuildMemberAdd, async (member) => {
+    // discord.js is cruel. member object here is typed,
+    // but it has custom toString and toJSON methods
+    // and they you print and JSON.stringify it
+    // the structure turns out to be different
     await executeIfNotExists(
-      `member-${member.userId}`,
+      `discord-ws-member-${member.user.id}-${member.guild.id}`,
       cache,
       async () => {
         logger.debug(
           {
             member: member.displayName,
-            guildId: member.guildId ?? member.guild.id,
-            userId: member.userId,
+            guildId: member.guild.id,
+            userId: member.user.id,
           },
           'Member joined guild!',
         )
-        await processPayload(
-          DiscordWebsocketEvent.MEMBER_ADDED,
-          member,
-          member.guildId ?? member.guild.id,
-        )
+        await processPayload(DiscordWebsocketEvent.MEMBER_ADDED, member, member.guild.id)
       },
       delayMilliseconds,
     )
@@ -167,7 +166,7 @@ async function spawnClient(
   client.on(Events.MessageCreate, async (message) => {
     if (message.type === MessageType.Default || message.type === MessageType.Reply) {
       await executeIfNotExists(
-        `msg-${message.id}`,
+        `discord-ws-msg-${message.id}`,
         cache,
         async () => {
           logger.debug(

services/libs/integrations/src/integrations/discord/api/getMember.ts

@@ -10,6 +10,17 @@ export const getMember = async (
   token: string,
   ctx: IProcessStreamContext,
 ): Promise<DiscordApiMember> => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (typeof guildId !== 'string' || guildId.trim() === '') {
+    throw new Error('Invalid guildId')
+  }
+  if (typeof userId !== 'string' || userId.trim() === '') {
+    throw new Error('Invalid userId')
+  }
+  if (typeof token !== 'string' || token.trim() === '') {
+    throw new Error('Invalid token')
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const config: AxiosRequestConfig<any> = {
     method: 'get',