fix: a bunch of things

Would-You-Bot · Dec 10, 2023 · b5c0cf1 · b5c0cf1
1 parent db0d4b9
commit b5c0cf1
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 385 deletions.
diff --git a/src/buttons/dailyInterval.ts b/src/buttons/dailyInterval.ts
@@ -32,11 +32,13 @@ function isFormat(str: string) {
 const button: Button = {
   name: "dailyInterval",
   execute: async (interaction, client, guildDb) => {
-    interaction.showModal(modalObject).catch(() => {});
+
+    await interaction.showModal(modalObject);
+
     interaction
       .awaitModalSubmit({
         filter: (mInter) => mInter.customId === modalObject.custom_id,
-        time: 60000,
+        time: 6000000,
       })
       .then(async (modalInteraction) => {
         const value = modalInteraction.components[0].components[0].value;
@@ -69,27 +71,17 @@ const button: Button = {
             `${client.translation.get(
               guildDb?.language,
               "Settings.embed.dailyMsg",
-            )}: ${
-              guildDb.dailyMsg
-                ? `<:check:1077962440815411241>`
-                : `<:x_:1077962443013238814>`
-            }\n` +
+            )}: ${guildDb.dailyMsg ? ":white_check_mark:" : ":x:"}\n` +
               `${client.translation.get(
                 guildDb?.language,
                 "Settings.embed.dailyChannel",
               )}: ${
-                guildDb.dailyChannel
-                  ? `<#${guildDb.dailyChannel}>`
-                  : `<:x_:1077962443013238814>`
+                guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
               }\n` +
               `${client.translation.get(
                 guildDb?.language,
                 "Settings.embed.dailyRole",
-              )}: ${
-                guildDb.dailyRole
-                  ? `<@&${guildDb.dailyRole}>`
-                  : `<:x_:1077962443013238814>`
-              }\n` +
+              )}: ${guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"}\n` +
               `${client.translation.get(
                 guildDb?.language,
                 "Settings.embed.dailyTimezone",
@@ -105,11 +97,7 @@ const button: Button = {
               `${client.translation.get(
                 guildDb?.language,
                 "Settings.embed.dailyThread",
-              )}: ${
-                guildDb.dailyThread
-                  ? `<:check:1077962440815411241>`
-                  : `<:x_:1077962443013238814>`
-              }`,
+              )}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}`,
           )
           .setColor("#0598F6");
 

diff --git a/src/buttons/dailyMsg.ts b/src/buttons/dailyMsg.ts
@@ -19,22 +19,16 @@ const button: Button = {
         `${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyMsg",
-        )}: ${
-          check ? `<:x_:1077962443013238814>` : `<:check:1077962440815411241>`
-        }\n${client.translation.get(
+        )}: ${check ? ":x:" : ":white_check_mark:"}\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyChannel",
         )}: ${
-          guildDb.dailyChannel
-            ? `<#${guildDb.dailyChannel}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyRole",
         )}: ${
-          guildDb.dailyRole
-            ? `<@&${guildDb.dailyRole}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyTimezone",
@@ -48,11 +42,7 @@ const button: Button = {
           `${client.translation.get(
             guildDb?.language,
             "Settings.embed.dailyThread",
-          )}: ${
-            guildDb.dailyThread
-              ? `<:check:1077962440815411241>`
-              : `<:x_:1077962443013238814>`
-          }`,
+          )}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}`,
       )
       .setColor("#0598F6");
 

diff --git a/src/buttons/dailyThread.ts b/src/buttons/dailyThread.ts
@@ -20,23 +20,17 @@ const button: Button = {
           guildDb?.language,
           "Settings.embed.dailyMsg",
         )}: ${
-          guildDb.dailyMsg
-            ? `<:check:1077962440815411241>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyMsg ? ":white_check_mark:" : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyChannel",
         )}: ${
-          guildDb.dailyChannel
-            ? `<#${guildDb.dailyChannel}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyRole",
         )}: ${
-          guildDb.dailyRole
-            ? `<@&${guildDb.dailyRole}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyTimezone",
@@ -50,9 +44,7 @@ const button: Button = {
           `${client.translation.get(
             guildDb?.language,
             "Settings.embed.dailyThread",
-          )}: ${
-            check ? `<:x_:1077962443013238814>` : `<:check:1077962440815411241>`
-          }`,
+          )}: ${check ? ":x:" : ":white_check_mark:"}`,
       )
       .setColor("#0598F6");
 

