fix: cancelall only cancels pending orders without blocking on in-progress ones

Author: Matobi98

bot/messages.ts

@@ -1169,14 +1169,6 @@ const notOrdersMessage = async (ctx: MainContext) => {
   }
 };
 
-const cancelallOrdersInProgressMessage = async (ctx: MainContext) => {
-  try {
-    await ctx.reply(ctx.i18n.t('cancelall_orders_in_progress'));
-  } catch (error) {
-    logger.error(error);
-  }
-};
-
 const notRateForCurrency = async (
   bot: HasTelegram,
   user: UserDocument,
@@ -2185,7 +2177,6 @@ export {
   cantTakeOwnOrderMessage,
   notLightningInvoiceMessage,
   notOrdersMessage,
-  cancelallOrdersInProgressMessage,
   notRateForCurrency,
   incorrectAmountInvoiceMessage,
   beginTakeSellMessage,

bot/start.ts

@@ -509,19 +509,6 @@ const initialize = (
       const orders = (await ordersActions.getOrders(ctx.user, 'PENDING')) || [];
 
       if (orders.length === 0) {
-        // If the user has no PENDING orders but does have orders already being
-        // taken, we let them know those must be canceled individually instead
-        // of just saying they have no orders.
-        const inProgressOrders =
-          (await ordersActions.getOrders(ctx.user, 'WAITING_BUYER_INVOICE')) ||
-          [];
-        const waitingPaymentOrders =
-          (await ordersActions.getOrders(ctx.user, 'WAITING_PAYMENT')) || [];
-
-        if (inProgressOrders.length > 0 || waitingPaymentOrders.length > 0) {
-          return await messages.cancelallOrdersInProgressMessage(ctx);
-        }
-
         return await messages.notOrdersMessage(ctx);
       }
 

locales/de.yaml

@@ -300,7 +300,6 @@ invalid_id: Ungültige Id
 cant_take_own_order: Du kannst deinen eigenen Auftrag nicht annehmen.
 send_me_lninvoice: Bitte sende mir ein Lightning-Network LN-Rechnung für ${amount} sats
 you_have_no_orders: Du hast keine aktiven Aufträge
-cancelall_orders_in_progress: Mit /cancelall kannst du nur ausstehende Aufträge stornieren. Aufträge, die bereits in Bearbeitung sind, müssen einzeln mit /cancel storniert werden
 not_rate_for_currency: |
   ${fiatRateProvider} Es gibt keinen Wechselkurs für diese FIAT-Währung,
   Wenn du diese FIAT-Währung verwenden willst, musst du angeben, wie viele Sats du haben möchtest.

locales/en.yaml

@@ -306,7 +306,6 @@ invalid_id: Invalid ID
 cant_take_own_order: You cannot take your own order.
 send_me_lninvoice: Please send me a lightning invoice for ${amount} sats, although to make things easier for you, I also accept invoices without a specified amount. I will make the payment of ${amount} sats.
 you_have_no_orders: You don't have active orders
-cancelall_orders_in_progress: With /cancelall you can only cancel pending orders. Orders that are already in progress must be canceled one by one with /cancel
 choose_order_for_dispute: 'Choose the order to initiate the dispute:'
 not_rate_for_currency: |
   ${fiatRateProvider} There is no exchange rate for this currency,

locales/es.yaml

@@ -304,7 +304,6 @@ invalid_id: Id no válida
 cant_take_own_order: No puedes tomar tu propia orden
 send_me_lninvoice: Por favor envíame una factura lightning por ${amount} sats, aunque para facilitarte las cosas también te acepto facturas sin monto, yo te haré el pago de ${amount} sats.
 you_have_no_orders: No tienes ninguna orden en este momento
-cancelall_orders_in_progress: Con /cancelall solo puedes cancelar órdenes pendientes. Las órdenes que ya están en proceso debes cancelarlas una por una con /cancel
 not_rate_for_currency: |
   ${fiatRateProvider} no tiene tasa de cambio para esta moneda fiat
   Para utilizar esta moneda debes indicar la cantidad de satoshis

locales/fa.yaml

@@ -384,7 +384,6 @@ invalid_id: شناسه نامعتبر
 cant_take_own_order: شما نمی‌توانید سفارش خودتان را بپذیرید.
 send_me_lninvoice: 'لطفاً یک صورتحساب لایتنینگ به مبلغ ${amount} ساتوشی برای من بفرستید. هرچند من صورتحساب‌های فاقد مقدار مشخص را نیز برای راحتی شما می‌پذیرم. من ${amount} ساتوشی را پرداخت خواهم کرد.'
 you_have_no_orders: شما هیچ سفارش فعالی ندارید.
-cancelall_orders_in_progress: با /cancelall فقط می‌توانید سفارش‌های در انتظار را لغو کنید. سفارش‌هایی که در حال انجام هستند باید یکی‌یکی با /cancel لغو شوند
 not_rate_for_currency: |
   هیچ نرخ تبدیلی برای این ارز روی ${fiatRateProvider} وجود ندارد؛ اگر می‌خواهید از این ارز استفاده کنید، باید مشخص کنید چه تعداد ساتوشی می‌خواهید.
   اگر تمایل دارید این ارز در لیست باشد، به لینک زیر بروید و درخواست ثبت کنید. 👇

locales/fr.yaml

@@ -301,7 +301,6 @@ invalid_id: ID invalide
 cant_take_own_order: Tu ne peux pas prendre ta propre commande.
 send_me_lninvoice: Merci de m'envoyer une facture lightning de ${amount} sats, pour te faciliter la vie j'accepte aussi les factures sans montant déterminé. Je ferai le paiement de ${amount} sats.
 you_have_no_orders: Tu n'as aucune offre actif.
-cancelall_orders_in_progress: Avec /cancelall tu ne peux annuler que les offres en attente. Les offres déjà en cours doivent être annulées une par une avec /cancel
 not_rate_for_currency: |
   ${fiatRateProvider} Il n'y a pas de taux de change pour cette devise,
   Si tu souhaites utiliser cette monnaie, tu dois indiquer combien de satoshis tu veux.

locales/it.yaml

@@ -300,7 +300,6 @@ invalid_id: Id non valido
 cant_take_own_order: Non puoi accettare il tuo stesso ordine.
 send_me_lninvoice: Mandami una invoice per ${amount} sats, Sebbene per facilitarvi le cose accetto anche invoice senza importo, effettuerò il pagamento di ${amount} sats.
 you_have_no_orders: Non hai ordini attivi
-cancelall_orders_in_progress: Con /cancelall puoi cancellare solo gli ordini in sospeso. Gli ordini già in corso devono essere cancellati uno a uno con /cancel
 not_rate_for_currency: |
   ${fiatRateProvider} Non c'è tasso di cambio per questa valuta,
   se si desidera utilizzare questa valuta è necessario indicare quanti satoshi si desiderano

locales/ko.yaml

@@ -300,7 +300,6 @@ invalid_id: 유효하지 않은 ID
 cant_take_own_order: 자신이 생성한 주문을 수락할 수 없습니다.
 send_me_lninvoice: 봇에게 ${amount} sats에 해당하는 라이트닝 인보이스를 보내주세요. 필요하다면 금액이 명시되지 않은 0 amount 인보이스 역시 가능합니다. 봇이 ${amount} sats의 인보이스를 생성하게 됩니다.
 you_have_no_orders: 활성화된 주문이 없습니다.
-cancelall_orders_in_progress: /cancelall로는 대기 중인 주문만 취소할 수 있습니다. 이미 진행 중인 주문은 /cancel로 하나씩 취소해야 합니다
 not_rate_for_currency: |
   ${fiatRateProvider} 현재 이 통화에 대해서는 환율을 제공하지 않는 관계로, 이 통화를 사용하고 싶다면 정확한 사토시 양을 명시해야 합니다.
   이 통화의 환율을 등재하고 싶다면, 아래 링크로 가서 요청을 해주세요. 👇

locales/pt.yaml

@@ -301,7 +301,6 @@ invalid_id: ID Inválido
 cant_take_own_order: Você não pode fazer seu próprio pedido.
 send_me_lninvoice: Por favor, envie-me uma fatura de lightning para ${amount} sats, Embora para facilitar as coisas para você, eu também aceito faturas sem valor, farei o pagamento de ${amount} sats.
 you_have_no_orders: Você não tem ordens ativas
-cancelall_orders_in_progress: Com /cancelall você só pode cancelar ordens pendentes. As ordens que já estão em andamento devem ser canceladas uma a uma com /cancel
 not_rate_for_currency: |
   ${fiatRateProvider} Há uma taxa de câmbio para esta moeda,
   Se você quiser usar esta moeda, você deve indicar quantos Satoshis você deseja