Skip to content

fix(userstatus): Fix setting and reverting status for busy calendar - #41570

Closed
ChristophWurst wants to merge 1 commit into
masterfrom
fix/userstatus/set-revert-calendar-busy
Closed

fix(userstatus): Fix setting and reverting status for busy calendar#41570
ChristophWurst wants to merge 1 commit into
masterfrom
fix/userstatus/set-revert-calendar-busy

Conversation

@ChristophWurst

@ChristophWurst ChristophWurst commented Nov 17, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Summary

  • Remove calendar busy state from being a persistent.
  • Stop setting a status for BUSY-TENTATIVE and BUSY-UNAVAILABLE. These should not have any meaning for the status.
  • Revert calendar status as soon as the calendar no longer reports business.

How to test

  1. Ensure the test user has calendars but opening the Calendar app once
  2. Ensure the user has an email address set
  3. Have no ongoing events
  4. Set personal availability so you are current out of office
  5. Clear oc_user_status
  6. Reload the page twice

Master: user online status is Away
Here: user online status is Online

Checklist

@ChristophWurst ChristophWurst added the 2. developing Work in progress label Nov 17, 2023
@ChristophWurst ChristophWurst self-assigned this Nov 17, 2023
@ChristophWurst

ChristophWurst commented Nov 17, 2023

Copy link
Copy Markdown
Member Author

Thanks to revert, I can now

  1. Set a custom status message
  2. Go into a meeting
  3. The meeting ends
  4. My custom status returns

github-advanced-security[bot]
github-advanced-security AI found potential problems Nov 17, 2023
View reviewed changes
Comment thread apps/user_status/lib/Service/StatusService.php Fixed
Comment thread apps/user_status/lib/Service/StatusService.php Fixed
@ChristophWurst ChristophWurst mentioned this pull request Nov 17, 2023
Closed
4 of 8 tasks
nickvergessen
nickvergessen approved these changes Nov 17, 2023
View reviewed changes

@nickvergessen nickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Makes sense and fixed production

@nickvergessen nickvergessen added this to the Nextcloud 28 milestone Nov 17, 2023
@blizzz blizzz mentioned this pull request Nov 20, 2023
Merged
1 of 5 tasks
@ChristophWurst ChristophWurst removed this from the Nextcloud 28 milestone Nov 22, 2023
@blizzz blizzz added this to the Nextcloud 29 milestone Nov 23, 2023
@ChristophWurst

ChristophWurst commented Nov 24, 2023

Copy link
Copy Markdown
Member Author

Conflicts resovled

github-advanced-security[bot]
github-advanced-security AI found potential problems Nov 24, 2023
View reviewed changes
Comment thread apps/dav/lib/CalDAV/Status/Status.php

public function getMessage(): ?string {
return $this->message;
public function getMessageId(): string {

Check failure

Code scanning / Psalm

InvalidNullableReturnType

The declared return type 'string' for OCA\DAV\CalDAV\Status\Status::getMessageId is not nullable, but 'null|string' contains null
Comment thread apps/dav/lib/CalDAV/Status/Status.php
public function getMessage(): ?string {
return $this->message;
public function getMessageId(): string {
return $this->messageId;

Check failure

Code scanning / Psalm

NullableReturnStatement

The declared return type 'string' for OCA\DAV\CalDAV\Status\Status::getMessageId is not nullable, but the function returns 'null|string'
@ChristophWurst

ChristophWurst commented Nov 24, 2023

Copy link
Copy Markdown
Member Author

Tested and still works. On master I stay on Away, here my active user is Online

@ChristophWurst
ChristophWurst force-pushed the fix/userstatus/set-revert-calendar-busy branch from f3db3e6 to 7aca52e Compare November 24, 2023 08:10
@ChristophWurst
fix(userstatus): Fix setting and reverting status for busy calendar
9cc7733 
* Remove calendar busy state from being a persistent.
* Stop setting a status for BUSY-TENTATIVE and BUSY-UNAVAILABLE. These
  should not have any meaning for the status.
* Revert calendar status as soon as the calendar no longer reports
  business.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
ChristophWurst force-pushed the fix/userstatus/set-revert-calendar-busy branch from 7aca52e to 9cc7733 Compare November 24, 2023 08:11
@GretaD

GretaD commented Nov 24, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

tested and works, on master no matter how many times i change the status, when i change the app or refresh, it goes back to away, on this branch the online status is saved correctly.

@ChristophWurst

ChristophWurst commented Nov 29, 2023

Copy link
Copy Markdown
Member Author

Obsolete

@ChristophWurst
ChristophWurst deleted the fix/userstatus/set-revert-calendar-busy branch November 29, 2023 07:53
@nickvergessen
nickvergessen restored the fix/userstatus/set-revert-calendar-busy branch November 29, 2023 10:37
@nickvergessen
nickvergessen deleted the fix/userstatus/set-revert-calendar-busy branch November 29, 2023 10:37
@skjnldsv skjnldsv removed this from the Nextcloud 29 milestone Feb 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes
@GretaD GretaD GretaD approved these changes
@SebastianKrupinski SebastianKrupinski Awaiting requested review from SebastianKrupinski SebastianKrupinski will be requested when the pull request is marked ready for review SebastianKrupinski is a code owner
@tcitworld tcitworld Awaiting requested review from tcitworld tcitworld will be requested when the pull request is marked ready for review tcitworld is a code owner

Assignees

@ChristophWurst ChristophWurst

Labels

2. developing Work in progress bug feature: status

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug]: User status automation sets status to *Away* despite activity

6 participants

@ChristophWurst @GretaD @nickvergessen @github-advanced-security @blizzz @skjnldsv