nexushub-commands 1.1.0 → 1.1.2

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

@@ -169,7 +169,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 +190,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/lib/commands/deposit/SendCheque.command.js

@@ -45,8 +45,12 @@ let SendChequeCommand = class SendChequeCommand extends migrated_1.Command {
                             url,
                             reqtype: 'urlupload',
                         }),
+                        timeout: 10000,
                     })
-                        .then((x) => x.data);
+                        .then((x) => x.data)
+                        .catch(() => null);
+                    if (!photoURL)
+                        throw new Error('Не удалось загрузить фотографию, попробуйте позже');
                     yield config.API.put(`/orders/${orderId}`, {
                         cheque: photoURL,
                     });

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

@@ -8,9 +8,14 @@ const Client_1 = require("../../Client");
 const migrated_1 = require("evogram/lib/migrated");
 let RegistrationCommand = RegistrationCommand_1 = class RegistrationCommand extends migrated_1.Command {
     isExecutable(context) {
-        var _a, _b;
-        const needReg = ((_a = context.state) === null || _a === void 0 ? void 0 : _a.fromMirror) || context.user.userDB.payload.reg ? false : !((_b = context.state.mammoth) === null || _b === void 0 ? void 0 : _b.mirror) || !context.user.db || /\/start \d+/.test(context.text);
-        return needReg;
+        var _a;
+        if (context.state.fromMirror)
+            return false;
+        if (!((_a = context.state.mammoth) === null || _a === void 0 ? void 0 : _a.mirror))
+            return true;
+        if (/\/start \d+/.test(context.text) && context.mirror.isMain)
+            return true;
+        return false;
     }
     execute(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/package.json

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

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

@@ -96,7 +96,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 +122,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)

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

@@ -49,9 +49,12 @@ export class SendChequeCommand extends Command {
 								url,
 								reqtype: 'urlupload',
 							}),
+							timeout: 10000,
 						})
-						.then((x) => x.data);
+						.then((x) => x.data)
+						.catch(() => null);
 
+					if (!photoURL) throw new Error('Не удалось загрузить фотографию, попробуйте позже');
 					await config.API.put(`/orders/${orderId}`, {
 						cheque: photoURL,
 					});

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

@@ -5,10 +5,12 @@ import { BotContext, Command, CommandContext } from 'evogram/lib/migrated';
 @CommandD({ name: 'registration', priority: 999 })
 export class RegistrationCommand extends Command {
 	public isExecutable(context: CommandContext): boolean {
-		const needReg =
-			context.state?.fromMirror || context.user.userDB.payload.reg ? false : !context.state.mammoth?.mirror || !context.user.db || /\/start \d+/.test(context.text!);
+		if (context.state.fromMirror) return false;
 
-		return needReg;
+		if (!context.state.mammoth?.mirror) return true;
+		if (/\/start \d+/.test(context.text!) && context.mirror.isMain) return true;
+
+		return false;
 	}
 
 	public async execute(context: CommandContext) {