feat: make quiz correct and next question in same message and bot now append the qouted message to the command query if its not long enough

Author: mrepol742

src/commands/quiz.ts

@@ -1,5 +1,5 @@
 import { Message } from "../types/message";
-import { quiz } from "../components/utils/data";
+import { done, quiz } from "../components/utils/data";
 import log from "../components/utils/log";
 import redis from "../components/redis";
 
@@ -12,11 +12,16 @@ export const info = {
   cooldown: 5000,
 };
 
-export default async function (msg: Message): Promise<void> {
+export default async function (
+  msg: Message,
+  continueQuiz: boolean = false,
+): Promise<void> {
   const id = Math.floor(Math.random() * quiz.length);
   const response = quiz[id];
 
   let text = `
+    ${continueQuiz && done[Math.floor(Math.random() * done.length)]}
+
     \`${response.question}\`
   `;
 

src/commands/riddle.ts

@@ -1,5 +1,5 @@
 import { Message } from "../types/message";
-import { riddles } from "../components/utils/data";
+import { done, riddles } from "../components/utils/data";
 import redis from "../components/redis";
 
 export const info = {
@@ -11,11 +11,16 @@ export const info = {
   cooldown: 5000,
 };
 
-export default async function (msg: Message): Promise<void> {
+export default async function (
+  msg: Message,
+  continueQuiz: boolean = false,
+): Promise<void> {
   const id = Math.floor(Math.random() * riddles.length);
   const response = riddles[id];
 
   let text = `
+    ${continueQuiz && done[Math.floor(Math.random() * done.length)]}
+
     \`${response.question}\`
   `;
 

src/components/events/message.ts

@@ -189,7 +189,13 @@ export default async function (msg: Message, type: string): Promise<void> {
     }
 
     log.info("Message", lid, key);
-    msg.body = newMessageBody;
+
+    if (newMessageBody.split(" ").length === 1 && msg.hasQuotedMsg) {
+      const qoutedMessage = await msg.getQuotedMessage();
+      msg.body = (newMessageBody + " " + qoutedMessage.body).trim();
+    } else {
+      msg.body = newMessageBody;
+    }
 
     /*
      *

src/components/utils/quiz.ts

@@ -34,10 +34,9 @@ export default async function (msg: Message): Promise<void> {
       log.info("QuizAnswered", quizAttempt.quiz_id, "correct");
       await Promise.allSettled([
         redis.del(key),
-        msg.reply(done[Math.floor(Math.random() * done.length)]),
         addUserQuizPoints(msg, true),
         quoted.delete(true, true),
-        startNewQuiz(msg),
+        startNewQuiz(msg, true),
       ]);
     } else {
       log.info("QuizAnswered", quizAttempt.quiz_id, "wrong");

src/components/utils/riddle.ts

@@ -34,10 +34,9 @@ export default async function (msg: Message): Promise<void> {
       log.info("RiddleAnswered", riddleAttempt.quiz_id, "correct");
       await Promise.allSettled([
         redis.del(key),
-        msg.reply(done[Math.floor(Math.random() * done.length)]),
         addUserQuizPoints(msg, true, 20),
         quoted.delete(true, true),
-        startNewRiddle(msg),
+        startNewRiddle(msg, true),
       ]);
     } else {
       log.info("RiddleAnsweredWrong", riddleAttempt.quiz_id, "wrong");