Skip to content

fix: ensure next_fire in TimeTrigger returns proper next time #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 30, 2023
Merged

fix: ensure next_fire in TimeTrigger returns proper next time #1575

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9adb811
fix: ensure time trigger target is greater than last call time
AstreaTSS Nov 28, 2023
0122374
refactor: adjust fix to be more "proper"
AstreaTSS Nov 28, 2023
f2df434
docs: document the weird fix
AstreaTSS Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion interactions/models/internal/tasks/triggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ def next_fire(self) -> datetime | None:
)
if target.tzinfo == timezone.utc:
target = target.astimezone(now.tzinfo)
target = target.replace(tzinfo=None)
# target can fall behind or go forward a day, but all we need is the time itself
# to be converted
# to ensure it's on the same day as "now" and not break the next if statement,
# we can just replace the date with now's date
target = target.replace(year=now.year, month=now.month, day=now.day, tzinfo=None)

if target <= self.last_call_time:
target += timedelta(days=1)
Expand Down