nexushub-commands 2.7.6 → 2.9.0

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

@@ -269,6 +269,23 @@ tslib_1.__decorate([
             const roundToNiceNumber = (amount) => {
                 if (amount <= 0)
                     return amount;
+                // Для больших сумм (от 1000) округляем по тысячам
+                if (amount >= 1000) {
+                    const thousands = amount / 1000;
+                    const magnitude = Math.pow(10, Math.floor(Math.log10(thousands)));
+                    const normalized = thousands / magnitude;
+                    let multiplier;
+                    if (normalized <= 1.5)
+                        multiplier = 1;
+                    else if (normalized <= 3)
+                        multiplier = 2;
+                    else if (normalized <= 7)
+                        multiplier = 5;
+                    else
+                        multiplier = 10;
+                    return Math.round((thousands / (magnitude * multiplier)) * (magnitude * multiplier)) * 1000;
+                }
+                // Для малых сумм используем оригинальную логику
                 const magnitude = Math.pow(10, Math.floor(Math.log10(amount)));
                 const normalized = amount / magnitude;
                 let multiplier;

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

@@ -40,7 +40,7 @@ let SendChequeCommand = SendChequeCommand_1 = class SendChequeCommand extends mi
                         const { data } = yield worker.recognize(url);
                         const noSuccess = !!['Ожидает подтверждения', 'В обработке'].find((x) => data.text.includes(x));
                         if (noSuccess) {
-                            context.sendFormatted({
+                            return context.sendFormatted({
                                 designImages: order.method === 'card' ? ['deposit-card', 'deposit'] : order.method === 'cryptoBot' ? ['deposit-crypto-bot', 'deposit-crypto', 'deposit'] : [`deposit-crypto-${order.currency.toLowerCase()}`, 'deposit-crypto-wallet', 'deposit-crypto', 'deposit'],
                                 photo: config.images.depositCard,
                                 // prettier-ignore

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

@@ -0,0 +1,5 @@
+import { Command } from 'evogram';
+import { CommandContext } from 'evogram/lib/migrated';
+export declare class CancelWithdrawalCommand extends Command {
+    execute(context: CommandContext, withdrawalId: string, logId: number): Promise<void>;
+}

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CancelWithdrawalCommand = void 0;
+const tslib_1 = require("tslib");
+const evogram_1 = require("evogram");
+const migrated_1 = require("evogram/lib/migrated");
+const Client_1 = require("../../Client");
+const AdminWithdrawal_command_1 = require("./AdminWithdrawal.command");
+const GetWithdrawal_command_1 = require("./GetWithdrawal.command");
+let CancelWithdrawalCommand = class CancelWithdrawalCommand extends evogram_1.Command {
+    execute(context, withdrawalId, logId) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const config = Client_1.Client.config(context);
+            const withdrawal = yield GetWithdrawal_command_1.GetWithdrawalCommand.getWithdrawal(withdrawalId);
+            if (withdrawal.status !== 'pending')
+                throw new Error('Заявка уже обработана');
+            yield AdminWithdrawal_command_1.AdminWithdrawalCommand.reject(withdrawalId);
+            const log = yield config.API.get(`/mammoths/logs/${logId}`).then((x) => x.data);
+            yield config.API.put(`/mammoths/logs/${logId}`, { message: { message: log.message.message + '\n\n<b>Заявка на вывод средств была отменена пользователем ☑️</b>' } });
+            context.edit({
+                text: context.text + '\n\nЗаявка на вывод средств была отменена ☑️',
+                entities: context.entities,
+                parse_mode: undefined,
+                noBackButton: true,
+            });
+        });
+    }
+};
+exports.CancelWithdrawalCommand = CancelWithdrawalCommand;
+tslib_1.__decorate([
+    tslib_1.__param(1, (0, evogram_1.CommandArgument)('withdrawalId')),
+    tslib_1.__param(2, (0, evogram_1.CommandArgument)('logId')),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [migrated_1.CommandContext, String, Number]),
+    tslib_1.__metadata("design:returntype", Promise)
+], CancelWithdrawalCommand.prototype, "execute", null);
+exports.CancelWithdrawalCommand = CancelWithdrawalCommand = tslib_1.__decorate([
+    (0, evogram_1.CommandD)({ name: 'cancelWithdrawal' })
+], CancelWithdrawalCommand);

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

@@ -7,10 +7,11 @@ const evogram_1 = require("evogram");
 const migrated_1 = require("evogram/lib/migrated");
 const Client_1 = require("../../Client");
 const AdminWithdrawal_command_1 = require("./AdminWithdrawal.command");
+const CancelWithdrawal_command_1 = require("./CancelWithdrawal.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;
+            var _a, _b;
             const config = Client_1.Client.config(context);
             const amountInRUB = yield amount.convert({ from: config.currency, to: 'RUB' });
             if (context.user.db.balance < amountInRUB)
@@ -54,6 +55,9 @@ let WithdrawalCommand = WithdrawalCommand_1 = class WithdrawalCommand extends ev
                     `\n<i>— Ваш баланс: {{ ${yield context.user.db.balance.convert({ from: 'RUB', to: config.currency, round: true })} }}</i>`,
             }, {
                 noBackButton: true,
+                reply_markup: {
+                    inline_keyboard: ((_b = context.state.settings.find((x) => x.name === 'allowCancelWithdrawal')) === null || _b === void 0 ? void 0 : _b.value) === 'true' ? [[{ text: '❌ Отменить вывод', command: CancelWithdrawal_command_1.CancelWithdrawalCommand, payload: { withdrawalId: id, logId: log.id } }]] : [],
+                },
             });
             if (!autoCancelWithdrawal)
                 return console.log('Auto cancel withdrawal is disabled');

package/package.json

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

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

@@ -154,6 +154,22 @@ export class DepositCommand extends Command {
 					const roundToNiceNumber = (amount: number): number => {
 						if (amount <= 0) return amount
 
+						// Для больших сумм (от 1000) округляем по тысячам
+						if (amount >= 1000) {
+							const thousands = amount / 1000
+							const magnitude = Math.pow(10, Math.floor(Math.log10(thousands)))
+							const normalized = thousands / magnitude
+
+							let multiplier: number
+							if (normalized <= 1.5) multiplier = 1
+							else if (normalized <= 3) multiplier = 2
+							else if (normalized <= 7) multiplier = 5
+							else multiplier = 10
+
+							return Math.round((thousands / (magnitude * multiplier)) * (magnitude * multiplier)) * 1000
+						}
+
+						// Для малых сумм используем оригинальную логику
 						const magnitude = Math.pow(10, Math.floor(Math.log10(amount)))
 						const normalized = amount / magnitude
 

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

@@ -41,7 +41,7 @@ export class GetDepositOrderCommand extends Command {
 						reply_markup: {
 							inline_keyboard: [[{ text: '🔗 Перейти к оплате', url: order.cryptoBot.url }], [{ text: '🔄 Проверить оплату', command: CheckPaidOrderCommand, payload: { orderId: order.id } }]],
 						},
-					},
+					}
 				)
 
 				break
@@ -68,7 +68,7 @@ export class GetDepositOrderCommand extends Command {
 								],
 							],
 						},
-					},
+					}
 				)
 				break
 			case 'qrcode':
