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(userstatus): CALL status should overwrite MEETING status #42896

Merged
merged 2 commits into from
Jan 25, 2024

Conversation

miaulalala
Copy link
Contributor

@miaulalala miaulalala commented Jan 17, 2024

Summary

When a meeting status is set, the call status will not be written if a backup exists. The code now shortcuts this single scenario and overwrites the existing status "In a meeting" with the "In a call" status irregardless of a backup status, since both are automated status and will revert to the backup after their respective automation has run.

This also fixes the issue of having a call while "in a meeting" is set, leaving the call, and the meeting status not coming back after.

Checklist

@miaulalala
Copy link
Contributor Author

/backport to stable28

Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala miaulalala force-pushed the fix/42451/revert-in-a-meeting-status branch from c871ddf to e1b957e Compare January 24, 2024 17:24
@nickvergessen nickvergessen mentioned this pull request Jan 25, 2024
… at all

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member

/backport! to stable28

@ChristophWurst ChristophWurst merged commit 723b9f4 into master Jan 25, 2024
53 checks passed
@ChristophWurst ChristophWurst deleted the fix/42451/revert-in-a-meeting-status branch January 25, 2024 11:25
Copy link

backportbot bot commented Jan 25, 2024

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

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

# Create the new backport branch
git checkout -b backport/42896/stable28

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

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/42896/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nickvergessen
Copy link
Member

Already done in #43107

@blizzz blizzz mentioned this pull request Mar 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: userstatus - "In a call" should take precedence over "In a meeting"
3 participants