Fix review findings on counterparty requirements (PR #853)

- Parse command arguments with split(/\s+/): with split(' ') a double
  space made value bind to '' and Number('') === 0, silently storing 0
  and disabling the requirement the user was trying to set.
- Split not_meeting_requirements into not_meeting_age_requirement and
  not_meeting_orders_requirement (all 10 locales) so a rejected taker is
  only told the threshold they actually failed, instead of a message
  citing an unset requirement as "0".
- Re-render the settings message in resetMessage before handling a
  command, so repeating a command with the same value still produces a
  visible acknowledgement instead of being skipped by the
  messageChanged guard.
- Share the non-negative-integer predicate between readNonNegativeInt
  and the command argument validation instead of duplicating it.
- /resetrequirements now unsets counterparty_requirements instead of
  storing zeros, keeping a single canonical representation of "no
  requirements" that matches the gate's fast path.
- Update takeOrder.spec.ts for the per-threshold denial messages.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KLpk56FhD2oPtF7ne7UxT9

Author: claude

bot/messages.ts

@@ -999,15 +999,30 @@ const userTakerIsBlockedByUserOrder = async (
   }
 };
 
-const notMeetingRequirementsMessage = async (
+const notMeetingAgeRequirementMessage = async (
   ctx: MainContext,
   user: UserDocument,
-  requirements?: { min_days_using_bot: number; min_completed_orders: number },
+  min_days_using_bot: number,
 ) => {
   try {
     await ctx.telegram.sendMessage(
       user.tg_id,
-      ctx.i18n.t('not_meeting_requirements', requirements),
+      ctx.i18n.t('not_meeting_age_requirement', { min_days_using_bot }),
+    );
+  } catch (error) {
+    logger.error(error);
+  }
+};
+
+const notMeetingOrdersRequirementMessage = async (
+  ctx: MainContext,
+  user: UserDocument,
+  min_completed_orders: number,
+) => {
+  try {
+    await ctx.telegram.sendMessage(
+      user.tg_id,
+      ctx.i18n.t('not_meeting_orders_requirement', { min_completed_orders }),
     );
   } catch (error) {
     logger.error(error);
@@ -2263,5 +2278,6 @@ export {
   userTakerIsBlockedByUserOrder,
   userOrderIsBlockedByUserTaker,
   showQRCodeMessage,
-  notMeetingRequirementsMessage,
+  notMeetingAgeRequirementMessage,
+  notMeetingOrdersRequirementMessage,
 };

bot/modules/orders/takeOrder.ts

@@ -174,22 +174,25 @@ export const meetsCounterpartyRequirements = async (
     // predate created_at tracking and are genuinely old, so we let them pass
     // the age check explicitly instead of relying on NaN comparisons.
     if (!Number.isNaN(ageInDays) && ageInDays < min_days_using_bot) {
-      await messages.notMeetingRequirementsMessage(ctx, user, {
+      await messages.notMeetingAgeRequirementMessage(
+        ctx,
+        user,
         min_days_using_bot,
-        min_completed_orders,
-      });
+      );
       return false;
     }
   }
 
-  if (min_completed_orders > 0) {
-    if (user.trades_completed < min_completed_orders) {
-      await messages.notMeetingRequirementsMessage(ctx, user, {
-        min_days_using_bot,
-        min_completed_orders,
-      });
-      return false;
-    }
+  if (
+    min_completed_orders > 0 &&
+    user.trades_completed < min_completed_orders
+  ) {
+    await messages.notMeetingOrdersRequirementMessage(
+      ctx,
+      user,
+      min_completed_orders,
+    );
+    return false;
   }
 
   return true;

bot/modules/user/scenes/settings.ts

@@ -9,10 +9,12 @@ import {
 import { Message } from 'telegraf/typings/core/types/typegram';
 import { logger } from '../../../../logger';
 
+const isNonNegativeInt = (n: number) => Number.isInteger(n) && n >= 0;
+
 const readNonNegativeInt = (value: string | undefined, fallback: number) => {
   if (value === undefined || value.trim() === '') return fallback;
   const parsed = Number(value);
-  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
+  return isNonNegativeInt(parsed) ? parsed : fallback;
 };
 
 const DEFAULT_COUNTERPARTY_REQUIREMENTS = {
@@ -28,8 +30,15 @@ const DEFAULT_MAX_COUNTERPARTY_ORDERS = 10;
 function make() {
   const resetMessage = async (ctx: CommunityContext, next: () => void) => {
     const state = ctx.scene.state as CommunityWizardState;
-    delete state.feedback;
-    delete state.error;
+    // Re-render without the previous feedback/error line so the next
+    // updateMessage always differs from the displayed text; otherwise
+    // repeating a command with the same value would be silently skipped
+    // by the messageChanged guard, leaving the user with no acknowledgement.
+    if (state.feedback || state.error) {
+      delete state.feedback;
+      delete state.error;
+      await updateMessage(ctx);
+    }
     next();
   };
   async function mainData(ctx: CommunityContext) {
@@ -176,10 +185,11 @@ function make() {
         const state = ctx.scene.state as CommunityWizardState;
         if (ctx.message === undefined || !('text' in ctx.message))
           throw new Error('ctx.message is undefined');
-        const [, value] = ctx.message.text.trim().split(' ');
+        // Split on runs of whitespace: with split(' ') a double space would
+        // bind value to '' and Number('') === 0 silently disables the rule.
+        const [, value] = ctx.message.text.trim().split(/\s+/);
         const parsed = Number(value);
-        if (!Number.isInteger(parsed) || parsed < 0)
-          throw new Error('NotValidNumber');
+        if (!isNonNegativeInt(parsed)) throw new Error('NotValidNumber');
         const max = readNonNegativeInt(process.env[envVar], fallbackMax);
         if (parsed > max) {
           state.error = {
@@ -238,9 +248,10 @@ function make() {
         await ctx.deleteMessage();
         const state = ctx.scene.state as CommunityWizardState;
         const user = state.user;
-        user.counterparty_requirements = {
-          ...DEFAULT_COUNTERPARTY_REQUIREMENTS,
-        };
+        // Unset the field instead of storing zeros so "no requirements"
+        // keeps a single canonical representation (undefined), matching the
+        // fast path in meetsCounterpartyRequirements.
+        user.counterparty_requirements = undefined;
         await user.save();
         state.feedback = { i18n: 'requirements_reset' };
         await updateMessage(ctx);

locales/de.yaml

@@ -656,7 +656,8 @@ user_settings: |
   /counterpartyorders <Aufträge> - Legt die Mindestanzahl abgeschlossener Aufträge fest.
   /resetrequirements - Setzt die Gegenpartei-Anforderungen auf Standardwerte zurück.
   /exit - um den Assistenten zu verlassen.
-not_meeting_requirements: Du erfüllst nicht die Anforderungen der Gegenpartei, um diesen Auftrag anzunehmen (erfordert mindestens ${min_days_using_bot} Tage Nutzung des Bots und ${min_completed_orders} abgeschlossene Aufträge).
+not_meeting_age_requirement: Du erfüllst nicht die Anforderungen der Gegenpartei, um diesen Auftrag anzunehmen (erfordert mindestens ${min_days_using_bot} Tage Nutzung des Bots).
+not_meeting_orders_requirement: Du erfüllst nicht die Anforderungen der Gegenpartei, um diesen Auftrag anzunehmen (erfordert mindestens ${min_completed_orders} abgeschlossene Aufträge).
 counterpartyage_updated: Altersanforderung der Gegenpartei auf ${days} Tage aktualisiert.
 counterpartyorders_updated: Auftragsanforderung der Gegenpartei auf ${orders} aktualisiert.
 requirements_reset: Gegenpartei-Anforderungen wurden auf Standardwerte zurückgesetzt.

locales/en.yaml

@@ -663,7 +663,8 @@ user_settings: |
   /counterpartyorders <orders> - Sets the minimum number of completed orders for the counterparty.
   /resetrequirements - Resets counterparty requirements to default.
   /exit - to exit the wizard.
-not_meeting_requirements: You do not meet the counterparty requirements to take this order (requires at least ${min_days_using_bot} days using the bot and ${min_completed_orders} completed orders).
+not_meeting_age_requirement: You do not meet the counterparty requirements to take this order (requires at least ${min_days_using_bot} days using the bot).
+not_meeting_orders_requirement: You do not meet the counterparty requirements to take this order (requires at least ${min_completed_orders} completed orders).
 counterpartyage_updated: Counterparty age requirement updated to ${days} days.
 counterpartyorders_updated: Counterparty completed orders requirement updated to ${orders}.
 requirements_reset: Counterparty requirements have been reset to default.

locales/es.yaml

@@ -659,7 +659,8 @@ user_settings: |
   /counterpartyorders <órdenes> - Establece el mínimo de órdenes completadas para la contraparte.
   /resetrequirements - Restablece los requisitos de contraparte al valor por defecto.
   /exit - para salir del asistente.
-not_meeting_requirements: No cumples los requisitos de la contraparte para tomar esta orden (requiere al menos ${min_days_using_bot} días usando el bot y ${min_completed_orders} órdenes completadas).
+not_meeting_age_requirement: No cumples los requisitos de la contraparte para tomar esta orden (requiere al menos ${min_days_using_bot} días usando el bot).
+not_meeting_orders_requirement: No cumples los requisitos de la contraparte para tomar esta orden (requiere al menos ${min_completed_orders} órdenes completadas).
 counterpartyage_updated: Requisito de antigüedad de contraparte actualizado a ${days} días.
 counterpartyorders_updated: Requisito de órdenes completadas de contraparte actualizado a ${orders}.
 requirements_reset: Los requisitos de contraparte han sido restablecidos al valor por defecto.

locales/fa.yaml

@@ -757,7 +757,8 @@ user_settings: |
 
   خروج از راهنما:
   /exit
-not_meeting_requirements: شما واجد الزامات طرف مقابل برای پذیرش این سفارش نیستید (حداقل ${min_days_using_bot} روز استفاده از ربات و ${min_completed_orders} سفارش تکمیل‌شده لازم است).
+not_meeting_age_requirement: شما واجد الزامات طرف مقابل برای پذیرش این سفارش نیستید (حداقل ${min_days_using_bot} روز استفاده از ربات لازم است).
+not_meeting_orders_requirement: شما واجد الزامات طرف مقابل برای پذیرش این سفارش نیستید (حداقل ${min_completed_orders} سفارش تکمیل‌شده لازم است).
 counterpartyage_updated: الزامات سابقه طرف مقابل به ${days} روز به‌روزرسانی شد.
 counterpartyorders_updated: الزامات سفارش‌های تکمیل شده طرف مقابل به ${orders} عدد به‌روزرسانی شد.
 requirements_reset: الزامات طرف مقابل به مقادیر پیش‌فرض بازگردانده شد.

locales/fr.yaml

@@ -655,7 +655,8 @@ user_settings: |
   /counterpartyorders <ordres> - Définit le nombre minimum d'ordres complétés pour la contrepartie.
   /resetrequirements - Réinitialise les exigences de contrepartie aux valeurs par défaut.
   /exit - pour quitter l'assistant.
-not_meeting_requirements: Vous ne remplissez pas les exigences de la contrepartie pour prendre cet ordre (nécessite au moins ${min_days_using_bot} jours d'utilisation du bot et ${min_completed_orders} ordres complétés).
+not_meeting_age_requirement: Vous ne remplissez pas les exigences de la contrepartie pour prendre cet ordre (nécessite au moins ${min_days_using_bot} jours d'utilisation du bot).
+not_meeting_orders_requirement: Vous ne remplissez pas les exigences de la contrepartie pour prendre cet ordre (nécessite au moins ${min_completed_orders} ordres complétés).
 counterpartyage_updated: Exigence d'âge de la contrepartie mise à jour à ${days} jours.
 counterpartyorders_updated: Exigence d'ordres complétés de la contrepartie mise à jour à ${orders}.
 requirements_reset: Les exigences de contrepartie ont été réinitialisées aux valeurs par défaut.

locales/it.yaml

@@ -653,7 +653,8 @@ user_settings: |
   /counterpartyorders <ordini> - Imposta il numero minimo di ordini completati per la controparte.
   /resetrequirements - Ripristina i requisiti della controparte ai valori predefiniti.
   /exit - per uscire dall'assistente.
-not_meeting_requirements: Non soddisfi i requisiti della controparte per accettare questo ordine (sono necessari almeno ${min_days_using_bot} giorni di utilizzo del bot e ${min_completed_orders} ordini completati).
+not_meeting_age_requirement: Non soddisfi i requisiti della controparte per accettare questo ordine (sono necessari almeno ${min_days_using_bot} giorni di utilizzo del bot).
+not_meeting_orders_requirement: Non soddisfi i requisiti della controparte per accettare questo ordine (sono necessari almeno ${min_completed_orders} ordini completati).
 counterpartyage_updated: Requisito di età della controparte aggiornato a ${days} giorni.
 counterpartyorders_updated: Requisito di ordini completati della controparte aggiornato a ${orders}.
 requirements_reset: I requisiti della controparte sono stati ripristinati ai valori predefiniti.

locales/ko.yaml

@@ -653,7 +653,8 @@ user_settings: |
   /counterpartyorders <주문> - 거래 상대방의 최소 완료 주문 수를 설정합니다.
   /resetrequirements - 거래 상대방 요구 사항을 기본값으로 초기화합니다.
   /exit - 설정 모드 나가기.
-not_meeting_requirements: 귀하는 이 주문을 수락하기 위한 거래 상대방 요구 사항을 충족하지 않습니다 (최소 ${min_days_using_bot}일의 봇 사용과 ${min_completed_orders}개의 완료된 주문이 필요합니다).
+not_meeting_age_requirement: 귀하는 이 주문을 수락하기 위한 거래 상대방 요구 사항을 충족하지 않습니다 (최소 ${min_days_using_bot}일의 봇 사용이 필요합니다).
+not_meeting_orders_requirement: 귀하는 이 주문을 수락하기 위한 거래 상대방 요구 사항을 충족하지 않습니다 (최소 ${min_completed_orders}개의 완료된 주문이 필요합니다).
 counterpartyage_updated: 거래 상대방 가입 기간 요구 사항이 ${days}일로 업데이트되었습니다.
 counterpartyorders_updated: 거래 상대방 완료 주문 수 요구 사항이 ${orders}개로 업데이트되었습니다.
 requirements_reset: 거래 상대방 요구 사항이 기본값으로 초기화되었습니다.