updates to buttons

DasithKuruppu · Jul 2, 2023 · 7a652e6 · 7a652e6
1 parent 83fceea
commit 7a652e6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 4 deletions.
diff --git a/bot/embeds/templates/neverwinter/raid.ts b/bot/embeds/templates/neverwinter/raid.ts
@@ -151,7 +151,7 @@ export const raidBuilder = ({
         },
         {
           style: 1,
-          label: `Join Waitlist`,
+          label: `Wait`,
           custom_id: buttons.joinWaitlistButton.id,
           disabled: false,
           emoji: {
@@ -163,7 +163,7 @@ export const raidBuilder = ({
         },
         {
           style: 4,
-          label: `Rage quit`,
+          label: `Quit`,
           custom_id: buttons.wontJoinButton.id,
           disabled: false,
           emoji: {
@@ -173,6 +173,18 @@ export const raidBuilder = ({
           },
           type: 2,
         },
+        {
+          style: 5,
+          label: `Class Setup`,
+          url: `https://uglybot.click/dashboard/classes/`,
+          disabled: false,
+          type: 2,
+          emoji: {
+            id: `934762913166663710`,
+            name: `classSetup`,
+            animated: false,
+          },
+        },
       ],
     },
   ],

diff --git a/bot/interactions/commands/remove/raidUser.ts b/bot/interactions/commands/remove/raidUser.ts
@@ -56,6 +56,7 @@ export const removeRaidUserCommand = async (
   const [persistedClassInfo, raidRecord] = await Promise.all([
     getLastUsersClass(member, {
       documentClient,
+      considerDefault: true,
     }),
     getRaid({ raidId }, { documentClient }),
   ]);

diff --git a/bot/interactions/commands/request/profile.ts b/bot/interactions/commands/request/profile.ts
@@ -92,6 +92,7 @@ export const profileCommand = async (
     member as APIInteractionGuildMember,
     {
       documentClient,
+      considerDefault: true
     }
   );
   if (!lastUserClassActivity) {

diff --git a/bot/interactions/messageComponents/buttons/raidButton/confirm.ts b/bot/interactions/messageComponents/buttons/raidButton/confirm.ts
@@ -71,6 +71,7 @@ export const confirmButtonInteract = async (
   const [persistedClassInfo, persistedRaidInfo] = await Promise.all([
     getLastUsersClass(member, {
       documentClient,
+      considerDefault: true,
     }),
     getRaid({ raidId }, { documentClient }),
   ]);

diff --git a/bot/interactions/messageComponents/buttons/raidButton/waitlist.ts b/bot/interactions/messageComponents/buttons/raidButton/waitlist.ts
@@ -74,6 +74,7 @@ export const waitlistButtonInteract = async (
   );
   const persistedClassInfo = await getLastUsersClass(member, {
     documentClient,
+    considerDefault: true,
   });
   const defaultSelectedClassType =
     (new Map(NeverwinterClassesMap).get(

diff --git a/bot/interactions/messageComponents/selectMenu/raidSelectMenu/artifactSelect.ts b/bot/interactions/messageComponents/selectMenu/raidSelectMenu/artifactSelect.ts
@@ -73,6 +73,7 @@ export const raidArtifactSelect = async (
   );
   const persistedClassInfo = await getLastUsersClass(member, {
     documentClient,
+    considerDefault: true,
   });
   const defaultClassType =
     (new Map(NeverwinterClassesMap).get(

diff --git a/bot/interactions/messageComponents/selectMenu/raidSelectMenu/mountSelect.ts b/bot/interactions/messageComponents/selectMenu/raidSelectMenu/mountSelect.ts
@@ -73,6 +73,7 @@ export const raidMounttSelect = async (
   );
   const persistedClassInfo = await getLastUsersClass(member, {
     documentClient,
+    considerDefault: true,
   });
   const defaultClassType =
     (new Map(NeverwinterClassesMap).get(

diff --git a/bot/interactions/messageComponents/utils/storeOps/fetchData.ts b/bot/interactions/messageComponents/utils/storeOps/fetchData.ts
@@ -21,7 +21,7 @@ export const getUserByClass = async (
 };
 export const getLastUsersClass = async (
   member: APIInteractionGuildMember,
-  { documentClient }
+  { documentClient, considerDefault = false }
 ) => {
   const dbResult = await documentClient
     .query({
@@ -38,7 +38,14 @@ export const getLastUsersClass = async (
     .promise();
   const { Items = [] } = dbResult;
   const [Item] = Items.sort(fieldSorter(["-updatedAt", "-createdAt"]));
-  return Item;
+  const ItemDefaultClass = Items.find((item) => item.default);
+  if(considerDefault){
+    return ItemDefaultClass || Item;
+  }
+  else {
+    return Item;
+  }
+
 };
 
 export const getRaid = async (