fix: address issues with riddle and replace deprecated ex: with expiration in redis

mrepol742 · mrepol742 · commit a94b7c2004eb · 2025-10-17T01:09:59.000+08:00
diff --git a/src/commands/quiz.ts b/src/commands/quiz.ts
@@ -30,12 +30,14 @@ export default async function (msg: Message): Promise<void> {
   }
 
   const messageReturn = await msg.reply(text);
-  redis.set(
+  await redis.set(
     `quiz:${messageReturn.id.id}`,
     JSON.stringify({ quiz_id: id.toString() }),
     {
-      EX: 3600, // 1 hour
+      expiration: {
+        type: "EX",
+        value: 3600, // 1 hour
+      },
     },
   );
-  log.info("quiz", `Quiz question sent: ${response.question}`);
 }
diff --git a/src/commands/riddle.ts b/src/commands/riddle.ts
@@ -21,12 +21,14 @@ export default async function (msg: Message): Promise<void> {
   `;
 
   const messageReturn = await msg.reply(text);
-  redis.set(
+  await redis.set(
     `riddle:${messageReturn.id.id}`,
     JSON.stringify({ riddle_id: id.toString() }),
     {
-      EX: 3600, // 1 hour
+      expiration: {
+        type: "EX",
+        value: 3600,
+      },
     },
   );
-  log.info("riddle", `Riddle sent: ${response.question}`);
 }
diff --git a/src/components/ai/agentHandler.ts b/src/components/ai/agentHandler.ts
@@ -113,7 +113,12 @@ export default async function (
   }
 
   if (isQueryCachingEnabled && result) {
-    await redis.set(cacheKey, result, { EX: queryCachingTTL });
+    await redis.set(cacheKey, result, {
+      expiration: {
+        type: "EX",
+        value: queryCachingTTL,
+      },
+    });
   }
   return result;
 }
diff --git a/src/components/events/message.ts b/src/components/events/message.ts
@@ -12,7 +12,7 @@ import { findOrCreateUser, getBlockUser } from "../services/user";
 import { client } from "../client";
 import Font from "../utils/font";
 import quiz from "../utils/quiz";
-import riddle from "../utils/quiz";
+import riddle from "../utils/riddle";
 import { getSetting } from "../services/settings";
 import { errors, mentionResponses } from "../utils/data";
 import { funD, happyEE, sadEE, loveEE } from "../../data/reaction";
@@ -110,15 +110,12 @@ export default async function (msg: Message, type: string): Promise<void> {
     return;
 
   if (!handler) {
-    if (!msg.hasQuotedMsg) return;
-
-    const quoted = await msg.getQuotedMessage();
     if (rateLimitResult.status || rateLimitResult.value.timestamps.length > 5)
       return;
 
     await Promise.allSettled([
-      quiz(msg, quoted),
-      riddle(msg, quoted),
+      quiz(msg),
+      riddle(msg),
       queue.add(() => InstantDownloader(msg)),
       (async () => {
         // override the msg!
diff --git a/src/components/events/reaction.ts b/src/components/events/reaction.ts
@@ -9,8 +9,8 @@ import * as Sentry from "@sentry/node";
 export default async function (client: Client, react: Reaction): Promise<void> {
   if (react.msgId.fromMe || react.id.fromMe) return;
   if (!react.reaction?.trim()) return;
-  // ignore react if it is older than 10 seconds
-  if (react.timestamp < Date.now() / 1000 - 10) return;
+  // ignore react if it is older than 60 seconds
+  if (react.timestamp < Date.now() / 1000 - 60) return;
 
   const senderId = react.senderId.split("@")[0];
   /*
diff --git a/src/components/utils/instantdl/downloader.ts b/src/components/utils/instantdl/downloader.ts
@@ -52,7 +52,12 @@ export async function InstantDownloader(msg: Message): Promise<void> {
           return await YoutubeShortsInstantDownloader(query);
         }
       })(),
-      redis.set(key, "1", { EX: 3600 }),
+      redis.set(key, "1", {
+        expiration: {
+          type: "EX",
+          value: 3600, // 1 hour
+        },
+      }),
     ]);
 
     if (!video) {
diff --git a/src/components/utils/quiz.ts b/src/components/utils/quiz.ts
@@ -4,16 +4,16 @@ import { quiz, done, wrong } from "../utils/data";
 import log from "../utils/log";
 import redis from "../redis";
 
-export default async function (
-  msg: Message,
-  quoted: Message,
-): Promise<boolean> {
+export default async function (msg: Message): Promise<void> {
   try {
-    if (!quoted.body) return false;
+    if (!msg.hasQuotedMsg) return;
+
+    const quoted: Message = await msg.getQuotedMessage();
+    if (!quoted.body) return;
 
     const key = `quiz:${quoted.id.id}`;
     const result = await redis.get(key);
-    if (!result) return false;
+    if (!result) return;
 
     const quizAttempt = JSON.parse(result);
     const question = quiz[parseInt(quizAttempt.quiz_id)];
@@ -46,8 +46,5 @@ export default async function (
         log.info("QuizAnswered", "Wrong", quoted.body),
       ]);
     }
-    return true;
   } catch (error: any) {}
-
-  return false;
 }
diff --git a/src/components/utils/rateLimiter.ts b/src/components/utils/rateLimiter.ts
@@ -19,7 +19,10 @@ export async function resetRateLimit(lid: string): Promise<void> {
       `rate:${lid}`,
       JSON.stringify({ timestamps: [], penaltyCount: 0, penaltyUntil: 0 }),
       {
-        EX: 3600, // 1 hour
+        expiration: {
+          type: "EX",
+          value: 3600, // 1 hour
+        },
       },
     );
   } catch (error) {
@@ -49,7 +52,12 @@ export async function penalizeUser(
 
     const ttl = Math.max(1, Math.floor((entry.penaltyUntil - now) / 1000));
     await Promise.all([
-      redis.set(`rate:${lid}`, JSON.stringify(entry), { EX: ttl }),
+      redis.set(`rate:${lid}`, JSON.stringify(entry), {
+        expiration: {
+          type: "EX",
+          value: ttl,
+        },
+      },),
       prisma.user.update({
         where: { lid },
         data: { points: { decrement: 10 } },
@@ -94,7 +102,12 @@ export async function rateLimiter(
 
     entry.timestamps.push(now);
     const ttl = Math.max(1, Math.floor((entry.penaltyUntil - now) / 1000));
-    await redis.set(key, JSON.stringify(entry), { EX: ttl });
+    await redis.set(key, JSON.stringify(entry), {
+      expiration: {
+        type: "EX",
+        value: ttl,
+      },
+    },);
 
     return {
       value: entry,
diff --git a/src/components/utils/riddle.ts b/src/components/utils/riddle.ts
@@ -4,16 +4,16 @@ import { riddles, done, wrong } from "../utils/data";
 import log from "../utils/log";
 import redis from "../redis";
 
-export default async function (
-  msg: Message,
-  quoted: Message,
-): Promise<boolean> {
+export default async function (msg: Message): Promise<void> {
   try {
-     if (!quoted.body) return false;
+    if (!msg.hasQuotedMsg) return;
+
+    const quoted: Message = await msg.getQuotedMessage();
+    if (!quoted.body) return;
 
     const key = `riddle:${quoted.id.id}`;
     const result = await redis.get(key);
-    if (!result) return false;
+    if (!result) return;
 
     const riddleAttempt = JSON.parse(result);
     const riddle = riddles[parseInt(riddleAttempt.riddle_id)];
@@ -50,8 +50,5 @@ export default async function (
         log.info("RiddleAnsweredWrong", "Wrong", quoted.body),
       ]);
     }
-    return true;
   } catch (error: any) {}
-
-  return false;
 }
diff --git a/src/jobs/speedtest.ts b/src/jobs/speedtest.ts
@@ -15,7 +15,7 @@ export const info = {
 export default async function () {
   try {
     const results = await speedTest({ acceptLicense: true, acceptGdpr: true });
-    console.log("")// to create new line
+    console.log(""); // to create new line
     log.info(
       "SpeedTestJob",
       `Download: ${results.download.bandwidth / 125000} Mbps`,
@@ -25,7 +25,12 @@ export default async function () {
       `Upload: ${results.upload.bandwidth / 125000} Mbps`,
     );
     log.info("SpeedTestJob", `Ping: ${results.ping.latency} ms`);
-    await redis.set(CACHE_KEY, JSON.stringify(results), { EX: CACHE_TTL });
+    await redis.set(CACHE_KEY, JSON.stringify(results), {
+      expiration: {
+        type: "EX",
+        value: CACHE_TTL,
+      },
+    });
   } catch (err) {
     log.error("SpeedTestJob", err);
   }

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,14 @@ export default async function (msg: Message): Promise<void> {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`const messageReturn = await msg.reply(text);`
`33`		`- redis.set(`
	`33`	`+ await redis.set(`
`34`	`34`	`quiz:${messageReturn.id.id}`,
`35`	`35`	`JSON.stringify({ quiz_id: id.toString() }),`
`36`	`36`	`{`
`37`		`- EX: 3600, // 1 hour`
	`37`	`+ expiration: {`
	`38`	`+ type: "EX",`
	`39`	`+ value: 3600, // 1 hour`
	`40`	`+ },`
`38`	`41`	`},`
`39`	`42`	`);`
`40`		- log.info("quiz", `Quiz question sent: ${response.question}`);
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,12 @@ export default async function (`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (isQueryCachingEnabled && result) {`
`116`		`- await redis.set(cacheKey, result, { EX: queryCachingTTL });`
	`116`	`+ await redis.set(cacheKey, result, {`
	`117`	`+ expiration: {`
	`118`	`+ type: "EX",`
	`119`	`+ value: queryCachingTTL,`
	`120`	`+ },`
	`121`	`+ });`
`117`	`122`	`}`
`118`	`123`	`return result;`
`119`	`124`	`}`