diff --git a/src/buttons/dailyTimezone.ts b/src/buttons/dailyTimezone.ts
@@ -9,7 +9,7 @@ import { Button } from "../models";
 
 const modalObject = {
   title: "Daily Message Timezone",
-  custom_id: "modal",
+  custom_id: "dailyTimezone",
   components: [
     {
       type: 1,
@@ -34,7 +34,7 @@ function isValid(tz: string) {
     Intl.DateTimeFormat(undefined, { timeZone: tz });
     return true;
   } catch (err) {
-    //captureException(err);
+    captureException(err);
     return false;
   }
 }
@@ -50,10 +50,13 @@ function dateType(tz: string) {
 const button: Button = {
   name: "dailyTimezone",
   execute: async (interaction, client, guildDb) => {
+
+    await interaction.showModal(modalObject);
+
     interaction
       .awaitModalSubmit({
         filter: (mInter) => mInter.customId === modalObject.custom_id,
-        time: 60000,
+        time: 6000000,
       })
       .then(async (modalInteraction) => {
         const value = modalInteraction.components[0].components[0].value;
@@ -95,23 +98,17 @@ const button: Button = {
               guildDb?.language,
               "Settings.embed.dailyMsg",
             )}: ${
-              guildDb.dailyMsg
-                ? `<:check:1077962440815411241>`
-                : `<:x_:1077962443013238814>`
+              guildDb.dailyMsg ? ":white_check_mark:" : ":x:"
             }\n${client.translation.get(
               guildDb?.language,
               "Settings.embed.dailyChannel",
             )}: ${
-              guildDb.dailyChannel
-                ? `<#${guildDb.dailyChannel}>`
-                : `<:x_:1077962443013238814>`
+              guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
             }\n${client.translation.get(
               guildDb?.language,
               "Settings.embed.dailyRole",
             )}: ${
-              guildDb.dailyRole
-                ? `<@&${guildDb.dailyRole}>`
-                : `<:x_:1077962443013238814>`
+              guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"
             }\n${client.translation.get(
               guildDb?.language,
               "Settings.embed.dailyTimezone",
@@ -125,11 +122,7 @@ const button: Button = {
               `${client.translation.get(
                 guildDb?.language,
                 "Settings.embed.dailyThread",
-              )}: ${
-                guildDb.dailyThread
-                  ? `<:check:1077962440815411241>`
-                  : `<:x_:1077962443013238814>`
-              }`,
+              )}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}`,
           )
           .setColor("#0598F6");
 

diff --git a/src/buttons/deleteDailyRole.ts b/src/buttons/deleteDailyRole.ts
@@ -19,16 +19,12 @@ const button: Button = {
           guildDb?.language,
           "Settings.embed.dailyMsg",
         )}: ${
-          guildDb.dailyMsg
-            ? `<:check:1077962440815411241>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyMsg ? ":white_check_mark:" : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyChannel",
         )}: ${
-          guildDb.dailyChannel
-            ? `<#${guildDb.dailyChannel}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyRole",
@@ -45,11 +41,7 @@ const button: Button = {
           `${client.translation.get(
             guildDb?.language,
             "Settings.embed.dailyThread",
-          )}: ${
-            guildDb.dailyThread
-              ? `<:check:1077962440815411241>`
-              : `<:x_:1077962443013238814>`
-          }`,
+          )}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}`,
       )
       .setColor("#0598F6");
 

diff --git a/src/buttons/replayCooldown.ts b/src/buttons/replayCooldown.ts
@@ -7,7 +7,7 @@ import {
 import { Button } from "../models";
 const modalObject = {
   title: "Replay Cooldown",
-  custom_id: "replaymodal",
+  custom_id: "replayCooldown",
   components: [
     {
       type: 1,
@@ -30,10 +30,13 @@ function isNumericRegex(str: string) {
 const button: Button = {
   name: "replayCooldown",
   execute: async (interaction, client, guildDb) => {
+
+    await interaction.showModal(modalObject);
+
     interaction
       .awaitModalSubmit({
         filter: (mInter) => mInter.customId === modalObject.custom_id,
-        time: 60000,
+        time: 6000000,
       })
       .then(async (modalInteraction) => {
         const value = modalInteraction.components[0].components[0].value;
@@ -83,9 +86,7 @@ const button: Button = {
             )}: ${guildDb.replayType}\n${client.translation.get(
               guildDb?.language,
               "Settings.embed.replayCooldown",
-            )}: ${
-              guildDb.replayCooldown ? `${value}` : `<:x_:1077962443013238814>`
-            }\n`,
+            )}: ${guildDb.replayCooldown ? `${Math.min(Number(value), 86400000)}` : ":x:"}\n`,
           )
           .setColor("#0598F6")
           .setFooter({
@@ -134,7 +135,7 @@ const button: Button = {
 
         await client.database.updateGuild(interaction.guild?.id || "", {
           ...guildDb,
-          replayCooldown: Number(value),
+          replayCooldown: Math.min(Number(value), 86400000),
         });
 
         (modalInteraction as any).update({

diff --git a/src/buttons/selectMenuChannel.ts b/src/buttons/selectMenuChannel.ts
@@ -20,19 +20,15 @@ const button: Button = {
           guildDb?.language,
           "Settings.embed.dailyMsg",
         )}: ${
-          guildDb.dailyMsg
-            ? `<:check:1077962440815411241>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyMsg ? ":white_check_mark:" : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyChannel",
         )}: <#${newChannel}>\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyRole",
         )}: ${
-          guildDb.dailyRole
-            ? `<@&${guildDb.dailyRole}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyTimezone",
@@ -48,7 +44,7 @@ const button: Button = {
             "Settings.embed.dailyThread",
           )}: ${
             guildDb.dailyThread
-              ? `<:check:1077962440815411241>`
+              ? ":white_check_mark:"
               : `<:x:1077962443013238814>`
           }`,
       )

diff --git a/src/buttons/selectMenuReplay.ts b/src/buttons/selectMenuReplay.ts
@@ -10,7 +10,7 @@ import { Button } from "../models";
 
 const modalObject = {
   title: "Replay Cooldown",
-  custom_id: "replaymodal",
+  custom_id: "selectMenuReplay",
   components: [
     {
       type: 1,
@@ -32,10 +32,13 @@ function isNumericRegex(str: string) {
 const button: Button = {
   name: "selectMenuReplay",
   execute: async (interaction, client, guildDb) => {
+
+    await interaction.showModal(modalObject);
+
     interaction
       .awaitModalSubmit({
         filter: (mInter) => mInter.customId === modalObject.custom_id,
-        time: 60000,
+        time: 600000,
       })
       .then(async (modalInteraction) => {
         const value = modalInteraction.components[0].components[0].value;

diff --git a/src/buttons/selectMenuRole.ts b/src/buttons/selectMenuRole.ts
@@ -20,16 +20,12 @@ const button: Button = {
           guildDb?.language,
           "Settings.embed.dailyMsg",
         )}: ${
-          guildDb.dailyMsg
-            ? `<:check:1077962440815411241>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyMsg ? ":white_check_mark:" : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyChannel",
         )}: ${
-          guildDb.dailyChannel
-            ? `<#${guildDb.dailyChannel}>`
-            : `<:x_:1077962443013238814>`
+          guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"
         }\n${client.translation.get(
           guildDb?.language,
           "Settings.embed.dailyRole",
@@ -46,11 +42,7 @@ const button: Button = {
           `${client.translation.get(
             guildDb?.language,
             "Settings.embed.dailyThread",
-          )}: ${
-            guildDb.dailyThread
-              ? `<:check:1077962440815411241>`
-              : `<:x_:1077962443013238814>`
-          }`,
+          )}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}`,
       )
       .setColor("#0598F6");