From 0b28aff726404320d434e5fade31e0bcfc5557f0 Mon Sep 17 00:00:00 2001
From: Kirill Ivlev <kirill@ngweb.io>
Date: Fri, 15 Nov 2024 11:46:07 +0400
Subject: [PATCH] bugfixes

---
 src/game/comand-handlers/select-target-player.handler.ts | 7 +++++--
 src/game/commands/select-target-player.command.ts        | 2 +-
 src/game/entities/cards.entities.ts                      | 6 ++----
 src/voice/voice.controller.ts                            | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/comand-handlers/select-target-player.handler.ts b/src/game/comand-handlers/select-target-player.handler.ts
index 6e92112..cc03a48 100644
--- a/src/game/comand-handlers/select-target-player.handler.ts
+++ b/src/game/comand-handlers/select-target-player.handler.ts
@@ -18,18 +18,21 @@ export class SelectTargetPlayerHandler implements ICommandHandler<SelectTargetPl
   }
   async execute(command: SelectTargetPlayerCommand): Promise<any> {
     this.logger.verbose('enter');
-    //const user = await this.guestService.findById(command.player);
-    const allUsers = await this.guestService.findAll();
+    let allUsers = await this.guestService.findAll();
     const user = allUsers.find(x => x.telegramId === command.player);
     if(!user) {
         throw new Error(`Cant find current user ${command.player}`);
     }
+    if(!command.allowSelf) {
+     allUsers = allUsers.filter((x) => x.telegramId !== command.player);
+    }
     const buttons = allUsers.map((x) => {
       return [{
         text: `${Messages.EMOJI_PLAYER} ${x.name}`,
         callback_data: `{ "card": "${command.debuffName}", "value": "${command.value}", "user": "${x.telegramId}" }`
       }]
     });
+    console.log(buttons);
 
     this.telegramService.send<MqtMessageModel,ChatMessageRequestModel>(
       { cmd: CommandsConsts.SendMessage},
diff --git a/src/game/commands/select-target-player.command.ts b/src/game/commands/select-target-player.command.ts
index 3ef7950..6e6f76d 100644
--- a/src/game/commands/select-target-player.command.ts
+++ b/src/game/commands/select-target-player.command.ts
@@ -1,4 +1,4 @@
 export class SelectTargetPlayerCommand {
-  constructor(public player,public debuffName: string, public value: string|number) {
+  constructor(public player,public debuffName: string, public value: string|number, public allowSelf = true) {
   }
 }
\ No newline at end of file
diff --git a/src/game/entities/cards.entities.ts b/src/game/entities/cards.entities.ts
index 27f2b44..7bafa9f 100644
--- a/src/game/entities/cards.entities.ts
+++ b/src/game/entities/cards.entities.ts
@@ -194,18 +194,16 @@ export class VersusCard extends GameCard {
         this.logger.verbose(`versusInProgress ${versusInProgress}`);
         if(versusInProgress) {
           this.logger.warn(`another versus in progress`);
-
           return;
         }
         const destUser = await queryBus.execute(new GetGuestQuery(r.dest))
         const sourceUser = await queryBus.execute(new GetGuestQuery(r.from));
         await commandBus.execute(new BeginVersusCommand(sourceUser.telegramId, destUser.telegramId));
     });
-    //eventBus.pipe(ofType(DebuffCardPlayedEvent)).subscribe(r => console.log(r));
   }
   async handle() {
     await this.commandBus.execute(
-      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.versus, 0)
+      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.versus, 0, false)
     )
     await this.queryBus.execute(new FilterGuestsWithPropertyQuery(null,null,null));
     this.eventBus.subscribe((data) =>{
@@ -252,7 +250,7 @@ export class BanPlayer extends GameCard {
 
   async handle() {
     await this.commandBus.execute(
-      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.bannedFor, 2)
+      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.bannedFor, 2,false)
     )
     await this.queryBus.execute(new FilterGuestsWithPropertyQuery(null,null,null));
     this.eventBus.subscribe((data) =>{
diff --git a/src/voice/voice.controller.ts b/src/voice/voice.controller.ts
index 32452a3..ce69d53 100644
--- a/src/voice/voice.controller.ts
+++ b/src/voice/voice.controller.ts
@@ -16,7 +16,6 @@ export class VoiceController {
     }, 10000);
     this.featureFlagService.getFeatureFlag(FeatureFlagsConsts.DisableVoice).then(r => {
       this.voiceEnabled = !r.state;
-      console.log(`Voice enabled: ${this.voiceEnabled}`);
     });
 
   }