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

fix(user_status): Fix the user status automation on the day availablity rules are adjusted #36852

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Feb 24, 2023

Summary

I was trying to work towards #29339 but the availability I configured did not kick in and set myself to DND

So after lengthy debugging it turns out we need to do some shenanigans to fix the automation on the day the rules were adjusted
Otherwise the $originalStart would match rules for Thursdays on a Friday, etc. So we simply wind back a week and then fastForward to the next occurrence since today's midnight, which then also accounts for the week days.

Checklist

@nickvergessen nickvergessen added this to the Nextcloud 26 milestone Feb 24, 2023
@nickvergessen nickvergessen self-assigned this Feb 24, 2023
@nickvergessen nickvergessen requested review from ArtificialOwl, icewind1991 and blizzz and removed request for a team February 24, 2023 14:29
@nickvergessen
Copy link
Member Author

/backport to stable25

@@ -92,7 +92,7 @@
$isCurrentlyAvailable = false;
$nextPotentialToggles = [];

$now = new \DateTime('now');
$now = $this->time->getDateTime();

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OCP\AppFramework\Utility\ITimeFactory::getDateTime has been marked as deprecated
Copy link
Contributor

@miaulalala miaulalala left a comment

Choose a reason for hiding this comment

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

LGTM

…ity rules are adjusted

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/noid/fix-user-status-automation-on-the-day-rules-are-adjusted branch from 2e431a0 to c7400fa Compare March 13, 2023 10:41
@nickvergessen nickvergessen requested a review from tcitworld March 13, 2023 10:43
@nickvergessen nickvergessen enabled auto-merge March 13, 2023 10:55
@nickvergessen
Copy link
Member Author

/backport to stable26

@nickvergessen nickvergessen merged commit 4b79e75 into master Mar 13, 2023
@nickvergessen nickvergessen deleted the bugfix/noid/fix-user-status-automation-on-the-day-rules-are-adjusted branch March 13, 2023 14:30
@nickvergessen
Copy link
Member Author

/backport to stable26

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@nickvergessen
Copy link
Member Author

/backport to stable26

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants