Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix an invalid comparison of UserPresenceState to str #14393

Merged
merged 9 commits into from
Nov 16, 2022
Merged

Fix an invalid comparison of UserPresenceState to str #14393

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1065358
Fix an invalid comparison of UserPresenceState to str
anoadragon453 Nov 8, 2022
9eb2e4b
Changelog
anoadragon453 Nov 8, 2022
6040fb3
Use an override_config decorators instead of setting class vars
anoadragon453 Nov 8, 2022
cb895d0
Create a worker variation of test_set_presence_from_syncing_keeps_busy
anoadragon453 Nov 8, 2022
f7dd5a7
Fix an incorrectly labeled type
anoadragon453 Nov 8, 2022
30d42fa
Make the fake Redis for tests respond to PING commands
anoadragon453 Nov 14, 2022
75089de
Remove superfluous test_with_workers truthy check
anoadragon453 Nov 16, 2022
dedc990
Cleaner logic for test_with_workers; add comments/arg docstring
anoadragon453 Nov 16, 2022
4f56557
Require worker test_case only if test_with_workers is True
anoadragon453 Nov 16, 2022
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
1 change: 1 addition & 0 deletions changelog.d/14393.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in 1.58.0 where a user with presence state 'org.matrix.msc3026.busy' would mistakenly be set to 'online' when calling `/sync` or `/events` on a worker process.
2 changes: 1 addition & 1 deletion synapse/handlers/presence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ async def user_syncing(
return _NullContextManager()

prev_state = await self.current_state_for_user(user_id)
if prev_state != PresenceState.BUSY:
if prev_state.state != PresenceState.BUSY:
# We set state here but pass ignore_status_msg = True as we don't want to
# cause the status message to be cleared.
# Note that this causes last_active_ts to be incremented which is not
Expand Down