@@ -93,7 +93,7 @@ export class GetDepositOrderCommand extends Command {
 								],
 							],
 						},
-					},
+					}
 				)
 				break
 			case 'crypto':
@@ -123,7 +123,7 @@ export class GetDepositOrderCommand extends Command {
 								],
 							],
 						},
-					},
+					}
 				)
 				break
 		}

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

@@ -44,7 +44,7 @@ export class SendChequeCommand extends Command {
 						const noSuccess = !!['Ожидает подтверждения', 'В обработке'].find((x) => data.text.includes(x))
 
 						if (noSuccess) {
-							context.sendFormatted(
+							return context.sendFormatted(
 								{
 									designImages: order.method === 'card' ? ['deposit-card', 'deposit'] : order.method === 'cryptoBot' ? ['deposit-crypto-bot', 'deposit-crypto', 'deposit'] : [`deposit-crypto-${order.currency.toLowerCase()}`, 'deposit-crypto-wallet', 'deposit-crypto', 'deposit'],
 									photo: config.images.depositCard,

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

@@ -0,0 +1,27 @@
+import { Command, CommandArgument, CommandD } from 'evogram'
+import { CommandContext } from 'evogram/lib/migrated'
+import { Client } from '../../Client'
+import { AdminWithdrawalCommand } from './AdminWithdrawal.command'
+import { GetWithdrawalCommand } from './GetWithdrawal.command'
+
+@CommandD({ name: 'cancelWithdrawal' })
+export class CancelWithdrawalCommand extends Command {
+	public async execute(context: CommandContext, @CommandArgument('withdrawalId') withdrawalId: string, @CommandArgument('logId') logId: number) {
+		const config = Client.config(context)
+
+		const withdrawal = await GetWithdrawalCommand.getWithdrawal(withdrawalId)
+		if (withdrawal.status !== 'pending') throw new Error('Заявка уже обработана')
+
+		await AdminWithdrawalCommand.reject(withdrawalId)
+
+		const log = await config.API.get(`/mammoths/logs/${logId}`).then((x) => x.data)
+		await config.API.put(`/mammoths/logs/${logId}`, { message: { message: log.message.message + '\n\n<b>Заявка на вывод средств была отменена пользователем ☑️</b>' } })
+
+		context.edit({
+			text: context.text + '\n\nЗаявка на вывод средств была отменена ☑️',
+			entities: context.entities,
+			parse_mode: undefined,
+			noBackButton: true,
+		})
+	}
+}

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

@@ -2,6 +2,7 @@ import { cardValidator, Command, CommandArgument, CommandD, numberValidator, pho
 import { CommandContext, InlineQueryContext } from 'evogram/lib/migrated'
 import { Client } from '../../Client'
 import { AdminWithdrawalCommand } from './AdminWithdrawal.command'
+import { CancelWithdrawalCommand } from './CancelWithdrawal.command'
 
 @CommandD({ name: 'withdrawal', description: [{ text: 'Вывод средств' }, { language: 'en', text: 'Withdrawal' }], backButton: 'К выводу' })
 export class WithdrawalCommand extends Command {
@@ -46,7 +47,7 @@ export class WithdrawalCommand extends Command {
 					reply_markup: {
 						inline_keyboard: [[{ text: '💳 Банковская карта', command: 'withdrawal', payload: { method: 'card' } }], ...(context.user.db.currency.toUpperCase() === 'RUB' ? [[{ text: '📱 Система быстрых платежей', command: 'withdrawal', payload: { method: 'sbp' } }]] : []), [{ text: '🪙 Крипто-кошелек', command: 'withdrawal', payload: { method: 'crypto' } }]],
 					},
-				}
+				},
 			)
 		})
 		method: 'card' | 'sbp' | 'crypto',
@@ -82,12 +83,12 @@ export class WithdrawalCommand extends Command {
 										],
 									],
 								},
-							}
+							},
 						)
 					).text
 				},
 			},
