data/gifts.json

@@ -1,156 +0,0 @@
-[{
-"prizeID": 1,
-"name": "Тесто для лепки невкусное",
-"isGifted": false
-},
-{
-"prizeID": 2,
-"name": "Палочки с ароматом лучших публичных домов Бангкока",
-"isGifted": false
-},
-{
-"prizeID": 3,
-"name": "2 метра хюгге",
-"isGifted": false
-},
-{
-"prizeID": 4,
-"name": "Палку светящуюся бесполезную",
-"isGifted": false
-},
-{
-"prizeID": 5,
-"name": "Тёрку для лилипутов",
-"isGifted": false
-},
-{
-"prizeID": 6,
-"name": "Мёртвую белочку",
-"isGifted": false
-},
-{
-"prizeID": 7,
-"name": "Лучшего друга Спанч боба засушенного",
-"isGifted": false
-},
-{
-"prizeID": 8,
-"name": "Подарок для любителей помесить глину",
-"isGifted": false
-},
-{
-"prizeID": 9,
-"name": "Палку чесательную полезную",
-"isGifted": false
-},
-{
-"prizeID": 10,
-"name": "Красного петуха - своё тотемное животное",
-"isGifted": false
-},
-{
-"prizeID": 11,
-"name": "Набор свечей романтишный",
-"isGifted": false
-},
-{
-"prizeID": 12,
-"name": "Хранилище для денег патриотическое",
-"isGifted": false
-},
-{
-"prizeID": 13,
-"name": "Мерч от Каца",
-"isGifted": false
-},
-{
-"prizeID": 14,
-"name": "Чупа-чупс со вкусом патриотизма",
-"isGifted": false
-},
-{
-"prizeID": 15,
-"name": "Тренажеры для легких разноцветные",
-"isGifted": false
-},
-{
-"prizeID": 16,
-"name": "Паззл предсказуемый",
-"isGifted": false
-},
-{
-"prizeID": 17,
-"name": "Жопный блокнот",
-"isGifted": false
-},
-{
-"prizeID": 18,
-"name": "Носки от батьки праздничные",
-"isGifted": false
-},
-{
-"prizeID": 19,
-"name": "Носки женские миленькие",
-"isGifted": false
-},
-{
-"prizeID": 20,
-"name": "Набор художника-нумеролога",
-"isGifted": false
-},
-{
-"prizeID": 21,
-"name": "Карандаш вечный как Путин",
-"isGifted": false
-},
-{
-"prizeID": 22,
-"name": "Массажёр для жопы",
-"isGifted": false
-},
-{
-"prizeID": 23,
-"name": "Сладкий подарок рот в рот",
-"isGifted": false
-},
-{
-"prizeID": 24,
-"name": "Мотоцикл (ненастоящий)",
-"isGifted": false
-},
-{
-"prizeID": 25,
-"name": "Вышивку для эскортниц (алмазную)",
-"isGifted": false
-},
-{
-"prizeID": 26,
-"name": "Звенящие бубенцы",
-"isGifted": false
-},
-{
-"prizeID": 27,
-"name": "Спонж для умывания твоих кислых щей",
-"isGifted": false
-},
-{
-"prizeID": 28,
-"name": "Мочалку с портретом дракона",
-"isGifted": false
-},
-{
-"prizeID": 29,
-"name": "Тетрадь для чётких квадроберов",
-"isGifted": false
-},
-{
-"prizeID": 30,
-"name": "Костюм для руки незнакомки эротишный",
-"isGifted": false
-},
-{
-"prizeID": 31,
-"name": "Плакат с кумиром детства нарядный",
-"isGifted": false
-}
-]

data/versus.json

