nexushub-commands 2.9.0 → 2.9.2

package/lib/commands/deposit/Deposit.command.js

@@ -262,7 +262,7 @@ tslib_1.__decorate([
             let minAmount = (_d = minAmountSetting[config.currency]) !== null && _d !== void 0 ? _d : (yield minAmountSetting['RUB'].convert({ from: 'RUB', to: config.currency, ceiled: true }));
             const minDepositByMethod = yield config.API.get('/config/minDepositByMethod').then((x) => x.data.value);
             // prettier-ignore
-            if (minDepositByMethod && minDepositByMethod[args.method] !== undefined && (yield minAmount.convert({ from: config.currency, to: 'RUB' })) < minDepositByMethod[args.method])
+            if (config.currency.toUpperCase() === 'RUB' && minDepositByMethod && minDepositByMethod[args.method] !== undefined && (yield minAmount.convert({ from: config.currency, to: 'RUB' })) < minDepositByMethod[args.method])
                 minAmount = yield minDepositByMethod[args.method].convert({ from: 'RUB', to: config.currency });
             validateArgs.minAmount = minAmount;
             // Функция для красивого округления суммы
@@ -350,6 +350,8 @@ tslib_1.__decorate([
             if (suggestedDepositAmounts) {
                 suggestedDepositAmounts = yield Promise.all(suggestedDepositAmounts.map((x) => tslib_1.__awaiter(void 0, void 0, void 0, function* () { return Number(yield x.convert({ from: 'RUB', to: config.currency, ceiled: true })); })));
                 suggestedDepositAmounts = suggestedDepositAmounts.filter((x) => x >= min && x <= max);
+                if (config.currency.toUpperCase() !== 'RUB')
+                    suggestedDepositAmounts = suggestedDepositAmounts.map((x) => roundToNiceNumber(x));
             }
             // Создаем кнопки (6 кнопок в два ряда по 3)
             const buttons = (suggestedDepositAmounts || amounts).map((amount) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nexushub-commands",
-	"version": "2.9.0",
+	"version": "2.9.2",
 	"main": "./lib/index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/commands/deposit/Deposit.command.ts

@@ -49,7 +49,7 @@ export class DepositCommand extends Command {
 						reply_markup: {
 							inline_keyboard: [...(allowedMethods.includes('card') ? [[{ text: '💳 Банковская карта', command: DepositCommand, payload: { method: 'card' } }]] : []), [{ text: '🪙 Криптовалюта', command: DepositCommand, payload: { method: 'cryptowallet' } }], [{ text: '🎫 Промокод', command: DepositByPromocodeCommand }]],
 						},
-					}
+					},
 				)
 			} else if (value === 'cryptowallet') {
 				await context.sendFormatted(
@@ -67,7 +67,7 @@ export class DepositCommand extends Command {
 								],
 							],
 						},
-					}
+					},
 				)
 			}
 		})
@@ -97,7 +97,7 @@ export class DepositCommand extends Command {
 								},
 							]),
 						},
-					}
+					},
 				)
 			} else {
 				const wallets = await config.API.get(`/crypto/coins/${value}/wallets`).then((x) => x.data)
@@ -122,7 +122,7 @@ export class DepositCommand extends Command {
 								},
 							]),
 						},
-					}
+					},
 				)
 			}
 		})
@@ -145,7 +145,7 @@ export class DepositCommand extends Command {
 
 					const minDepositByMethod = await config.API.get('/config/minDepositByMethod').then((x) => x.data.value)
 					// prettier-ignore
-					if (minDepositByMethod && minDepositByMethod[args.method] !== undefined && (await minAmount.convert({ from: config.currency, to: 'RUB' })) < minDepositByMethod[args.method])
+					if (config.currency.toUpperCase() === 'RUB' && minDepositByMethod && minDepositByMethod[args.method] !== undefined && (await minAmount.convert({ from: config.currency, to: 'RUB' })) < minDepositByMethod[args.method])
 						minAmount = await minDepositByMethod[args.method].convert({ from: 'RUB', to: config.currency });
 
 					validateArgs.minAmount = minAmount
@@ -240,6 +240,8 @@ export class DepositCommand extends Command {
 					if (suggestedDepositAmounts) {
 						suggestedDepositAmounts = await Promise.all(suggestedDepositAmounts.map(async (x) => Number(await x.convert({ from: 'RUB', to: config.currency, ceiled: true }))))
 						suggestedDepositAmounts = suggestedDepositAmounts.filter((x) => x >= min && x <= max)
+
+						if (config.currency.toUpperCase() !== 'RUB') suggestedDepositAmounts = suggestedDepositAmounts.map((x) => roundToNiceNumber(x))
 					}
 
 					// Создаем кнопки (6 кнопок в два ряда по 3)
@@ -268,7 +270,7 @@ export class DepositCommand extends Command {
 								reply_markup: {
 									inline_keyboard: args.suggestedDepositAmounts === false || args.method !== 'card' || suggestedDepositAmountsSetting === 'null' ? undefined : keyboard,
 								},
-							}
+							},
 						)
 					).text
 				},
@@ -294,9 +296,9 @@ export class DepositCommand extends Command {
 				if (Number(value) < Number(validateArgs.minAmount)) throw new Error(`Минимальная сумма пополнения: ${Number(validateArgs.minAmount).toLocaleString('ru')} ${config.currency}`)
 
 				return value
-			}
+			},
 		)
-		deposit: number
+		deposit: number,
 	) {
 		const config = Client.config(context)
 		let interval: NodeJS.Timeout
@@ -379,7 +381,7 @@ export class DepositCommand extends Command {
 							reply_markup: {
 								inline_keyboard: [[{ text: `💸 Пополнить на ${await minAmount.convert({ from: 'RUB', to: config.currency })}`, command: DepositCommand, payload: { method: 'card', deposit: minAmount } }]],
 							},
-						}
+						},
 					)
 				}
 			}
@@ -395,7 +397,7 @@ export class DepositCommand extends Command {
 					reply_markup: {
 						inline_keyboard: [[{ text: '👩‍💻 Поддержка', url: `t.me/${config.support.username}` }]],
 					},
-				}
+				},
 			)
 		}
 
@@ -408,7 +410,7 @@ export class DepositCommand extends Command {
 								from: order.currency,
 								to: 'RUB',
 								ceiled: true,
-						  })}) [${order.id}]`
+							})}) [${order.id}]`
 						: `[${order.id}]`
 				}`,
 				{
@@ -422,7 +424,7 @@ export class DepositCommand extends Command {
 				},
 				{
 					thumbnail: 'https://i.ibb.co/MDrGBbQR/image.png',
-				}
+				},
 			)
 
 			if (Number(deposit) !== Number(order.amount) && method !== 'cryptoWallet') {
@@ -435,26 +437,29 @@ export class DepositCommand extends Command {
 						reply_markup: {
 							inline_keyboard: [[{ text: '📖 Да, я все понял, продолжить', command: GetDepositOrderCommand, payload: { orderId: order.id } }]],
 						},
-					}
+					},
 				)
 			}
 
-			setTimeout(async () => {
-				const neworder = await config.API.get(`/orders/${order.id}`).then((x) => x.data)
-				if (['paid', 'fakepaid'].includes(neworder.status) || neworder.cheque) return
+			setTimeout(
+				async () => {
+					const neworder = await config.API.get(`/orders/${order.id}`).then((x) => x.data)
+					if (['paid', 'fakepaid'].includes(neworder.status) || neworder.cheque) return
 
-				const msgInfo = await context.client.database.config.get(`order${order.id}`)
-				if (!msgInfo || neworder.cheque) return
+					const msgInfo = await context.client.database.config.get(`order${order.id}`)
+					if (!msgInfo || neworder.cheque) return
 
-				context.client.api.deleteMessage({ chat_id: msgInfo.value.chatId, message_id: msgInfo.value.messageId })
-				context.sendFormatted({
-					designImages: ['deposit-time-expired', 'deposit'],
-					header: `<blockquote><b>⚠️ Время на оплату истекло</b></blockquote>\n\n<i>Мы не получили пополнение по нашим реквизитам. Они больше недоступны для пополнения</i>\n\n<b>ℹ️ Если Вы оплатили, а система не определила Ваш перевод - <a href="t.me/${context.mirror.projectMirror.design.supportBot?.username}">обратитесь в тех. поддержку</a></b>`,
-					reply_markup: {
-						inline_keyboard: [[{ text: '🔄 Проверить оплату', command: CheckPaidOrderCommand, payload: { orderId: order.id } }]],
-					},
-				})
-			}, new Date(order.expiresAt).getTime() - new Date().getTime())
+					context.client.api.deleteMessage({ chat_id: msgInfo.value.chatId, message_id: msgInfo.value.messageId })
+					context.sendFormatted({
+						designImages: ['deposit-time-expired', 'deposit'],
+						header: `<blockquote><b>⚠️ Время на оплату истекло</b></blockquote>\n\n<i>Мы не получили пополнение по нашим реквизитам. Они больше недоступны для пополнения</i>\n\n<b>ℹ️ Если Вы оплатили, а система не определила Ваш перевод - <a href="t.me/${context.mirror.projectMirror.design.supportBot?.username}">обратитесь в тех. поддержку</a></b>`,
+						reply_markup: {
+							inline_keyboard: [[{ text: '🔄 Проверить оплату', command: CheckPaidOrderCommand, payload: { orderId: order.id } }]],
+						},
+					})
+				},
+				new Date(order.expiresAt).getTime() - new Date().getTime(),
+			)
 		}
 
 		context.redirect(GetDepositOrderCommand, { orderId: order.id, repeat: order.isRepeat })