nexushub-commands 2.4.0 → 2.5.0

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

@@ -1,4 +1,5 @@
 "use strict";
+var DepositCommand_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DepositCommand = void 0;
 const tslib_1 = require("tslib");
@@ -23,7 +24,7 @@ function maskExceptLast4(str) {
     }
     return chars.join('');
 }
-let DepositCommand = class DepositCommand extends evogram_1.Command {
+let DepositCommand = DepositCommand_1 = class DepositCommand extends evogram_1.Command {
     execute(context, method, coin, deposit) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = Client_1.Client.config(context);
@@ -82,6 +83,22 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
             this.logger.log(`Запрос на пополнение: ${JSON.stringify(order, null, 2)}`);
             if (!order) {
                 context.user.log(0, `Не удалось получить реквизиты для пополнения на сумму ${Number(deposit).toLocaleString('ru')} ${config.currency}`);
+                if (method === 'card' && config.currency.toUpperCase() === 'RUB') {
+                    const availableMyRequisites = (yield config.API.get('/myrequisites')).data;
+                    const myRequisites = (yield config.API.get(`/aggregators/myrequisites`)).data;
+                    if (availableMyRequisites.length > 0 && myRequisites.enabled) {
+                        return context.sendFormatted({
+                            designImages: ['deposit-no-requisite', 'deposit'],
+                            photo: config.images.deposit,
+                            header: '<b>❗️К сожалению, сейчас нет доступных реквизитов для оплаты.</b>',
+                            footer: `<i>ℹ️ На данный момент есть доступные реквизиты для суммы, начинающейся от ${yield myRequisites.minAmount.convert({ from: 'RUB', to: config.currency })}</i>`,
+                        }, {
+                            reply_markup: {
+                                inline_keyboard: [[{ text: `💸 Пополнить на ${yield myRequisites.minAmount.convert({ from: 'RUB', to: config.currency })}`, command: DepositCommand_1, payload: { method: 'card', deposit: myRequisites.minAmount } }]],
+                            },
+                        });
+                    }
+                }
                 return context.sendFormatted({
                     designImages: ['deposit-no-requisite', 'deposit'],
                     photo: config.images.deposit,
@@ -266,6 +283,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, String, Object, Number]),
     tslib_1.__metadata("design:returntype", Promise)
 ], DepositCommand.prototype, "execute", null);
-exports.DepositCommand = DepositCommand = tslib_1.__decorate([
+exports.DepositCommand = DepositCommand = DepositCommand_1 = tslib_1.__decorate([
     (0, evogram_1.CommandD)({ name: 'deposit', description: [{ text: 'Пополнение' }, { language: 'en', text: 'Deposit' }] })
 ], DepositCommand);

package/lib/commands/registration/Registration.command.js

@@ -27,6 +27,7 @@ let RegistrationCommand = RegistrationCommand_1 = class RegistrationCommand exte
             console.log({ refCode: context.user.userDB.payload.refCode, text: context.text });
             if (!context.user.userDB.payload.agreement)
                 return context.sendFormatted({
+                    designImages: ['registration', 'banner'],
                     body: [
                         {
                             title: `🎉 Привет, {{ ${context.user.fullname} }}!`,

package/load.sh

@@ -3,13 +3,13 @@
 # Параметры
 REMOTE_USER="root"
 REMOTE_IP="109.120.178.210"
-REMOTE_PATH="/root/escort/node_modules/nexushub-commands/"
+REMOTE_PATH="/root/NFTv2/node_modules/nexushub-commands/"
 LOCAL_PATH="./"
 export SSHPASS="CIwF179lkIG1"
 
 # 1. Синхронизация через rsync
 echo "Синхронизация файлов..."
 sshpass -e rsync -avzP --delete -e "ssh -o StrictHostKeyChecking=no" "$LOCAL_PATH/lib/" "$REMOTE_USER@$REMOTE_IP:$REMOTE_PATH/lib/"
-sshpass -e ssh -o StrictHostKeyChecking=no "$REMOTE_USER@$REMOTE_IP" "export PATH=\$PATH:/root/.nvm/versions/node/v22.16.0/bin && pm2 restart escort"
+sshpass -e ssh -o StrictHostKeyChecking=no "$REMOTE_USER@$REMOTE_IP" "export PATH=\$PATH:/root/.nvm/versions/node/v22.16.0/bin && pm2 restart nftv2"
 
 echo "Готово!"

package/package.json

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

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

@@ -237,6 +237,28 @@ export class DepositCommand extends Command {
 
 		if (!order) {
 			context.user.log(0, `Не удалось получить реквизиты для пополнения на сумму ${Number(deposit).toLocaleString('ru')} ${config.currency}`)
+
+			if (method === 'card' && config.currency.toUpperCase() === 'RUB') {
+				const availableMyRequisites = (await config.API.get('/myrequisites')).data
+				const myRequisites = (await config.API.get(`/aggregators/myrequisites`)).data
+
+				if (availableMyRequisites.length > 0 && myRequisites.enabled) {
+					return context.sendFormatted(
+						{
+							designImages: ['deposit-no-requisite', 'deposit'],
+							photo: config.images.deposit,
+							header: '<b>❗️К сожалению, сейчас нет доступных реквизитов для оплаты.</b>',
+							footer: `<i>ℹ️ На данный момент есть доступные реквизиты для суммы, начинающейся от ${await myRequisites.minAmount.convert({ from: 'RUB', to: config.currency })}</i>`,
+						},
+						{
+							reply_markup: {
+								inline_keyboard: [[{ text: `💸 Пополнить на ${await myRequisites.minAmount.convert({ from: 'RUB', to: config.currency })}`, command: DepositCommand, payload: { method: 'card', deposit: myRequisites.minAmount } }]],
+							},
+						}
+					)
+				}
+			}
+
 			return context.sendFormatted(
 				{
 					designImages: ['deposit-no-requisite', 'deposit'],

package/src/commands/registration/Registration.command.ts

@@ -23,6 +23,7 @@ export class RegistrationCommand extends Command {
 		if (!context.user.userDB.payload.agreement)
 			return context.sendFormatted(
 				{
+					designImages: ['registration', 'banner'],
 					body: [
 						{
 							title: `🎉 Привет, {{ ${context.user.fullname} }}!`,