@@ -1,110 +0,0 @@
-[
-  {
-    "text":"угадайка",
-    "description":"Угадай кто я - по стикеру на лбу"
-  },
-  {
-    "text":"тест на устойчивость к юмору",
-    "description": "Кто первый засмеется с водой во рту"
-  },
-  {
-    "text":"лучший китаец",
-    "description": "Кто быстрее съест палочками для суши зеленый горошек или консервированную кукурузу"
-  },
-  {
-    "text": "Прыжки в длину",
-    "description": "тут надо самим угадать"
-  },
-  {
-    "text": "грузинские буквы",
-    "description": "Кто отгадает больше грузинских букв и быстрее"
-  },
-  {
-    "text": "лучший котик на тусовке",
-    "description": "кто лучше изобразит квадробера"
-  },
-  {
-    "text": "Гонки на ложках",
-    "description": "перенести шарик на ложке, зажатой в зубах, до финиша"
-  },
-  {
-    "text": "Сванская башня",
-    "description": "за 1 минуту построить башню из пластиковых стаканов"
-  },
-  {
-    "text": "Скоростное рисование",
-    "description": "нарисовать лошадь  за минуту"
-  },
-  {
-    "text": "нарисуй хуйло",
-    "description": "нарисовать путина за минуту"
-  },
-  {
-    "text": "сотрудник GWP",
-    "description": "кто точнее наполнит стакан до края"
-  },
-  {
-    "text": "Скоростная чистка овоща",
-    "description": "кто быстрее очистит картофелину"
-  },
-  {
-    "text": "Стрельба из рогатки",
-    "description": "попасть в цель мячиками"
-  },
-  {
-    "text": "Найди отличия",
-    "description": "кто быстрее найдёт отличия на двух картинках"
-  },
-  {
-    "text": "Переводка предмета без рук",
-    "description": "перенести мелкий предмет, держа его между коленями"
-  },
-  {
-    "text": "менеджер GWP",
-    "description": "перенести воду в ложке, не пролив"
-  },
-  {
-    "text": "Бой подушками",
-    "description": "пока кто-то не выронит подушку."
-  },
-  {
-    "text": "шарик",
-    "description": "кто быстрее надует воздушный шарик"
-  },
-  {
-    "text": "Камень, ножницы, бумага",
-    "description": "Сыграть три раунда и определить победителя"
-  },
-  {
-    "text": "Сложи бумажный самолетик и запусти",
-    "description": "Чей самолетик пролетит дальше"
-  },
-  {
-    "text": "Лимбо",
-    "description": "Пройти под планкой, не задев её, при каждом раунде ниже"
-  },
-  {
-    "text": "Пой без слов",
-    "description": "Напеть мелодию песни, чтобы другой отгадал"
-  },
-  {
-    "text": "Нарисуй вслепую",
-    "description": "Нарисовать предмет с закрытыми глазами"
-  },
-  {
-    "text": "Балансировка книги на голове",
-    "description": "Кто дольше продержится с книгой на голове, выполняя задания"
-  },
-  {
-    "text": "Быстрый переводчик",
-    "description": "Перевести фразы на другой язык быстрее соперника"
-  },
-  {
-    "text": "Словесный бой",
-    "description": "Назвать слова на заданную букву, пока не закончится время"
-  },
-  {
-    "text": "Бумажный самолетик на точность",
-    "description": "Запустить самолетик так, чтобы он попал в цель"
-  }
-]

src/Consts/FeatureFlags.consts.ts

@@ -2,5 +2,4 @@ export class FeatureFlagsConsts {
   static EnableEndgamePoints = 'EnableEndgamePoints';
   static DontMarkQuestionsAsCompleted = 'DontMarkQuestionsAsCompleted';
   static DisableVoice = 'DisableVoice';
-  static StartVersusIfPlayersAnsweredInSameTime = 'StartVersusIfPlayersAnsweredInSameTime';
 }

src/game/comand-handlers/proceed-game-queue-command.handler.ts

