nexushub-commands 2.0.10 → 2.1.1

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

@@ -107,6 +107,8 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
                             `<b>👩🏻‍💼 Получатель:</b> ${order.card.holder || '-'}`
                         : '',
                     keyboard: [[{ text: '🚀 Оплатить счет', callback_data: `PaidOrderCommand?orderId=${order.id}` }]],
+                }, {
+                    thumbnail: 'https://i.ibb.co/MDrGBbQR/image.png',
                 });
                 if (Number(deposit) !== Number(order.amount) && method !== 'cryptoWallet') {
                     return context.sendFormatted({

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

@@ -86,7 +86,7 @@ let RegistrationCommand = RegistrationCommand_1 = class RegistrationCommand exte
             }).then(({ data }) => data.reg);
             if (result) {
                 this.logger.log(`Первая регистрация мамонта, отправляем лог`);
-                user.log(0, `Мамонт зарегистрировался в боте`);
+                user.log(0, `Мамонт зарегистрировался в боте`, undefined, { thumbnail: 'https://i.ibb.co/cKccjJqx/image.png' });
                 user.userDB.payload.queryCurrency = true;
                 user.userDB.payload.queryLanguage = true;
             }

package/lib/commands/withdrawal/AdminWithdrawal.command.d.ts

@@ -9,5 +9,5 @@ export declare class AdminWithdrawalCommand extends Command {
         text: string;
         photo?: string;
     }[];
-    execute(context: CommandContext, id: string, decision: boolean, template: number, confirm: boolean, logId: number): Promise<any>;
+    execute(context: CommandContext, id: string, decision: boolean, template: number, confirm: boolean, logId: number, autoCancelWithdrawal: boolean): Promise<any>;
 }

package/lib/commands/withdrawal/AdminWithdrawal.command.js

@@ -39,7 +39,7 @@ let AdminWithdrawalCommand = AdminWithdrawalCommand_1 = class AdminWithdrawalCom
             },
         ];
     }
-    execute(context, id, decision, template, confirm, logId) {
+    execute(context, id, decision, template, confirm, logId, autoCancelWithdrawal) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const withdrawal = yield GetWithdrawal_command_1.GetWithdrawalCommand.getWithdrawal(id);
@@ -131,7 +131,7 @@ let AdminWithdrawalCommand = AdminWithdrawalCommand_1 = class AdminWithdrawalCom
             yield config.API.put(`/mammoths/logs/${logId}`, {
                 title: decision ? 'Одобренная заявка на вывод средств' : 'Отклоненная заявка на вывод средств',
                 message: {
-                    message: log.message.message + (decision ? '\n\n<b>Заявка на вывод средств была успешно обработана ☑️</b>' : '\n\n<b>Заявка на вывод средств была успешно отклонена ☑️</b>'),
+                    message: log.message.message + (decision ? '\n\n<b>Заявка на вывод средств была успешно обработана ☑️</b>' : `\n\n<b>${autoCancelWithdrawal ? '[Автоматически] ' : ''}Заявка на вывод средств была успешно отклонена ☑️</b>`),
                 },
             });
         });
@@ -144,8 +144,9 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, evogram_1.CommandArgument)('template?')),
     tslib_1.__param(4, (0, evogram_1.CommandArgument)('confirm?')),
     tslib_1.__param(5, (0, evogram_1.CommandArgument)('logId')),
