nexushub-commands 2.5.0 → 2.5.2

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

@@ -86,15 +86,17 @@ let DepositCommand = DepositCommand_1 = class DepositCommand extends evogram_1.C
                 if (method === 'card' && config.currency.toUpperCase() === 'RUB') {
                     const availableMyRequisites = (yield config.API.get('/myrequisites')).data;
                     const myRequisites = (yield config.API.get(`/aggregators/myrequisites`)).data;
+                    const _minAmount = availableMyRequisites.sort((a, b) => a.minAmount - b.minAmount)[0].minAmount;
+                    const minAmount = myRequisites.minAmount > _minAmount ? myRequisites.minAmount : _minAmount;
                     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>`,
+                            footer: `<i>ℹ️ На данный момент есть доступные реквизиты для суммы, начинающейся от ${yield 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 } }]],
+                                inline_keyboard: [[{ text: `💸 Пополнить на ${yield minAmount.convert({ from: 'RUB', to: config.currency })}`, command: DepositCommand_1, payload: { method: 'card', deposit: minAmount } }]],
                             },
                         });
                     }
@@ -267,8 +269,12 @@ tslib_1.__decorate([
             })).text;
         }),
     }, (0, evogram_1.numberValidator)({ allowFloat: true, min: 0 }), (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ value, context, validateArgs }) {
+        var _b, _c;
         const config = Client_1.Client.config(context);
-        const maxDeposit = yield config.API.get('/config/maxDepositInService').then((x) => x.data.value);
+        const availableMyRequisites = (yield config.API.get('/myrequisites')).data;
+        const maxDeposit1 = Number((_c = (_b = availableMyRequisites === null || availableMyRequisites === void 0 ? void 0 : availableMyRequisites.sort((a, b) => a.maxAmount - b.maxAmount)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.maxAmount);
+        const maxDeposit2 = Number(yield config.API.get('/config/maxDepositInService').then((x) => x.data.value));
+        const maxDeposit = maxDeposit1 > maxDeposit2 ? maxDeposit1 : maxDeposit2;
         const depositAmount = yield value.convert({ from: config.currency, to: 'RUB' });
         if (depositAmount > maxDeposit && validateArgs.method !== 'cryptoWallet')
             throw new Error(`Пополнение, более чем на ${yield maxDeposit.convert({ from: 'RUB', to: config.currency })}, доступно только через <a href="t.me/{{ ${config.support.username} }}">тех. поддержку</a>`);

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

@@ -20,7 +20,7 @@ let RegistrationCommand = RegistrationCommand_1 = class RegistrationCommand exte
     }
     execute(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c, _d, _e;
             const config = Client_1.Client.config(context);
             if (/\/(start|registration) \d+/.test(context.text) || Number(context.text))
                 context.user.userDB.payload.refCode = Number((_a = /(\/(start|registration) )?(\d+)/.exec(context.text)) === null || _a === void 0 ? void 0 : _a[3]);
@@ -31,7 +31,7 @@ let RegistrationCommand = RegistrationCommand_1 = class RegistrationCommand exte
                     body: [
                         {
                             title: `🎉 Привет, {{ ${context.user.fullname} }}!`,
-                            data: [[`<a href="${config.agreement}">Политика и условия пользования</a>`]],
+                            data: [[`<a href="${((_b = context.state.mirror) === null || _b === void 0 ? void 0 : _b.projectMirror.userAgreement) || ((_e = (_d = (_c = context.state) === null || _c === void 0 ? void 0 : _c.settings) === null || _d === void 0 ? void 0 : _d.find((x) => x.name === 'userAgreement')) === null || _e === void 0 ? void 0 : _e.value) || config.agreement}">Политика и условия пользования</a>`]],
                         },
                     ],
                 }, {

package/package.json

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

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

@@ -157,8 +157,12 @@ export class DepositCommand extends Command {
 			numberValidator({ allowFloat: true, min: 0 }),
 			async ({ value, context, validateArgs }) => {
 				const config = Client.config(context)
+				const availableMyRequisites = (await config.API.get('/myrequisites')).data
+
+				const maxDeposit1 = Number(availableMyRequisites?.sort((a: any, b: any) => a.maxAmount - b.maxAmount)?.[0]?.maxAmount)
+				const maxDeposit2 = Number(await config.API.get('/config/maxDepositInService').then((x) => x.data.value))
+				const maxDeposit = maxDeposit1 > maxDeposit2 ? maxDeposit1 : maxDeposit2
 
-				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 && validateArgs.method !== 'cryptoWallet') throw new Error(`Пополнение, более чем на ${await maxDeposit.convert({ from: 'RUB', to: config.currency })}, доступно только через <a href="t.me/{{ ${config.support.username} }}">тех. поддержку</a>`)
@@ -241,6 +245,8 @@ export class DepositCommand extends Command {
 			if (method === 'card' && config.currency.toUpperCase() === 'RUB') {
 				const availableMyRequisites = (await config.API.get('/myrequisites')).data
 				const myRequisites = (await config.API.get(`/aggregators/myrequisites`)).data
+				const _minAmount = availableMyRequisites.sort((a: any, b: any) => a.minAmount - b.minAmount)[0].minAmount
+				const minAmount = myRequisites.minAmount > _minAmount ? myRequisites.minAmount : _minAmount
 
 				if (availableMyRequisites.length > 0 && myRequisites.enabled) {
 					return context.sendFormatted(
@@ -248,11 +254,11 @@ export class DepositCommand extends Command {
 							designImages: ['deposit-no-requisite', 'deposit'],
 							photo: config.images.deposit,
 							header: '<b>❗️К сожалению, сейчас нет доступных реквизитов для оплаты.</b>',
-							footer: `<i>ℹ️ На данный момент есть доступные реквизиты для суммы, начинающейся от ${await myRequisites.minAmount.convert({ from: 'RUB', to: config.currency })}</i>`,
+							footer: `<i>ℹ️ На данный момент есть доступные реквизиты для суммы, начинающейся от ${await 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 } }]],
+								inline_keyboard: [[{ text: `💸 Пополнить на ${await minAmount.convert({ from: 'RUB', to: config.currency })}`, command: DepositCommand, payload: { method: 'card', deposit: minAmount } }]],
 							},
 						}
 					)

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

@@ -27,7 +27,7 @@ export class RegistrationCommand extends Command {
 					body: [
 						{
 							title: `🎉 Привет, {{ ${context.user.fullname} }}!`,
-							data: [[`<a href="${config.agreement}">Политика и условия пользования</a>`]],
+							data: [[`<a href="${context.state.mirror?.projectMirror.userAgreement || context.state?.settings?.find((x: any) => x.name === 'userAgreement')?.value || config.agreement}">Политика и условия пользования</a>`]],
 						},
 					],
 				},