fix: player treshold setting (#834)

tf2pickup-org · Feb 9, 2021 · ce92507 · ce92507
1 parent 330e399
commit ce92507
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/discord/services/queue-prompts.service.spec.ts b/src/discord/services/queue-prompts.service.spec.ts
@@ -166,7 +166,7 @@ describe('QueuePromptsService', () => {
 
     describe('when slots change again', () => {
       beforeEach(async () => {
-        events.queueSlotsChange.next({ slots: [
+        queueService.slots = [
           { id: 0, gameClass: Tf2ClassName.scout, playerId: players[0].id, ready: false },
           { id: 1, gameClass: Tf2ClassName.scout, playerId: null, ready: false },
           { id: 2, gameClass: Tf2ClassName.scout, playerId: null, ready: false },
@@ -179,8 +179,8 @@ describe('QueuePromptsService', () => {
           { id: 9, gameClass: Tf2ClassName.demoman, playerId: null, ready: false },
           { id: 10, gameClass: Tf2ClassName.medic, playerId: null, ready: false },
           { id: 11, gameClass: Tf2ClassName.medic, playerId: null, ready: false },
-        ]});
-
+        ];
+        events.queueSlotsChange.next({ slots: queueService.slots });
         await new Promise(resolve => setTimeout(resolve, 100));
       });
 

diff --git a/src/discord/services/queue-prompts.service.ts b/src/discord/services/queue-prompts.service.ts
@@ -14,7 +14,7 @@ import { DiscordService } from './discord.service';
 @Injectable()
 export class QueuePromptsService implements OnModuleInit {
 
-  private readonly playerThreshold = this.queueService.requiredPlayerCount * promptPlayerThresholdRatio;
+  private requiredPlayerCount = 0;
   private message?: Message;
 
   constructor(
@@ -24,15 +24,14 @@ export class QueuePromptsService implements OnModuleInit {
     private queueService: QueueService,
     private playersService: PlayersService,
     private queueConfigService: QueueConfigService,
-  ) {
-    console.log(this.playerThreshold);
-  }
+  ) { }
 
   onModuleInit() {
-    this.events.queueSlotsChange.subscribe(({ slots }) => this.refreshPrompt(slots));
+    this.events.queueSlotsChange.subscribe(() => this.refreshPrompt(this.queueService.slots));
   }
 
   private async refreshPrompt(slots: QueueSlot[]) {
+    this.requiredPlayerCount = slots.length;
     const clientName = new URL(this.environment.clientUrl).hostname;
 
     const embed = queuePreview({
@@ -69,7 +68,9 @@ export class QueuePromptsService implements OnModuleInit {
   }
 
   private playerThresholdMet() {
-    return this.queueService.playerCount >= this.playerThreshold;
+    console.log(this.queueService.playerCount);
+    console.log(this.requiredPlayerCount * promptPlayerThresholdRatio);
+    return this.queueService.playerCount >= (this.requiredPlayerCount * promptPlayerThresholdRatio);
   }
 
   @Cron(CronExpression.EVERY_5_MINUTES)