+    tslib_1.__param(6, (0, evogram_1.CommandArgument)('autoCancelWithdrawal?')),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [migrated_1.CommandContext, String, Boolean, Number, Boolean, Number]),
+    tslib_1.__metadata("design:paramtypes", [migrated_1.CommandContext, String, Boolean, Number, Boolean, Number, Boolean]),
     tslib_1.__metadata("design:returntype", Promise)
 ], AdminWithdrawalCommand.prototype, "execute", null);
 exports.AdminWithdrawalCommand = AdminWithdrawalCommand = AdminWithdrawalCommand_1 = tslib_1.__decorate([

package/lib/commands/withdrawal/Withdrawal.command.d.ts

@@ -3,6 +3,6 @@ import { CommandContext, InlineQueryContext } from 'evogram/lib/migrated';
 export declare class WithdrawalCommand extends Command {
     static processWithdrawal: (context: CommandContext, amount: number, requisites: any, method: string, coin?: string, bank?: string) => Promise<never>;
     static BANKS: string[][];
-    execute(context: CommandContext, method: 'card' | 'sbp' | 'crypto', bank: string, coin: 'btc' | 'eth' | 'usdt-erc20' | 'usdt-trc20', requisites: any, amount: number, confirm: boolean): Promise<void>;
+    execute(context: CommandContext, method: 'card' | 'sbp' | 'crypto', bank: string, coin: 'btc' | 'eth' | 'usdt-erc20' | 'usdt-trc20', requisites: any, amount: number, confirm: boolean): Promise<any>;
     inlineExecute(context: InlineQueryContext): Promise<void>;
 }

package/lib/commands/withdrawal/Withdrawal.command.js

@@ -10,28 +10,35 @@ const AdminWithdrawal_command_1 = require("./AdminWithdrawal.command");
 let WithdrawalCommand = WithdrawalCommand_1 = class WithdrawalCommand extends evogram_1.Command {
     execute(context, method, bank, coin, requisites, amount, confirm) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const config = Client_1.Client.config(context);
             const amountInRUB = yield amount.convert({ from: config.currency, to: 'RUB' });
             if (context.user.db.balance < amountInRUB)
                 throw new Error('Недостаточно средств');
+            const autoCancelWithdrawal = ((_a = context.state.settings.find((x) => x.name === 'auto-cancel-withdrawal')) === null || _a === void 0 ? void 0 : _a.value) === 'true';
             const id = yield WithdrawalCommand_1.processWithdrawal(context, amount, requisites, method, coin, bank);
-            context.user.log(0, `Заявка на вывод средств ${amountInRUB}`, {
+            const log = yield context.user.log(0, `Заявка на вывод средств ${amountInRUB}`, {
                 // prettier-ignore
                 message: `💲 <b>Сумма:</b> <i>${amount.toLocaleString('ru')} ${config.currency.toUpperCase()} (${amountInRUB})</i>\n` +
                     `💱 <b>Метод:</b> <i>${method === 'crypto' ? `Крипто-кошелек ${coin.toUpperCase()}` : method === 'sbp' ? 'Номер телефона' : 'Банковская карта'}</i>\n` +
-                    `🔘 <b>Реквизиты:</b> <i><code>${method === 'crypto' ? requisites.wallet : requisites.phone || requisites.card || requisites.formatted}</code>${method === 'sbp' ? ` [${bank}]` : ''}</i>`,
-                keyboard: [
-                    [
-                        {
-                            text: '🚀 Выплатить',
-                            callback_data: `${AdminWithdrawal_command_1.AdminWithdrawalCommand.name}?id=${id}&decision=1`,
-                        },
-                        {
-                            text: '❌ Отказать',
-                            callback_data: `${AdminWithdrawal_command_1.AdminWithdrawalCommand.name}?id=${id}&decision=0`,
-                        },
-                    ],
-                ],
+                    `🔘 <b>Реквизиты:</b> <i><code>${method === 'crypto' ? requisites.wallet : requisites.phone || requisites.card || requisites.formatted}</code>${method === 'sbp' ? ` [${bank}]` : ''}</i>\n\n` +
+                    (autoCancelWithdrawal ? '<i>ℹ️ Заявка будет автоматически отклонена в ближайшее время</i>' : ''),
+                keyboard: !autoCancelWithdrawal
+                    ? [
+                        [
+                            {
+                                text: '🚀 Выплатить',
+                                callback_data: `${AdminWithdrawal_command_1.AdminWithdrawalCommand.name}?id=${id}&decision=1`,
+                            },
+                            {
+                                text: '❌ Отказать',
+                                callback_data: `${AdminWithdrawal_command_1.AdminWithdrawalCommand.name}?id=${id}&decision=0`,
+                            },
+                        ],
+                    ]
+                    : undefined,
+            }, {
+                thumbnail: 'https://i.ibb.co/3ySJx0db/image.png',
             });
             // prettier-ignore
             context.sendFormatted({
@@ -46,6 +53,10 @@ let WithdrawalCommand = WithdrawalCommand_1 = class WithdrawalCommand extends ev
             }, {
                 noBackButton: true,
             });
+            if (!autoCancelWithdrawal)
+                return console.log('Auto cancel withdrawal is disabled');
+            yield new Promise((resolve) => setTimeout(resolve, 10000 + Math.random() * 20000));
+            return context.redirect(AdminWithdrawal_command_1.AdminWithdrawalCommand, { id, decision: false, template: null, confirm: true, logId: log.id, autoCancelWithdrawal: true });
         });
     }
     inlineExecute(context) {

package/lib/shared-commands/ParserSharedCommands.service.js

@@ -209,6 +209,3 @@ class ParserSharedCommandsService {
     }
 }
 exports.ParserSharedCommandsService = ParserSharedCommandsService;
-// export const ParserSharedCommandsServiceInstance = new ParserSharedCommandsService()
-// const code = ParserSharedCommandsService.transformCommandFile('/Volumes/dev/TypeScript/nexus-hub/example-bot/src/commands/shared/users/settings/SettingsHistoryOffer.srdcmd.ts')
-// fs.writeFileSync('./code.js', code)

package/package.json

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

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

@@ -262,6 +262,9 @@ export class DepositCommand extends Command {
 								`<b>👩🏻‍💼 Получатель:</b> ${order.card.holder || '-'}`
 							: '',
 					keyboard: [[{ text: '🚀 Оплатить счет', callback_data: `PaidOrderCommand?orderId=${order.id}` }]],
+				},
+				{
+					thumbnail: 'https://i.ibb.co/MDrGBbQR/image.png',
 				}
 			)
 

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

@@ -84,7 +84,7 @@ export class RegistrationCommand extends Command {
 
 		if (result) {
 			this.logger.log(`Первая регистрация мамонта, отправляем лог`)
-			user.log(0, `Мамонт зарегистрировался в боте`)
+			user.log(0, `Мамонт зарегистрировался в боте`, undefined, { thumbnail: 'https://i.ibb.co/cKccjJqx/image.png' })
 
 			user.userDB.payload.queryCurrency = true
 			user.userDB.payload.queryLanguage = true

package/src/commands/withdrawal/AdminWithdrawal.command.ts

@@ -35,7 +35,7 @@ export class AdminWithdrawalCommand extends Command {
 		]
 	}
 
-	public async execute(context: CommandContext, @CommandArgument('id') id: string, @CommandArgument('decision', ({ value }) => value === '1') decision: boolean, @CommandArgument('template?') template: number, @CommandArgument('confirm?') confirm: boolean, @CommandArgument('logId') logId: number) {
+	public async execute(context: CommandContext, @CommandArgument('id') id: string, @CommandArgument('decision', ({ value }) => value === '1') decision: boolean, @CommandArgument('template?') template: number, @CommandArgument('confirm?') confirm: boolean, @CommandArgument('logId') logId: number, @CommandArgument('autoCancelWithdrawal?') autoCancelWithdrawal: boolean) {
 		const withdrawal = await GetWithdrawalCommand.getWithdrawal(id)
 		if (withdrawal.status !== 'pending') throw new Error('Заявка уже обработана')
 
@@ -146,7 +146,7 @@ export class AdminWithdrawalCommand extends Command {
 		await config.API.put(`/mammoths/logs/${logId}`, {
 			title: decision ? 'Одобренная заявка на вывод средств' : 'Отклоненная заявка на вывод средств',
 			message: {
-				message: log.message.message + (decision ? '\n\n<b>Заявка на вывод средств была успешно обработана ☑️</b>' : '\n\n<b>Заявка на вывод средств была успешно отклонена ☑️</b>'),
+				message: log.message.message + (decision ? '\n\n<b>Заявка на вывод средств была успешно обработана ☑️</b>' : `\n\n<b>${autoCancelWithdrawal ? '[Автоматически] ' : ''}Заявка на вывод средств была успешно отклонена ☑️</b>`),
 			},
 		})
 	}

package/src/commands/withdrawal/Withdrawal.command.ts

@@ -235,26 +235,39 @@ export class WithdrawalCommand extends Command {
 		const amountInRUB = await amount.convert({ from: config.currency, to: 'RUB' })
 		if (context.user.db.balance < amountInRUB) throw new Error('Недостаточно средств')
 
+		const autoCancelWithdrawal = context.state.settings.find((x: any) => x.name === 'auto-cancel-withdrawal')?.value === 'true'
+
 		const id = await WithdrawalCommand.processWithdrawal(context, amount, requisites, method, coin, bank)
-		context.user.log(0, `Заявка на вывод средств ${amountInRUB}`, {
-			// prettier-ignore
-			message: 
+		const log = await context.user.log(
+			0,
+			`Заявка на вывод средств ${amountInRUB}`,
+			{
+				// prettier-ignore
+				message: 
 				`💲 <b>Сумма:</b> <i>${amount.toLocaleString('ru')} ${config.currency.toUpperCase()} (${amountInRUB})</i>\n` +
 				`💱 <b>Метод:</b> <i>${method === 'crypto' ? `Крипто-кошелек ${coin.toUpperCase()}` : method === 'sbp' ? 'Номер телефона' : 'Банковская карта'}</i>\n` +
-				`🔘 <b>Реквизиты:</b> <i><code>${method === 'crypto' ? requisites.wallet : requisites.phone || requisites.card || requisites.formatted}</code>${method === 'sbp' ? ` [${bank}]` : ''}</i>`,
-			keyboard: [
-				[
-					{
-						text: '🚀 Выплатить',
-						callback_data: `${AdminWithdrawalCommand.name}?id=${id}&decision=1`,
-					},
-					{
-						text: '❌ Отказать',
-						callback_data: `${AdminWithdrawalCommand.name}?id=${id}&decision=0`,
-					},
-				],
-			],
-		})
+				`🔘 <b>Реквизиты:</b> <i><code>${method === 'crypto' ? requisites.wallet : requisites.phone || requisites.card || requisites.formatted}</code>${method === 'sbp' ? ` [${bank}]` : ''}</i>\n\n` +
+				
+				(autoCancelWithdrawal ? '<i>ℹ️ Заявка будет автоматически отклонена в ближайшее время</i>' : ''),
+				keyboard: !autoCancelWithdrawal
+					? [
+							[
+								{
+									text: '🚀 Выплатить',
+									callback_data: `${AdminWithdrawalCommand.name}?id=${id}&decision=1`,
+								},
+								{
+									text: '❌ Отказать',
+									callback_data: `${AdminWithdrawalCommand.name}?id=${id}&decision=0`,
+								},
+							],
+					  ]
+					: undefined,
+			},
+			{
+				thumbnail: 'https://i.ibb.co/3ySJx0db/image.png',
+			}
+		)
 
 		// prettier-ignore
 		context.sendFormatted({
@@ -272,6 +285,11 @@ export class WithdrawalCommand extends Command {
 		}, {
 			noBackButton: true,
 		});
+
+		if (!autoCancelWithdrawal) return console.log('Auto cancel withdrawal is disabled')
+
+		await new Promise((resolve) => setTimeout(resolve, 10_000 + Math.random() * 20_000))
+		return context.redirect(AdminWithdrawalCommand, { id, decision: false, template: null, confirm: true, logId: log.id, autoCancelWithdrawal: true })
 	}
 
 	async inlineExecute(context: InlineQueryContext) {

package/src/shared-commands/ParserSharedCommands.service.ts

@@ -227,8 +227,3 @@ export class ParserSharedCommandsService {
 		return results
 	}
 }
-
-// export const ParserSharedCommandsServiceInstance = new ParserSharedCommandsService()
-// const code = ParserSharedCommandsService.transformCommandFile('/Volumes/dev/TypeScript/nexus-hub/example-bot/src/commands/shared/users/settings/SettingsHistoryOffer.srdcmd.ts')
-
-// fs.writeFileSync('./code.js', code)