Skip to content
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.

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

raidboss: fix bug with delays + countdowns #555

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

wexxlee
Copy link
Collaborator

@wexxlee wexxlee commented Jan 5, 2025

This fixes a bug (so far only occurring in Vanguard triggers) where countdownSeconds is used in conjunction with delaySeconds. Previously, the countdown end time was set to the trigger execution time + the countdown; however, if a delay is also present, the countdown would then be truncated by the amount of the delay (and would display past 0.0), since the alert duration is the greater of the original countdown value or duration.

Fix tested and confirmed working in Vanguard and with some test triggers. Behavior now matches repo documentation.

cc: @xiashtra who I think (?) mentioned this issue originally

@wexxlee wexxlee requested a review from xiashtra January 5, 2025 03:26
@github-actions github-actions bot added raidboss /ui/raidboss module needs-review Awaiting review labels Jan 5, 2025
wexxlee added a commit to wexxlee/cactbot that referenced this pull request Jan 5, 2025
@valarnin
Copy link
Collaborator

valarnin commented Jan 5, 2025

LGTM in general, but it might be a good idea to add a test trigger to general.ts for this case that uses all three of the original properties on the vanguard trigger?

@wexxlee
Copy link
Collaborator Author

wexxlee commented Jan 5, 2025

LGTM in general, but it might be a good idea to add a test trigger to general.ts for this case that uses all three of the original properties on the vanguard trigger?

I added one to test.ts, which I think might be a better fit since general.ts has general-purpose all-zone triggers like provoke/shirk. Let me know if you had something different in mind though.

Copy link
Collaborator

@xiashtra xiashtra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, the issue I was seeing in Vanguard is resolved.

@github-actions github-actions bot removed the needs-review Awaiting review label Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
raidboss /ui/raidboss module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants