nexushub-commands 1.1.1 → 1.1.3

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

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const evogram_1 = require("evogram");
 const migrated_1 = require("evogram/lib/migrated");
 const Client_1 = require("../../Client");
-const qs = require('qs');
 let CheckPaidOrderCommand = class CheckPaidOrderCommand extends migrated_1.Command {
     execute(context, orderId) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {

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

@@ -5,8 +5,21 @@ const tslib_1 = require("tslib");
 const evogram_1 = require("evogram");
 const migrated_1 = require("evogram/lib/migrated");
 const Client_1 = require("../../Client");
-const GetDepositOrder_command_1 = require("./GetDepositOrder.command");
 const formatMessage_1 = require("../../utils/formatMessage");
+const GetDepositOrder_command_1 = require("./GetDepositOrder.command");
+// Функция для маскировки реквизитов: оставляет только последние 4 не пробельных символа
+function maskExceptLast4(str) {
+    const chars = str.split('');
+    let nonSpaceCount = 0;
+    for (let i = chars.length - 1; i >= 0; i--) {
+        if (chars[i] !== ' ') {
+            nonSpaceCount++;
+            if (nonSpaceCount > 4)
+                chars[i] = '*';
+        }
+    }
+    return chars.join('');
+}
 let DepositCommand = class DepositCommand extends evogram_1.Command {
     execute(context, method, coin, deposit) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -38,6 +51,9 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
                             parse_mode: 'HTML',
                         });
                     }), 1000);
