Merge pull request #43 from Joehoel/quiz

fix: 🐛 Fix `quiz` bugs
Joehoel · Aug 31, 2021 · cd51f1c · cd51f1c
2 parents a33eaad + e9ad1a7
commit cd51f1c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/_commands/admin/score.ts b/src/_commands/admin/score.ts
@@ -42,21 +42,24 @@ export default new SlashCommand({
         if (brain) {
             await Brain.update({ user: brain.user }, { score: value });
 
-            // TODO: Functie van maken
-            // Update scoreboard
-            const scoreboardChannel = (await client.guilds.cache
-                .get(GUILD_ID)
-                ?.channels.cache.get(CHANNELS.REGELS_EN_LEADERBOARD)
-                ?.fetch()) as TextChannel;
+            interaction.reply({ content: `Successfully updated score to: ${value}` });
+        } else {
+            await new Brain({ score: value, user: user.toString() }).save();
+            interaction.reply({ content: `Successfully created new score for ${user}: ${value}` });
+        }
 
-            const messages = await scoreboardChannel.messages.fetch({
-                around: SCOREBOARD_MESSAGE_ID,
-                limit: 1,
-            });
-            const message = messages.first();
-            await message?.edit({ content: await scoreboard() });
+        // TODO: Functie van maken
+        // Update scoreboard
+        const scoreboardChannel = (await client.guilds.cache
+            .get(GUILD_ID)
+            ?.channels.cache.get(CHANNELS.REGELS_EN_LEADERBOARD)
+            ?.fetch()) as TextChannel;
 
-            return interaction.reply({ content: `Successfully updated score to: ${value}` });
-        }
+        const messages = await scoreboardChannel.messages.fetch({
+            around: SCOREBOARD_MESSAGE_ID,
+            limit: 1,
+        });
+        const message = messages.first();
+        await message?.edit({ content: await scoreboard() });
     },
 });
diff --git a/src/entity/Brain.ts b/src/entity/Brain.ts
@@ -10,7 +10,7 @@ export class Brain extends BaseEntity {
     user: string;
 
     @Index()
-    @Column({ default: 0 })
+    @Column({ default: 1 })
     score: number;
 
     @CreateDateColumn()

diff --git a/src/features/check-answers.ts b/src/features/check-answers.ts
@@ -8,7 +8,8 @@ export default async (client: Client, reaction: MessageReaction, user: User | Pa
     if (reaction.partial) await reaction.fetch();
     if (user.bot || reaction.message.channel.type != "DM") return;
 
-    const member = client.guilds.cache.get(GUILD_ID)!.members.cache.get(user.id);
+    const author = reaction.message.embeds[0].author;
+    const member = client.guilds.cache.get(GUILD_ID)!.members.cache.find((m) => m.user.username == author?.name);
 
     const score = await Brain.findOne({ where: { user: member?.toString() } });
 
@@ -28,15 +29,15 @@ export default async (client: Client, reaction: MessageReaction, user: User | Pa
             }
 
             await answersChannel.send({
-                content: `${member} Je antwoord op de vraag van ${Intl.DateTimeFormat("nl-NL", {
+                content: `<@${member?.user.id}> Je antwoord op de vraag van ${Intl.DateTimeFormat("nl-NL", {
                     dateStyle: "medium",
                 }).format(new Date())} is goedgekeurd!`,
             });
         } else {
             const newScore = new Brain({ score: score!.score - 1 });
             await Brain.update({ user: member?.toString() }, newScore);
             await answersChannel.send({
-                content: `${member} Je antwoord op de vraag van ${Intl.DateTimeFormat("nl-NL", {
+                content: `<@${member?.user.id}> Je antwoord op de vraag van ${Intl.DateTimeFormat("nl-NL", {
                     dateStyle: "medium",
                 }).format(new Date())} is bij nader inzien afgekeurd!`,
             });