From 45a9d8e880deec3d8ef59d7f2ef8af3a8d93fd79 Mon Sep 17 00:00:00 2001 From: Kirill Ivlev Date: Thu, 28 Nov 2024 01:31:13 +0400 Subject: [PATCH] bugfix --- src/bot/bot.update.ts | 8 ++++++-- src/bot/handlers.ts | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bot/bot.update.ts b/src/bot/bot.update.ts index 97841aa..868ed74 100644 --- a/src/bot/bot.update.ts +++ b/src/bot/bot.update.ts @@ -22,7 +22,7 @@ import { GlobalCommands } from './global-commands'; import {Inject, Logger} from "@nestjs/common"; import AppConsts from "../constants"; import {ClientProxy} from "@nestjs/microservices"; -import {catchError} from "rxjs"; +import {catchError, of} from "rxjs"; import {TGHandlers} from "./handlers"; @Update() @@ -41,9 +41,13 @@ export class BotUpdate { this.gameService.send({cmd: 'GuestInfo'}, {user: ctx.from.id}) .pipe(catchError((val) => { console.log(val); - return 'Error'; + ctx.reply('500: что-то отъебало'); + return of("Error"); }),) .subscribe(async (result) => { + if(result === "Error") { + return; + } if (result) { await ctx.reply( `🤟 Все путем, ты уже зарегистрирован, расслабься и жди указаний\r\nМожет быть`, diff --git a/src/bot/handlers.ts b/src/bot/handlers.ts index 7949586..0ca1e3d 100644 --- a/src/bot/handlers.ts +++ b/src/bot/handlers.ts @@ -12,7 +12,7 @@ export class TGHandlers { if(data) { gameService.emit({ cmd: 'ApplyDebuff'}, { ...ctx.callbackQuery, from: ctx.from.id }); await ctx.editMessageReplyMarkup(undefined); - await ctx.editMessageText(ctx.update.callback_query.data); + await ctx.editMessageText("карта выбрана"); } if(ctx.update.callback_query.message.text.indexOf('Внимание') !== -1) { const answer =ctx.update.callback_query.data;