+                    setTimeout(() => {
+                        clearInterval(interval);
+                    }, 300000);
                 }
                 const order = yield config.API.post(`orders`, {
                     mirrorId: context.mammoth.mirror.mirror.id,
@@ -57,7 +73,7 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
                     return context.sendFormatted({
                         photo: config.images.deposit,
                         header: '<b>❗️К сожалению, сейчас нет доступных реквизитов для оплаты.</b>',
-                        footer: '<i>ℹ️ Вы можете попробовать чуть позже, либо связаться с технической поддержкой.</i>',
+                        footer: `<i>ℹ️ Вы можете попробовать чуть позже, воспользоваться другим способом оплаты, либо связаться с <a href="t.me/{{ ${config.support.username} }}">технической поддержкой</a>.</i>`,
                     }, {
                         reply_markup: {
                             inline_keyboard: [[{ text: '👩‍💻 Поддержка', url: `t.me/${config.support.username}` }]],
@@ -71,7 +87,12 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
                             to: 'RUB',
                             ceiled: true,
                         })})`
-                        : ''}`, {
+                        : ``}`, {
+                        // prettier-ignore
+                        message: order.card ?
+                            `<b>💳 Реквизиты:</b> <code>${maskExceptLast4(order.requisites)}</code>\n` +
+                                `<b>👩🏻‍💼 Получатель:</b> ${order.card.holder || '-'}`
+                            : '',
                         keyboard: [[{ text: '🚀 Оплатить счет', callback_data: `PaidOrderCommand?orderId=${order.id}` }]],
                     });
                 return context.redirect(GetDepositOrder_command_1.GetDepositOrderCommand, { orderId: order.id });
@@ -169,7 +190,7 @@ tslib_1.__decorate([
             const config = Client_1.Client.config(context);
             let minAmountSetting = JSON.parse(context.state.settings.find((x) => x.name === 'minDeposit').value);
             let minAmount = (_b = minAmountSetting[config.currency]) !== null && _b !== void 0 ? _b : (yield minAmountSetting['RUB'].convert({ from: 'RUB', to: config.currency }));
-            const minDepositByMethod = yield config.API.get('/config/minDepositByMethod').then((x) => x.data);
+            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])
                 minAmount = yield minDepositByMethod[args.method].convert({ from: 'RUB', to: config.currency });
@@ -190,7 +211,7 @@ tslib_1.__decorate([
         if (args.method === 'cryptoWallet')
             return 0;
         const config = Client_1.Client.config(context);
-        const maxDeposit = yield config.API.get('/config/maxDepositInService').then((x) => x.data);
+        const maxDeposit = yield config.API.get('/config/maxDepositInService').then((x) => x.data.value);
         const depositAmount = yield value.convert({ from: config.currency, to: 'RUB' });
         if (depositAmount > maxDeposit)
             throw new Error(`Пополнение, более чем на ${yield maxDeposit.convert({ from: 'RUB', to: config.currency })}, доступно только через <a href="t.me/{{ ${config.support.username} }}">тех. поддержку</a>`);

package/package.json

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

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

@@ -1,8 +1,6 @@
 import { CommandArgument, CommandD } from 'evogram';
 import { Command, CommandContext } from 'evogram/lib/migrated';
 import { Client } from '../../Client';
-import axios from 'axios';
-const qs = require('qs');
 
 @CommandD({ name: 'checkPaidOrder' })
 export class CheckPaidOrderCommand extends Command {

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

@@ -1,8 +1,21 @@
-import { Command, CommandArgument, CommandD, Evogram, numberValidator } from 'evogram';
+import { Command, CommandArgument, CommandD, numberValidator } from 'evogram';
 import { CommandContext } from 'evogram/lib/migrated';
 import { Client } from '../../Client';
-import { GetDepositOrderCommand } from './GetDepositOrder.command';
 import { formatMessage } from '../../utils/formatMessage';
+import { GetDepositOrderCommand } from './GetDepositOrder.command';
+
+// Функция для маскировки реквизитов: оставляет только последние 4 не пробельных символа
+function maskExceptLast4(str: string): string {
+	const chars = str.split('');
+	let nonSpaceCount = 0;
+	for (let i = chars.length - 1; i >= 0; i--) {
+		if (chars[i] !== ' ') {
+			nonSpaceCount++;
+			if (nonSpaceCount > 4) chars[i] = '*';
+		}
+	}
+	return chars.join('');
+}
 
 @CommandD({ name: 'deposit', description: [{ text: 'Пополнение' }, { language: 'en', text: 'Deposit' }] })
 export class DepositCommand extends Command {
@@ -96,7 +109,7 @@ export class DepositCommand extends Command {
 					let minAmountSetting = JSON.parse(context.state.settings.find((x: any) => x.name === 'minDeposit').value);
 					let minAmount = minAmountSetting[config.currency] ?? (await minAmountSetting['RUB'].convert({ from: 'RUB', to: config.currency }));
 
-					const minDepositByMethod = await config.API.get('/config/minDepositByMethod').then((x) => x.data);
+					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])
 						minAmount = await minDepositByMethod[args.method].convert({ from: 'RUB', to: config.currency });
@@ -122,7 +135,7 @@ export class DepositCommand extends Command {
 				if (args.method === 'cryptoWallet') return 0;
 				const config = Client.config(context);
 
-				const maxDeposit = await config.API.get('/config/maxDepositInService').then((x) => x.data);
+				const maxDeposit = await config.API.get('/config/maxDepositInService').then((x) => x.data.value);
 				const depositAmount = await value.convert({ from: config.currency, to: 'RUB' });
 
 				if (depositAmount > maxDeposit)
@@ -175,6 +188,10 @@ export class DepositCommand extends Command {
 						parse_mode: 'HTML',
 					});
 				}, 1000);
+
+				setTimeout(() => {
+					clearInterval(interval);
+				}, 300_000);
 			}
 
 			const order = await config.API.post(`orders`, {
@@ -197,7 +214,7 @@ export class DepositCommand extends Command {
 					{
 						photo: config.images.deposit,
 						header: '<b>❗️К сожалению, сейчас нет доступных реквизитов для оплаты.</b>',
-						footer: '<i>ℹ️ Вы можете попробовать чуть позже, либо связаться с технической поддержкой.</i>',
+						footer: `<i>ℹ️ Вы можете попробовать чуть позже, воспользоваться другим способом оплаты, либо связаться с <a href="t.me/{{ ${config.support.username} }}">технической поддержкой</a>.</i>`,
 					},
 					{
 						reply_markup: {
@@ -217,9 +234,15 @@ export class DepositCommand extends Command {
 									to: 'RUB',
 									ceiled: true,
 							  })})`
-							: ''
+							: ``
 					}`,
 					{
+						// prettier-ignore
+						message: 
+							order.card ? 
+								`<b>💳 Реквизиты:</b> <code>${maskExceptLast4(order.requisites)}</code>\n` + 
+								`<b>👩🏻‍💼 Получатель:</b> ${order.card.holder || '-'}`
+							: '',
 						keyboard: [[{ text: '🚀 Оплатить счет', callback_data: `PaidOrderCommand?orderId=${order.id}` }]],
 					}
 				);