From 15d7e7e8aefbd4569b5f9ee5df2f65fe34b2f20a Mon Sep 17 00:00:00 2001 From: wlinator Date: Wed, 21 Jun 2023 05:04:31 -0400 Subject: [PATCH] Fix bug in daily reset time #2 Dailies could not be claimed before the reset time if you've never claimed a daily before. --- data/Dailies.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/Dailies.py b/data/Dailies.py index 8c14813..bfd1dc3 100644 --- a/data/Dailies.py +++ b/data/Dailies.py @@ -22,7 +22,8 @@ class Dailies: self.claimed_at = datetime.fromisoformat(data[0]) else: # set date as yesterday to pretend as a valid claimed_at. - self.claimed_at = datetime.now(tz=self.tz) - timedelta(days=1) + self.claimed_at = datetime.now(tz=self.tz) - timedelta(days=2) + print(self.claimed_at) self.streak = int(data[1]) @@ -53,7 +54,10 @@ class Dailies: time_now = datetime.now(tz=self.tz) reset_time = time_now.replace(hour=7, minute=0, second=0, microsecond=0) - if self.claimed_at < reset_time < time_now: + if time_now < reset_time: + reset_time -= timedelta(days=1) + + if self.claimed_at < reset_time <= time_now: return True return False