feature/track challenges

src/commands/banana/banana.ts

@@ -4,6 +4,7 @@ import type { MonkeyTypes } from "../../types/types";
 import { createUser, getUser, setUser } from "../../utils/banana";
 import { getNextDay, isSameDay } from "../../utils/date";
 import { mongoDB } from "../../utils/mongodb";
+import { findUserByDiscordId } from "../../dal/user";
 
 export default {
   name: "banana",
@@ -16,9 +17,7 @@ export default {
 
     const discordID = interaction.user.id;
 
-    const snapshot = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: discordID })
-    );
+    const snapshot = await findUserByDiscordId(discordID);
 
     if (snapshot === undefined) {
       interaction.followUp({

src/commands/dev/fix-wpm-role.ts

@@ -1,5 +1,5 @@
+import { findUserByDiscordId } from "../../dal/user";
 import type { MonkeyTypes } from "../../types/types";
-import { mongoDB } from "../../utils/mongodb";
 
 export default {
   name: "fix-wpm-role",
@@ -27,11 +27,7 @@ export default {
       return;
     }
 
-    const db = mongoDB();
-
-    const dbUser = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: user.id })
-    );
+    const dbUser = await findUserByDiscordId(user.id);
 
     if (dbUser === undefined) {
       interaction.reply({

src/commands/dev/reset-config.ts

@@ -1,4 +1,5 @@
 import { DefaultConfig } from "../../constants/default-config";
+import { findUserByDiscordId } from "../../dal/user";
 import type { MonkeyTypes } from "../../types/types";
 import { mongoDB } from "../../utils/mongodb";
 
@@ -25,9 +26,7 @@ export default {
 
     const db = mongoDB();
 
-    const user = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: discordUser.id })
-    );
+    const user = await findUserByDiscordId(discordUser.id);
 
     if (!user) {
       interaction.followUp({

src/commands/stats/leaderboard.ts

@@ -1,3 +1,4 @@
+import { findUserByDiscordId } from "../../dal/user";
 import type { MonkeyTypes } from "../../types/types";
 import { mongoDB } from "../../utils/mongodb";
 import { toPascalCase } from "../../utils/strings";
@@ -60,9 +61,7 @@ export default {
     const mode = "time"; // interaction.options.getString("mode", true);
     const mode2 = interaction.options.getString("mode2", true);
 
-    const user = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: interaction.user.id })
-    );
+    const user = await findUserByDiscordId(interaction.user.id);
 
     const leaderboardUser =
       user !== undefined

src/commands/stats/personal-bests.ts

@@ -1,8 +1,8 @@
 import { Collection } from "discord.js";
 import { Client } from "../../structures/client";
 import type { MonkeyTypes } from "../../types/types";
-import { mongoDB } from "../../utils/mongodb";
 import { getNameDisplay } from "../../utils/strings";
+import { findUserByDiscordId } from "../../dal/user";
 
 const DEFAULT_TIME = [15, 30, 60, 120];
 const DEFAULT_WORDS = [10, 25, 50, 100];
@@ -20,13 +20,9 @@ export default {
     }
   ],
   run: async (interaction, client) => {
-    const db = mongoDB();
-
     const discordUser = interaction.options.getUser("user") ?? interaction.user;
 
-    const user = <Partial<MonkeyTypes.User> | undefined>(
-      await db.collection("users").findOne({ discordId: discordUser.id })
-    );
+    const user = await findUserByDiscordId(discordUser.id);
 
     if (user === undefined) {
       interaction.reply({

src/commands/stats/result.ts

@@ -3,6 +3,7 @@ import { Client } from "../../structures/client";
 import type { MonkeyTypes } from "../../types/types";
 import { mongoDB } from "../../utils/mongodb";
 import { toPascalCase } from "../../utils/strings";
+import { findUserByDiscordId } from "../../dal/user";
 
 const quoteLengthMap = {
   0: "short",
@@ -30,9 +31,7 @@ export default {
 
     const db = mongoDB();
 
-    const user = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: discordUser.id })
-    );
+    const user = await findUserByDiscordId(discordUser.id);
 
     if (user === undefined || user.uid === undefined) {
       interaction.followUp({

src/commands/stats/stats.ts

@@ -2,8 +2,8 @@ import formatDuration from "date-fns/formatDuration";
 import intervalToDuration from "date-fns/intervalToDuration";
 import { Client } from "../../structures/client";
 import type { MonkeyTypes } from "../../types/types";
-import { mongoDB } from "../../utils/mongodb";
 import { getNameDisplay } from "../../utils/strings";
+import { findUserByDiscordId } from "../../dal/user";
 
 export default {
   name: "stats",
@@ -20,11 +20,7 @@ export default {
   run: async (interaction, client) => {
     const discordUser = interaction.options.getUser("user") ?? interaction.user;
 
-    const db = mongoDB();
-
-    const user = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({ discordId: discordUser.id })
-    );
+    const user = await findUserByDiscordId(discordUser.id);
 
     if (user === undefined) {
       interaction.reply({

src/dal/user.ts

@@ -0,0 +1,31 @@
+import { MonkeyTypes } from "../types/types";
+import { mongoDB } from "../utils/mongodb";
+
+export async function findUserByDiscordId(
+  discordUserId: string
+): Promise<MonkeyTypes.User | undefined> {
+  const db = mongoDB();
+
+  const user = await db
+    .collection<MonkeyTypes.User>("users")
+    .findOne({ discordId: discordUserId });
+
+  if (!user) {
+    return undefined;
+  }
+
+  return user;
+}
+
+export async function updateChallenge(
+  discordId: string,
+  challengeName: string
+): Promise<void> {
+  const db = mongoDB();
+  await db
+    .collection("users")
+    .updateOne(
+      { discordId: discordId },
+      { $set: { [`challenges.${challengeName}`]: { addedAt: Date.now() } } }
+    );
+}

src/events/challenge-response.ts

@@ -15,6 +15,7 @@ import {
   incrementApproved,
   incrementDenied
 } from "../dal/challenge-request-stats";
+import { updateChallenge } from "../dal/user";
 
 const declineReasonOptions: MessageSelectOptionData[] = [
   {
@@ -152,6 +153,13 @@ export default {
       .catch(() => undefined);
 
     if (accepted) {
+      const challengeName = Object.entries(
+        client.clientOptions.challenges
+      ).find(([_, id]) => id === challengeRoleID)?.[0];
+      if (challengeName) {
+        await updateChallenge(userID, challengeName);
+      }
+
       const newEmbeds = message.embeds;
 
       newEmbeds[0]?.addFields({

src/tasks/link-discord.ts

@@ -1,5 +1,5 @@
+import { findUserByDiscordId } from "../dal/user";
 import type { MonkeyTypes } from "../types/types";
-import { mongoDB } from "../utils/mongodb";
 
 export default {
   name: "linkDiscord",
@@ -44,13 +44,7 @@ export default {
 
     await member.roles.add(memberRole);
 
-    const db = mongoDB();
-
-    const dbUser = <MonkeyTypes.User | undefined>(
-      await db.collection("users").findOne({
-        discordId: discordUserID
-      })
-    );
+    const dbUser = await findUserByDiscordId(discordUserID);
 
     const botCommandsChannel = await client.getChannel("botCommands");