From b71246719ac85243bb5058c915d9c74b79abc678 Mon Sep 17 00:00:00 2001 From: Samuel Elliott Date: Mon, 26 Sep 2022 16:00:11 +0100 Subject: [PATCH] Don't fetch voting status for a Splatfest after it ends --- src/cli/presence-server.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cli/presence-server.ts b/src/cli/presence-server.ts index d434c20..4fafaf9 100644 --- a/src/cli/presence-server.ts +++ b/src/cli/presence-server.ts @@ -160,9 +160,11 @@ export class SplatNet3User { async getCurrentFestVotes(): Promise { await this.update('fest_vote_status', async () => { const schedules = await this.getSchedules(); - this.fest_vote_status = !schedules.currentFest ? null : this.fest_vote_status ? - await this.splatnet.getFestVotingStatusRefetch(schedules.currentFest.id) : - await this.splatnet.getFestVotingStatus(schedules.currentFest.id); + this.fest_vote_status = + !schedules.currentFest || new Date(schedules.currentFest.endTime).getTime() <= Date.now() ? null : + this.fest_vote_status?.data.fest.id === schedules.currentFest.id ? + await this.splatnet.getFestVotingStatusRefetch(schedules.currentFest.id) : + await this.splatnet.getFestVotingStatus(schedules.currentFest.id); }, this.update_interval_fest_voting_status ?? this.update_interval); return this.fest_vote_status?.data.fest ?? null;