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

Prevent a sync request from removing a user's busy presence status #12213

Merged
merged 21 commits into from
Apr 13, 2022
Merged

Prevent a sync request from removing a user's busy presence status #12213

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dce7bf8
Prevent a sync request from removing a user's busy presence status
dbkr Mar 11, 2022
e029284
I guessed wrong
dbkr Mar 11, 2022
68dfb7e
Add new arg to docstring
dbkr Apr 5, 2022
0fb0e4d
Remove ignore_status_msg from _serialize_payload too
dbkr Apr 5, 2022
9beae07
Set presence in worker user_syncing
dbkr Apr 6, 2022
5863b7a
Merge remote-tracking branch 'origin/develop' into dbkr/sync_dont_cle…
dbkr Apr 6, 2022
25d46be
Merge branch 'develop' into dbkr/sync_dont_clear_busy_presence
dbkr Apr 6, 2022
9098c9d
Await on set_state
dbkr Apr 6, 2022
53d2fa4
Remove redundant check
dbkr Apr 6, 2022
b2a44ac
Put ignore_status_msg back and use it in the worker user_syncing method
dbkr Apr 6, 2022
920fddf
Make non-worker behaviour match old behaviour
dbkr Apr 6, 2022
f5119b4
Use ste_state in both places so behaviour is consistent
dbkr Apr 8, 2022
2d2f774
Forgot to get the state member
dbkr Apr 8, 2022
e7093fa
Rearrange to hopefully be easier to understand
dbkr Apr 11, 2022
0a7b3f8
Take a copy of the previous state before we start messing with it
dbkr Apr 11, 2022
bd932fc
Update prev_state using the proper function
dbkr Apr 13, 2022
6d6b88e
Add comment
dbkr Apr 13, 2022
e50a0a1
Revert presence_state setting
dbkr Apr 13, 2022
edcdfed
Revert unnecessary comma change
dbkr Apr 13, 2022
31d3060
Add comment on set_state's updating of last_active_ts
dbkr Apr 13, 2022
9e8ef0f
Put comment in the right place
dbkr Apr 13, 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
Prev Previous commit
Next Next commit
Revert unnecessary comma change 
Co-authored-by: Sean Quah <[email protected]>
  • Loading branch information
@dbkr @squahtx
dbkr and squahtx authored Apr 13, 2022
commit edcdfed378f14103b003e1e6907ae7f8f777a2d3
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 @@ -1022,7 +1022,7 @@ async def user_syncing(
await self._update_states(
[
prev_state.copy_and_replace(
last_user_sync_ts=self.clock.time_msec(),
last_user_sync_ts=self.clock.time_msec()
)
]
)
Expand Down