@@ -27,7 +27,7 @@ export class GameProceedGameQueueCommandHandler
       return this.cmdBus.execute(new NextQuestionCommand());
     }
     this.sharedService.notifyAllClients<IGameQueueSocketEvent>(ClientNotificationType.GameQueueItem, {
-      _id: item._id,
+      _id: item.id,
       completed: item.completed,
       target: item.target,
       type: item.type,

src/game/entities/cards.entities.ts

@@ -250,7 +250,7 @@ export class BanPlayer extends GameCard {
 
   async handle() {
     await this.commandBus.execute(
-      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.bannedFor, getRandomInt(2,3), false)
+      new SelectTargetPlayerCommand(this.telegramId, DebuffsConsts.bannedFor, 2,false)
     )
     await this.queryBus.execute(new FilterGuestsWithPropertyQuery(null,null,null));
     this.eventBus.subscribe((data) =>{
@@ -262,7 +262,7 @@ export class BanPlayer extends GameCard {
 export const gameCards: typeof GameCard[] = [
   DoubleTreasureCard,
   StolePrizeCard,
- // ShitCard,
+  ShitCard,
   LuckyCard,
   AvoidPenaltyCard,
   BanPlayer,

src/game/events/state-changed.event.ts

@@ -1,4 +0,0 @@
-export class StateChangedEvent {
-  constructor(state: string) {
-  }
-}

src/game/game.controller.ts

@@ -45,10 +45,4 @@ export class GameController {
     this.logger.warn(`[clearQueue] enter`);
     await this.gameService.clearGameQueue();
   }
-
-  @Post('simulate-valid-answer')
-  async simulateValidAnswer() {
-    this.logger.verbose(`[simulateValidAnswer] enter`);
-    return await this.gameService.simulateValidAnswer();
-  }
 }

src/game/game.service.ts

@@ -10,8 +10,6 @@ import {ConfigService} from "@nestjs/config";
 import {gameCards} from "./entities/cards.entities";
 import {IEmptyNotification} from "../Consts/types";
 import {ClientNotificationType} from "../socket/socket.gateway";
-import {GetGuestQuery} from "../guests/queries/getguest.query";
-import {ValidAnswerReceivedEvent} from "./events/valid-answer.recieved";
 
 @Injectable()
 export class GameService implements OnApplicationBootstrap{
@@ -52,26 +50,7 @@ export class GameService implements OnApplicationBootstrap{
   }
 
   async getGameQueueItem() {
-    const item = await this.gameQueueModel.aggregate([
+    return this.gameQueueModel.findOne({ completed: false }).exec();
-      {
-        $match: { completed: false }
-      },
-      {
-        $addFields: {
-          priority: {
-            $cond: [{ $eq: ["$type", "versus"] }, 1, 0]
-          }
-        }
-      },
-      {
-        $sort: { priority: -1 }
-      },
-      {
-        $limit: 1
-      }
-    ]).exec();
-    console.log(item[0]);
-    return item[0];
   }
 
   async markQueueAsCompleted(id: string| null) {
@@ -131,8 +110,4 @@ export class GameService implements OnApplicationBootstrap{
     await this.gameQueueModel.deleteMany({}).exec();
     return { result: true };
   }
-
-  async simulateValidAnswer() {
-    this.eventBus.publish(new ValidAnswerReceivedEvent(11178819, 'test', ''));
-  }
 }

src/game/versus/versus.service.ts

@@ -13,8 +13,6 @@ import {GuestPropertyNamesConsts} from "../../Consts/guest-property-names.consts
 import {SetGuestPropertyCommand} from "../../guests/command/set-guest-property.command";
 import {IVersusBeginSocketEvent, IVersusEndSocketEvent} from "../../Consts/types";
 import {ClientNotificationType} from "../../socket/socket.gateway";
-import {CreateNewQueueItemCommand} from "../commands/create-new-queue-item.command";
-import {GameQueueTypes} from "../../schemas/game-queue.schema";
 
 @Injectable()
 export class VersusService {
@@ -44,7 +42,6 @@ export class VersusService {
 
   async beginVersus(player1: number, player2: number) {
     const [p1data,p2data] = await Promise.all([this.guestService.findById(player1), this.guestService.findById(player2)]);
-    await this.cmdBus.execute(new CreateNewQueueItemCommand(player1, GameQueueTypes.versus));
     await this.sharedService.setConfig(VersusService.configKeyCurrentAction, JSON.stringify({
       action:'versus',
       data: {

src/guests/guests.service.ts

@@ -76,9 +76,6 @@ export class GuestsService {
 
   async findById(id: number) {
     const result = await this.guestModel.findOne({ telegramId: id }).exec();
-    if(!result) {
-      return null;
-    }
     delete result.photo;
     return result;
   }

src/mocks/commandbus.mock.ts

@@ -1,3 +1,3 @@
 export const CommandbusMock = {
-  execute: jest.fn(),
+
 }

src/mocks/guests-service.mock.ts

@@ -1,3 +1,3 @@
 export const  GuestsServiceMock = {
-  updatePenaltiesCount: jest.fn(),
+
 }

src/quiz/event-handlers/state-changed-event.handler.ts

@@ -1,17 +0,0 @@
-import {EventsHandler, IEventHandler} from "@nestjs/cqrs";
-import {StateChangedEvent} from "../../game/events/state-changed.event";
-import {QuizService} from "../quiz.service";
-import {Logger} from "@nestjs/common";
-
-@EventsHandler(StateChangedEvent)
-export class StateChangedEventHandler implements IEventHandler<StateChangedEvent> {
-  logger = new Logger(StateChangedEventHandler.name);
-  constructor(private quizService: QuizService) {
-  }
-
-    async handle(event: StateChangedEvent) {
-      this.logger.verbose(`[StateChangedEventHandler] enter, event: ${event}}`)
-        await this.quizService.calculateEndgamePoints();
-    }
-
-}

src/quiz/quiz.controller.ts

@@ -26,11 +26,6 @@ export class QuizController {
     return this.quizService.proceedWithGame();
   }
 
-  @Post('timeout')
-  async Timeout() {
-    return await this.quizService.questionTimeout();
-  }
-
   @Post('questions')
   async postQuestion(@Body() questionDto: QuestionDto[]) {
     return await this.quizService.populateQuestions(questionDto);

src/quiz/quiz.module.ts

@@ -12,17 +12,12 @@ import { MarkQuestionsAsUnansweredCommandHandler } from './command-handlers/mark
 import { PenaltyModule } from '../penalty/penalty.module';
 import {ConfigModule, ConfigService} from "@nestjs/config";
 import {Config, ConfigSchema} from "../schemas/config.schema";
-import {StateChangedEventHandler} from "./event-handlers/state-changed-event.handler";
 
 const cmdHandlers = [
   GameNextQuestionCommandHandler,
   MarkQuestionsAsUnansweredCommandHandler,
 ];
 
-const eventHandlers = [
-  StateChangedEventHandler
-]
-
 @Global()
 @Module({
   imports: [
@@ -38,6 +33,6 @@ const eventHandlers = [
   ],
   controllers: [QuizController],
   exports: [QuizService],
-  providers: [QuizService,ConfigService, ...cmdHandlers, ...eventHandlers],
+  providers: [QuizService,ConfigService, ...cmdHandlers],
 })
 export class QuizModule {}

src/quiz/quiz.service.spec.ts

@@ -8,27 +8,14 @@ import {GuestsService} from "../guests/guests.service";
 import {GuestsServiceMock} from "../mocks/guests-service.mock";
 import {SharedService} from "../shared/shared.service";
 import {SharedServiceMock} from "../mocks/shared-service.mock";
-import {CommandBus, EventBus, ICommand} from "@nestjs/cqrs";
+import {CommandBus, EventBus} from "@nestjs/cqrs";
 import {EventbusMock} from "../mocks/eventbus.mock";
 import {CommandbusMock} from "../mocks/commandbus.mock";
-import {FeatureflagService, IFeatureFlagStatus} from "../featureflag/featureflag.service";
+import {FeatureflagService} from "../featureflag/featureflag.service";
 import {FeatureflagServiceMock} from "../mocks/featureflag-service.mock";
-import {IncreasePlayerWinningRateCommand} from "../game/commands/increase-player-winning-rate.command";
-import {IncreasePlayerScoreCommand} from "../guests/command/increase-player-score.command";
-import {getRandomInt} from "../helpers/rand-number";
-import {CreateNewQueueItemCommand} from "../game/commands/create-new-queue-item.command";
-import {GameQueueTypes} from "../schemas/game-queue.schema";
-import {BeginVersusCommand} from "../game/commands/begin-versus.command"
-import spyOn = jest.spyOn;
-import clearAllMocks = jest.clearAllMocks;
-
-jest.mock('../../src/helpers/rand-number');
 
 describe('QuizService', () => {
   let service: QuizService;
-  let cmdBus: CommandBus;
-  let guestService: GuestsService;
-  let featureFlagService: FeatureflagService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -45,216 +32,9 @@ describe('QuizService', () => {
     }).compile();
 
     service = await module.resolve<QuizService>(QuizService);
-    cmdBus = await module.resolve<CommandBus>(CommandBus);
-    guestService = await module.resolve<GuestsService>(GuestsService);
-    featureFlagService = await module.resolve<FeatureflagService>(FeatureflagService);
   });
 
   it('should be defined', () => {
     expect(service).toBeDefined();
   });
-
-  describe('calculateScore()', () => {
-    let cmdBusExecSpy: jest.SpyInstance<Promise<unknown>, [command: ICommand], any>;
-    let getSpy;
-    const questionDocumentMock = {
-      text: 'test question',
-      answered: false,
-      valid: 'option1',
-      answers: ['option1', 'option2', 'option3', 'option4'],
-      answeredBy: 1,
-      note: '',
-      qId: 'xx-xxx-xxx',
-      userAnswers: [{
-        user: 1,
-        time: new Date(),
-        valid: false,
-      }, {
-        user: 2,
-        time: new Date(new Date().setSeconds((new Date).getSeconds() - 5)),
-        valid: false,
-      }, {
-        user: 3,
-        time: new Date(),
-        valid: true,
-      }, {
-          user: 4,
-          time: new Date(),
-          valid: false,
-      }],
-      scoreCalculated: false,
-      save: jest.fn(),
-    };
-    beforeEach(() => {
-      cmdBusExecSpy = jest.spyOn(cmdBus, 'execute').mockResolvedValue(null);
-      getSpy = jest.spyOn(service,'get').mockResolvedValue(questionDocumentMock as any);
-    });
-
-    it('should not calculate score if it is already calculated', async () => {
-      // setup
-      questionDocumentMock.scoreCalculated = true;
-
-      // act
-      await service.calculateScore();
-
-      // validate
-      expect(getSpy).toHaveBeenCalled();
-      expect(cmdBusExecSpy).not.toHaveBeenCalled();
-    })
-
-    it('should assign points to winner', async () => {
-      //setup
-      questionDocumentMock.scoreCalculated = false;
-
-      // act
-      await service.calculateScore();
-
-      // validate
-      const validUser = questionDocumentMock.userAnswers.find(user => user.valid)
-      expect(cmdBusExecSpy).toHaveBeenNthCalledWith(1,new IncreasePlayerWinningRateCommand(validUser.user, expect.anything()));
-      expect(cmdBusExecSpy).toHaveBeenNthCalledWith(2, new IncreasePlayerScoreCommand(validUser.user, 1));
-      expect(cmdBusExecSpy).toHaveBeenNthCalledWith(4, new IncreasePlayerScoreCommand(validUser.user, 1));
-    })
-
-
-    it('should randomly add penalty to last answer if rnd > 50', async () => {
-      // setup
-      (getRandomInt as jest.Mock).mockReturnValue(65);
-      questionDocumentMock.scoreCalculated = false;
-      const whoShouldGetPenalty = questionDocumentMock.userAnswers.find(x => x.user == 2);
-
-      //act
-      await service.calculateScore();
-
-      //validate
-      expect(getRandomInt).toHaveBeenCalledWith(0,100);
-      expect(cmdBusExecSpy).toHaveBeenCalledWith(new CreateNewQueueItemCommand(whoShouldGetPenalty.user, GameQueueTypes.penalty));
-    });
-
-    it('should not add penalty to last answer if rnd  < 50', async () => {
-      // setup
-      jest.clearAllMocks();
-      (getRandomInt as jest.Mock).mockReturnValue(10);
-      questionDocumentMock.scoreCalculated = false;
-      const whoShouldGetPenalty = questionDocumentMock.userAnswers.find(x => x.user == 2);
-
-      //act
-      await service.calculateScore();
-
-      //validate
-      expect(getRandomInt).toHaveBeenCalledWith(0,100);
-      expect(cmdBusExecSpy).not.toHaveBeenCalledWith(new CreateNewQueueItemCommand(whoShouldGetPenalty.user, GameQueueTypes.penalty));
-
-    })
-
-    it('should set score calculated after calculation', async () => {
-      // setup
-      questionDocumentMock.scoreCalculated = false;
-      const saveSpy = jest.spyOn(questionDocumentMock,'save').mockResolvedValue(true);
-      // act
-      await service.calculateScore();
-
-      //validate
-      expect(saveSpy).toHaveBeenCalled();
-    });
-
-    it('should add show results in queue', async () => {
-      // setup
-      questionDocumentMock.scoreCalculated = false;
-      const cmdBusExecSpy = jest.spyOn(cmdBus, 'execute');
-      const validUser = questionDocumentMock.userAnswers.find(user => user.valid)
-      jest.spyOn(service, 'get').mockResolvedValue(questionDocumentMock as any);
-
-
-      // act
-      await service.calculateScore();
-
-      // validate
-      expect(cmdBusExecSpy).toHaveBeenCalledWith(new CreateNewQueueItemCommand(expect.anything(), GameQueueTypes.showresults));
-    });
-
-
-    it('should start versus if user replied in less than 5 seconds if ff enabled', async () => {
-      // setup
-      questionDocumentMock.scoreCalculated = false;
-      const ffstate: IFeatureFlagStatus = {
-        name: '',
-        state: true,
-      }
-      spyOn(featureFlagService,'getFeatureFlag').mockResolvedValue(ffstate);
-      questionDocumentMock.userAnswers = [{
-        user: 1,
-        time: new Date(),
-        valid: true,
-      },
-        {
-          user: 2,
-          time: new Date(),
-          valid: true,
-        }
-      ]
-      getSpy = jest.spyOn(service,'get').mockResolvedValue(questionDocumentMock as any);
-
-      // act
-      await service.calculateScore();
-
-      // validate
-      expect(cmdBusExecSpy).toHaveBeenCalledWith(new BeginVersusCommand(expect.anything(), expect.anything()));
-    });
-
-    it('should not start versus if FF is off and gap less than 5', async () => {
-      // setup
-      jest.clearAllMocks();
-      questionDocumentMock.scoreCalculated = false;
-      const ffstate: IFeatureFlagStatus = {
-        name: '',
-        state: false,
-      }
-      spyOn(featureFlagService,'getFeatureFlag').mockResolvedValue(ffstate);
-      questionDocumentMock.userAnswers = [{
-        user: 1,
-        time: new Date(),
-        valid: true,
-      },
-        {
-          user: 2,
-          time: new Date(),
-          valid: true,
-        }
-      ]
-      getSpy = jest.spyOn(service,'get').mockResolvedValue(questionDocumentMock as any);
-
-      // act
-      await service.calculateScore();
-
-      // validate
-      expect(cmdBusExecSpy).not.toHaveBeenCalledWith(new BeginVersusCommand(expect.anything(), expect.anything()));
-
-    });
-    it('should not start versus if gap more than 5 seconds', async () => {
-      // setup
-      questionDocumentMock.scoreCalculated = false;
-      questionDocumentMock.userAnswers = [{
-        user: 1,
-        time: new Date(new Date().setSeconds(new Date().getSeconds() - 5.7)),
-        valid: true,
-      },
-        {
-          user: 2,
-          time: new Date(),
-          valid: true,
-        }
-      ]
-      getSpy = jest.spyOn(service,'get').mockResolvedValue(questionDocumentMock as any);
-
-      // act
-      await service.calculateScore();
-      // validate
-      expect(cmdBusExecSpy).not.toHaveBeenCalledWith(new BeginVersusCommand(expect.anything(), expect.anything()));
-    });
-
-    it('should not start versus if only one player answered correctly', () => {
-
-    })
-  });
 });

src/quiz/quiz.service.ts

@@ -20,11 +20,12 @@ import {FeatureflagService} from "../featureflag/featureflag.service";
 import {FeatureFlagsConsts} from "../Consts/FeatureFlags.consts";
 import {QuizEndGameResults} from "./quiz.types";
 import {ClientNotificationType} from "../socket/socket.gateway";
-import {BeginVersusCommand} from "../game/commands/begin-versus.command";
 
 @Injectable({ scope: Scope.TRANSIENT })
 export class QuizService {
+  private readonly answerNumbers = Messages.answerNumbers;
   private readonly logger = new Logger(QuizService.name);
+  private AcceptAnswersFromAllMembers: boolean = true; // TODO: move this to configurable state
   constructor(
     @InjectModel(Question.name) private questionModel: Model<QuestionDocument>,
     @InjectModel(QuestionStorage.name)
@@ -60,9 +61,6 @@ export class QuizService {
     );
     // check that answer exist
     const shortAnswers = question.answers.map((answer) => answer.substring(0,50));
-    if(question.countdownFinished) {
-      return;
-    }
     const shortValidAnswer = question.valid.substring(0,50);
     if(shortAnswers.indexOf(answer) === -1) {
       this.logger.warn(`[validateAnswer] this question is not on game now`);
@@ -122,15 +120,7 @@ export class QuizService {
     return Promise.resolve(true);
   }
 
-  private checkIfWeShouldStartVersus(answers: { valid: boolean; time: number; user: number }[]) {
+  private async calculateScore() {
-    if(answers.length === 0 && answers.length <= 2) {
-      return false;
-    }
-    const diff = Math.abs(new Date(answers[0].time).getTime() - new Date(answers[1].time).getTime()) / 1000;
-    return diff <= 0.5;
-  }
-
-  async calculateScore() {
     const question = await this.get();
     if(question.scoreCalculated) {
       return;
@@ -138,6 +128,7 @@ export class QuizService {
     if(!await this.featureFlagService.getFeatureFlag(FeatureFlagsConsts.DontMarkQuestionsAsCompleted)) {
       this.logger.verbose(`[proceedWithGame]: DontMarkQuestionsAsCompleted disabled, marking as complete`);
       question.answered = true;
+
     }
     this.logger.verbose(`[calculateScore] enter `);
     const playerAnswers = question.userAnswers.map((answer) => {
@@ -151,24 +142,14 @@ export class QuizService {
     const winner = sortedAnswers.find((answer) => answer.valid);
     let targetUser = 0;
     if(winner) {
-      const totalWinningScore = getRandomInt(40,60);
+      const totalWinningScore = 80;
       sortedAnswers.filter(x => x.valid).forEach((answer) => {
         this.logger.debug(`Giving 1 point to all who answered right`);
         this.commandBus.execute(new IncreasePlayerWinningRateCommand(answer.user,
           totalWinningScore / sortedAnswers.filter((answer) => answer.valid).length));
         this.commandBus.execute(new IncreasePlayerScoreCommand(answer.user,1));
       });
-      const ffState = await this.featureFlagService.getFeatureFlag(FeatureFlagsConsts.StartVersusIfPlayersAnsweredInSameTime)
+      await this.commandBus.execute(new IncreasePlayerWinningRateCommand(sortedAnswers[0].user, 15));
-      if(ffState.state) {
-        if(this.checkIfWeShouldStartVersus(sortedAnswers.filter(x => x.valid))) {
-          await this.commandBus.execute(
-            new BeginVersusCommand(
-              sortedAnswers.filter(x => x.valid)[0].user,
-              sortedAnswers.filter(x => x.valid)[1].user,
-              ));
-        }
-      }
-      await this.commandBus.execute(new IncreasePlayerWinningRateCommand(sortedAnswers[0].user, getRandomInt(4,9)));
       this.logger.debug(`Giving 1 point to first`);
       await this.commandBus.execute(new IncreasePlayerScoreCommand(winner.user,1));
       targetUser = winner.user;
@@ -176,17 +157,13 @@ export class QuizService {
 
     const invalidAnswers = sortedAnswers.filter((answer) => !answer.valid)
     if(invalidAnswers.length > 0) {
-      //const lastInvalidAnswer = invalidAnswers[invalidAnswers.length - 1];
+      const lastInvalidAnswer = invalidAnswers[invalidAnswers.length - 1];
-      const lastInvalidAnswer = invalidAnswers.sort((a,b) => a.time - b.time)[0];
       if(!lastInvalidAnswer) {
         return;
       }
-      const random = getRandomInt(0,100);
+      targetUser = lastInvalidAnswer.user;
-      if(random > 50) {
       await this.guestService.updatePenaltiesCount(lastInvalidAnswer.user);
       await this.commandBus.execute(new CreateNewQueueItemCommand(lastInvalidAnswer.user, GameQueueTypes.penalty));
-        targetUser = lastInvalidAnswer.user;
-      }
     }
     await this.commandBus.execute(new CreateNewQueueItemCommand(targetUser, GameQueueTypes.showresults));
     question.scoreCalculated = true;
@@ -217,9 +194,6 @@ export class QuizService {
       }
     }
     await this.sharedService.setConfig('endgame-points', JSON.stringify(result));
-    await this.commandBus.execute(new IncreasePlayerScoreCommand(result.maxInvalidAnswers.id, 2));
-    await this.commandBus.execute(new IncreasePlayerScoreCommand(result.maxPenalties.id, 2));
-    await this.commandBus.execute(new IncreasePlayerScoreCommand(result.maxRewards.id, -2));
     return result;
   }
 
@@ -346,11 +320,4 @@ export class QuizService {
     const res = await this.sharedService.getConfig('endgame-points');
     return JSON.parse(res.value);
   }
-
-  async questionTimeout() {
-    const question = await this.get();
-    question.countdownFinished = true;
-    await  question.save();
-    return question;
-  }
 }

src/schemas/game-queue.schema.ts

@@ -9,7 +9,6 @@ export enum GameQueueTypes {
   screpaAnounce = 'screpa',
   showresults = 'show_results',
   extra_points = 'extra_points',
-  versus = 'versus',
 }
 
 export type GameQueueDocument = GameQueue & Document;

src/schemas/question.schema.ts

@@ -31,7 +31,5 @@ export class Question {
   userAnswers: QuestionAnswer[];
   @Prop({ default: false })
   scoreCalculated: boolean;
-  @Prop({ default: false})
-  countdownFinished: boolean;
 }
 export const QuestionSchema = SchemaFactory.createForClass(Question);

src/state/state.controller.ts

@@ -38,16 +38,16 @@ export class StateController {
     if (setStateDto.value === 'quiz') {
       this.eventBus.publish(new GameStartedEvent());
     } else if(setStateDto.value === 'onboarding') {
-      // this.telegramService.send<MqtMessageModel,any>(
+      this.telegramService.send<MqtMessageModel,any>(
-      //   { cmd: CommandsConsts.SetCommands },
+        { cmd: CommandsConsts.SetCommands },
-      //   [
+        [
-      //     { command: 'start', description: 'главное меню'},
+          { command: 'start', description: 'главное меню'},
-      //     { command: 'cards', description: 'сыграть карту'},
+          { command: 'cards', description: 'сыграть карту'},
-      //     { command: 'question', description: 'вернутся к вопросу'}
+          { command: 'question', description: 'вернутся к вопросу'}
-      //   ]
+        ]
-      // ).subscribe(() => {
+      ).subscribe(() => {
-      //   this.logger.verbose('Bot commands updated');
+        this.logger.verbose('Bot commands updated');
-      // });
+      });
     } else {
       this.logger.verbose('reset commands');
       this.telegramService.emit({ cmd: CommandsConsts.ResetCommands }, {});

src/state/state.service.ts

@@ -5,7 +5,6 @@ import { Model } from 'mongoose';
 import { EventBus } from '@nestjs/cqrs';
 import { PrepareGameEvent } from '../game/events/prepare-game.event';
 import {IStateInfo} from "../Consts/types";
-import {StateChangedEvent} from "../game/events/state-changed.event";
 
 interface StateDTO {
   name: string;
@@ -36,8 +35,6 @@ export class StateService {
     if (newValue === 'onboarding') {
       this.eventBus.publish(new PrepareGameEvent());
     }
-    this.eventBus.publish(new StateChangedEvent(newValue));
-
     const stateEntity = await this.getState(name);
     stateEntity.value = newValue;
     await stateEntity.save();

src/voice/dicts/valid-prefix.dict.ts

@@ -1,5 +1,7 @@
 export const validPrefixDict = [
-  'Все так, %user%',
+  'Да, %answer%, был правильным ответом, молодец %user%',
+  'Ура, %answer%, это верно. Забирай очко %user%',
+  'Все так, %user%, и правильный ответ это действительно %answer%',
   'Выиграл балл - к призу ближе стал',
   'Ответил верно - за это можно и выпить',
   'Уф, какой ты умненький, %user%',
@@ -31,14 +33,4 @@ export const validPrefixDict = [
   '%user%, откуда ты все знаешь? Ты случаем не эшник, а?',
   'молодец, %user%, можешь погладить пёселя',
   '%user%, у тебя такой склад ума, что хоть сторожа нанимай!',
-  'Отличный ответ, %user%!',
-  'Ты попал в самую точку, %user%!',
-  'Вот это да, %user%, ты знаешь толк!',
-  'Так держать, %user%!',
-  'Твои знания на высоте, %user%!',
-  'Умница, %user%! Всё верно.',
-  'Блестяще, %user%! Продолжай в том же духе.',
-  'Ты меня впечатлил, %user%!',
-  'Не перестаёшь удивлять, %user%!',
-  'Великолепно, %user%! Твой ответ правильный!',
 ];