This commit is contained in:
Kirill Ivlev 2024-11-15 11:46:07 +04:00
parent e2cf582b9f
commit 0b28aff726
4 changed files with 8 additions and 8 deletions

View file

@ -18,18 +18,21 @@ export class SelectTargetPlayerHandler implements ICommandHandler<SelectTargetPl
} }
async execute(command: SelectTargetPlayerCommand): Promise<any> { async execute(command: SelectTargetPlayerCommand): Promise<any> {
this.logger.verbose('enter'); this.logger.verbose('enter');
//const user = await this.guestService.findById(command.player); let allUsers = await this.guestService.findAll();
const allUsers = await this.guestService.findAll();
const user = allUsers.find(x => x.telegramId === command.player); const user = allUsers.find(x => x.telegramId === command.player);
if(!user) { if(!user) {
throw new Error(`Cant find current user ${command.player}`); 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) => { const buttons = allUsers.map((x) => {
return [{ return [{
text: `${Messages.EMOJI_PLAYER} ${x.name}`, text: `${Messages.EMOJI_PLAYER} ${x.name}`,
callback_data: `{ "card": "${command.debuffName}", "value": "${command.value}", "user": "${x.telegramId}" }` callback_data: `{ "card": "${command.debuffName}", "value": "${command.value}", "user": "${x.telegramId}" }`
}] }]
}); });
console.log(buttons);
this.telegramService.send<MqtMessageModel,ChatMessageRequestModel>( this.telegramService.send<MqtMessageModel,ChatMessageRequestModel>(
{ cmd: CommandsConsts.SendMessage}, { cmd: CommandsConsts.SendMessage},

View file

@ -1,4 +1,4 @@
export class SelectTargetPlayerCommand { 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) {
} }
} }

View file

@ -194,18 +194,16 @@ export class VersusCard extends GameCard {
this.logger.verbose(`versusInProgress ${versusInProgress}`); this.logger.verbose(`versusInProgress ${versusInProgress}`);
if(versusInProgress) { if(versusInProgress) {
this.logger.warn(`another versus in progress`); this.logger.warn(`another versus in progress`);
return; return;
} }
const destUser = await queryBus.execute(new GetGuestQuery(r.dest)) const destUser = await queryBus.execute(new GetGuestQuery(r.dest))
const sourceUser = await queryBus.execute(new GetGuestQuery(r.from)); const sourceUser = await queryBus.execute(new GetGuestQuery(r.from));
await commandBus.execute(new BeginVersusCommand(sourceUser.telegramId, destUser.telegramId)); await commandBus.execute(new BeginVersusCommand(sourceUser.telegramId, destUser.telegramId));
}); });
//eventBus.pipe(ofType(DebuffCardPlayedEvent)).subscribe(r => console.log(r));
} }
async handle() { async handle() {
await this.commandBus.execute( 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)); await this.queryBus.execute(new FilterGuestsWithPropertyQuery(null,null,null));
this.eventBus.subscribe((data) =>{ this.eventBus.subscribe((data) =>{
@ -252,7 +250,7 @@ export class BanPlayer extends GameCard {
async handle() { async handle() {
await this.commandBus.execute( 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)); await this.queryBus.execute(new FilterGuestsWithPropertyQuery(null,null,null));
this.eventBus.subscribe((data) =>{ this.eventBus.subscribe((data) =>{

View file

@ -16,7 +16,6 @@ export class VoiceController {
}, 10000); }, 10000);
this.featureFlagService.getFeatureFlag(FeatureFlagsConsts.DisableVoice).then(r => { this.featureFlagService.getFeatureFlag(FeatureFlagsConsts.DisableVoice).then(r => {
this.voiceEnabled = !r.state; this.voiceEnabled = !r.state;
console.log(`Voice enabled: ${this.voiceEnabled}`);
}); });
} }