Merge pull request RealDevSquad#217 from Real-Dev-Squad/develop

Dev to Main Sync PR

Author: iamitprakash

src/controllers/baseHandler.ts

@@ -58,6 +58,7 @@ export async function baseHandler(
         message.member.user.avatar,
         message.member.user.username,
         message.member.user.discriminator,
+        message.member.joined_at,
         env
       );
     }

src/controllers/verifyCommand.ts

@@ -14,6 +14,7 @@ export async function verifyCommand(
   userAvatarHash: string,
   userName: string,
   discriminator: string,
+  discordJoinedAt: string,
   env: env
 ) {
   const token = await generateUniqueToken();
@@ -24,6 +25,7 @@ export async function verifyCommand(
     userAvatarHash,
     userName,
     discriminator,
+    discordJoinedAt,
     env
   );
   if (response?.status === 201 || response?.status === 200) {

src/typeDefinitions/discordMessage.types.d.ts

@@ -73,6 +73,7 @@ export interface messageRequestDataOptions {
 export interface messageRequestMember {
   user: messageMember;
   nick?: string;
+  joined_at: string;
 }
 
 export interface messageMember {

src/utils/sendUserDiscordData.ts

@@ -9,6 +9,7 @@ export const sendUserDiscordData = async (
   userAvatarHash: string,
   userName: string,
   discriminator: string,
+  discordJoinedAt: string,
   env: env
 ) => {
   const authToken = await jwt.sign(
@@ -24,6 +25,7 @@ export const sendUserDiscordData = async (
       userAvatar: `${DISCORD_AVATAR_BASE_URL}/${discordId}/${userAvatarHash}.jpg`,
       userName: userName,
       discriminator: discriminator,
+      discordJoinedAt: discordJoinedAt,
       expiry: Date.now() + 1000 * 60 * 2,
     },
   };

tests/fixtures/fixture.ts

@@ -21,6 +21,7 @@ export const dummyHelloMessage: discordMessageRequest = {
       avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
       discriminator: "1234",
     },
+    joined_at: "2021-07-25T19:25:16.172000+00:00",
   },
   guild_id: 123456,
   channel_id: 123456,
@@ -38,6 +39,7 @@ export const dummyVerifyMessage: discordMessageRequest = {
       avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
       discriminator: "1234",
     },
+    joined_at: "2021-07-25T19:25:16.172000+00:00",
   },
   guild_id: 123456,
   channel_id: 123456,
@@ -175,6 +177,7 @@ export const discordUserData = {
     userAvatar: "https://cdn.discordapp.com/avatars/1/userAvatarHash.jpg",
     userName: "userName",
     discriminator: "discriminator",
+    discordJoinedAt: "2021-07-25T19:25:16.172000+00:00",
     expiry: mockDateNow + 1000 * 60 * 2,
   },
 };

tests/unit/handlers/verifyCommand.test.ts

@@ -40,6 +40,7 @@ describe("verifyCommand", () => {
       "userAvatarHash",
       "userName",
       "discriminator",
+      "2021-07-25T19:25:16.172000+00:00",
       env
     );
 
@@ -77,6 +78,7 @@ describe("verifyCommand", () => {
       "sjkhdkjashdksjh",
       "test user",
       "sndbhsbgdj",
+      "2021-07-25T19:25:16.172000+00:00",
       env
     );