diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2022-04-13 16:21:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 16:21:07 +0100 |
| commit | 73d8ded0b030a81e828c07bb134c08db67569e5d (patch) | |
| tree | 1373d1a516232d02457d1f0abd1611337cde7fcd /synapse/handlers/events.py | |
| parent | Fix missing sync events during historical batch imports (#12319) (diff) | |
| download | synapse-73d8ded0b030a81e828c07bb134c08db67569e5d.tar.xz | |
Prevent a sync request from removing a user's busy presence status (#12213)
In trying to use the MSC3026 busy presence status, the user's status would be set back to 'online' next time they synced. This change makes it so that syncing does not affect a user's presence status if it is currently set to 'busy': it must be removed through the presence API. The MSC defers to implementations on the behaviour of busy presence, so this ought to remain compatible with the MSC.
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index d2ccb5c5d3..e89c4df314 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -16,7 +16,7 @@ import logging import random from typing import TYPE_CHECKING, Iterable, List, Optional -from synapse.api.constants import EduTypes, EventTypes, Membership +from synapse.api.constants import EduTypes, EventTypes, Membership, PresenceState from synapse.api.errors import AuthError, SynapseError from synapse.events import EventBase from synapse.events.utils import SerializeEventConfig @@ -67,7 +67,9 @@ class EventStreamHandler: presence_handler = self.hs.get_presence_handler() context = await presence_handler.user_syncing( - auth_user_id, affect_presence=affect_presence + auth_user_id, + affect_presence=affect_presence, + presence_state=PresenceState.ONLINE, ) with context: if timeout: |