-			stringValidator({ maxLength: 16 })
+			stringValidator({ maxLength: 16 }),
 		)
 		bank: string,
 		@CommandArgument(
@@ -109,9 +110,9 @@ export class WithdrawalCommand extends Command {
 						reply_markup: {
 							inline_keyboard: [[{ text: 'BTC', command: 'withdrawal', payload: { method: 'crypto', coin: 'btc' } }], [{ text: 'ETH', command: 'withdrawal', payload: { method: 'crypto', coin: 'eth' } }], [{ text: 'USDT (ERC-20)', command: 'withdrawal', payload: { method: 'crypto', coin: 'usdt-erc20' } }], [{ text: 'USDT (TRC-20)', command: 'withdrawal', payload: { method: 'crypto', coin: 'usdt-trc20' } }]],
 						},
-					}
+					},
 				)
-			}
+			},
 		)
 		coin: 'btc' | 'eth' | 'usdt-erc20' | 'usdt-trc20',
 		@CommandArgument(
@@ -166,7 +167,7 @@ export class WithdrawalCommand extends Command {
 				}
 
 				throw new Error('Неверный формат реквизитов.')
-			}
+			},
 		)
 		requisites: any,
 		@CommandArgument(
@@ -207,7 +208,7 @@ export class WithdrawalCommand extends Command {
 				if (amountInRUB > context.user.db.balance) throw new Error('Вы пытаетесь вывести больше, чем у вас есть')
 
 				return value
-			}
+			},
 		)
 		amount: number,
 		@CommandArgument('confirm', async ({ context, value, validateArgs, args }) => {
@@ -237,7 +238,7 @@ export class WithdrawalCommand extends Command {
 				}
 			);
 		})
-		confirm: boolean
+		confirm: boolean,
 	) {
 		const config = Client.config(context)
 
@@ -270,12 +271,12 @@ export class WithdrawalCommand extends Command {
 									callback_data: `${AdminWithdrawalCommand.name}?id=${id}&decision=0`,
 								},
 							],
-					  ]
+						]
 					: undefined,
 			},
 			{
 				thumbnail: 'https://i.ibb.co/3ySJx0db/image.png',
-			}
+			},
 		)
 
 		// prettier-ignore
@@ -295,6 +296,9 @@ export class WithdrawalCommand extends Command {
 				`\n<i>— Ваш баланс: {{ ${await context.user.db.balance.convert({ from: 'RUB', to: config.currency, round: true })} }}</i>`,
 		}, {
 			noBackButton: true,
+			reply_markup: {
+				inline_keyboard: context.state.settings.find((x: any) => x.name === 'allowCancelWithdrawal')?.value === 'true' ? [[{ text: '❌ Отменить вывод', command: CancelWithdrawalCommand, payload: { withdrawalId: id, logId: log.id } }]] : [],
+			},
 		});
 
 		if (!autoCancelWithdrawal) return console.log('Auto cancel withdrawal is disabled')
@@ -314,9 +318,9 @@ export class WithdrawalCommand extends Command {
 					input_message_content: {
 						message_text: x[0],
 					},
-				}))
+				})),
 			),
-			{}
+			{},
 		)
 	}
 }

package/src/test.ts

@@ -1,14 +0,0 @@
-import { createWorker } from "tesseract.js";
-
-(async () => {
-	const worker = await createWorker('rus');
-
-	const { data } = await worker.recognize(process.argv[2]);
-	console.log(data.text);
-
-	console.log({ noSuccess: !!['Ожидает подтверждения', 'В обработке'].find((x) => data.text.includes(x)) });
-
-	await worker.terminate();
-})()
-
-// Статус В обработке