hotfix: ctx.command stopped working. migrating to ctx.userCommand fixed

armand1m · Mar 12, 2024 · 20fa860 · 20fa860
1 parent cfa03f9
commit 20fa860
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "pino-pretty": "^9.3.0",
     "sharp": "^0.33.2",
     "svg-captcha": "^1.4.0",
-    "telegraf": "^4.11.2",
+    "telegraf": "^4.16.3",
     "telegram-format": "^2.1.0",
     "tslib": "^2.1.0",
     "yup": "^0.32.9"

diff --git a/src/commands/deregisterMemberFrom.ts b/src/commands/deregisterMemberFrom.ts
@@ -11,7 +11,7 @@ export const cmdDeregisterMemberFrom: MiddlewareFn<
 > = async (ctx) => {
   const i18n = ctx.i18n;
   const unsafeCountryName = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim();
 
   if (!unsafeCountryName) {

diff --git a/src/commands/findMembersAt.ts b/src/commands/findMembersAt.ts
@@ -11,7 +11,7 @@ export const cmdFindMembersAt: MiddlewareFn<BotContext> = async (
 ) => {
   const i18n = ctx.i18n;
   const unsafeCountryName = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim();
 
   if (!unsafeCountryName) {

diff --git a/src/commands/help.ts b/src/commands/help.ts
@@ -17,7 +17,7 @@ const getContentUrl = (section?: string, topic?: string) => {
 
 export const cmdHelp: Middleware<BotContext> = async (ctx) => {
   const [section, topic] = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim()
     .split(' ');
 

diff --git a/src/commands/pingMembersAt.ts b/src/commands/pingMembersAt.ts
@@ -13,7 +13,7 @@ export const cmdPingMembersAt: MiddlewareFn<BotContext> = async (
 ) => {
   const i18n = ctx.i18n;
   const unsafeCountryName = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim();
 
   if (unsafeCountryName.toLowerCase() === 'remote') {

diff --git a/src/commands/rankCountryRemoteMemberCount.ts b/src/commands/rankCountryRemoteMemberCount.ts
@@ -14,7 +14,7 @@ export const cmdRankCountryRemoteMemberCount: MiddlewareFn<
   const i18n = ctx.i18n;
 
   const unsafeBaseCountryCode = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim();
 
   if (!unsafeBaseCountryCode) {

diff --git a/src/commands/registerMemberAt.ts b/src/commands/registerMemberAt.ts
@@ -11,7 +11,7 @@ export const cmdRegisterMemberAt: MiddlewareFn<BotContext> = async (
 ) => {
   const i18n = ctx.i18n;
   const unsafeCountryName = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim();
 
   if (!unsafeCountryName) {

diff --git a/src/commands/registerRemoteMember.ts b/src/commands/registerRemoteMember.ts
@@ -9,7 +9,7 @@ export const cmdRegisterRemoteMember: MiddlewareFn<
 > = async (ctx) => {
   const i18n = ctx.i18n;
   const countries = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim()
     .split(' ');
 

diff --git a/src/commands/setLanguage.ts b/src/commands/setLanguage.ts
@@ -22,7 +22,7 @@ export const cmdSetLanguage: Middleware<BotContext> = async (ctx) => {
   }
 
   const [langParam] = markdown
-    .escape(ctx.command.args ?? '')
+    .escape(ctx.userCommand.args ?? '')
     .trim()
     .split(' ');
 

diff --git a/src/context.ts b/src/context.ts
@@ -38,7 +38,7 @@ export interface BotContext extends Context {
     mention: string;
     id: number;
   };
-  command: {
+  userCommand: {
     text: string;
     command: string;
     bot?: string;

diff --git a/src/middlewares/createCommandMiddleware.ts b/src/middlewares/createCommandMiddleware.ts
@@ -19,7 +19,7 @@ export const createCommandMiddleware = () => {
       args: parts[3],
     };
 
-    ctx.command = command;
+    ctx.userCommand = command;
 
     return next();
   };

diff --git a/src/middlewares/createContextMiddleware.ts b/src/middlewares/createContextMiddleware.ts
@@ -225,6 +225,9 @@ export const createContextMiddleware = ({ config }: Props) => {
     }
 
     if (!isCaptchaEnabled && captchaRecyclingInterval) {
+      ctx.logger.info(
+        `Found captcha recycling intervals for chat "${chatId}" with captcha disabled. Clearing intervals.`
+      );
       clearInterval(captchaIntervals[chatId]);
     }
 

diff --git a/src/utils/testing/createTestBotContext.ts b/src/utils/testing/createTestBotContext.ts
@@ -40,7 +40,7 @@ export const createTestBotContext = async (
       mention: createMemberMention(mainFakeTestUser),
     },
     database: database,
-    command: {
+    userCommand: {
       bot: 'GringoBot',
     },
     replyWithMarkdown,

diff --git a/yarn.lock b/yarn.lock
@@ -1856,7 +1856,7 @@ svg-captcha@^1.4.0:
   dependencies:
     opentype.js "^0.7.3"
 
-telegraf@^4.11.2:
+telegraf@^4.16.3:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.16.3.tgz#f03fa30482b540a7f9895af8f13ec8f432840a66"
   integrity sha512-yjEu2NwkHlXu0OARWoNhJlIjX09dRktiMQFsM678BAH/PEPVwctzL67+tvXqLCRQQvm3SDtki2saGO9hLlz68w==