diff options
| author | Eric Eastwood <eric.eastwood@beta.gouv.fr> | 2024-06-04 12:58:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 12:58:03 -0500 |
| commit | 7d8f0ef351e99adf602b3acb67b2516a02ff6918 (patch) | |
| tree | f8fdbcd3578d0866a236e589062b80360f549a3b /synapse/handlers/pagination.py | |
| parent | Merge branch 'release-v1.109' into develop (diff) | |
| download | synapse-7d8f0ef351e99adf602b3acb67b2516a02ff6918.tar.xz | |
Use fully-qualified `PersistedEventPosition` when returning `RoomsForUser` (#17265)
Use fully-qualified `PersistedEventPosition` (`instance_name` and `stream_ordering`) when returning `RoomsForUser` to facilitate proper comparisons and `RoomStreamToken` generation. Spawning from https://github.com/element-hq/synapse/pull/17187 where we want to utilize this change
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 6617105cdb..f7447b8ba5 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -27,7 +27,6 @@ from synapse.api.constants import Direction, EventTypes, Membership from synapse.api.errors import SynapseError from synapse.api.filtering import Filter from synapse.events.utils import SerializeEventConfig -from synapse.handlers.room import ShutdownRoomParams, ShutdownRoomResponse from synapse.handlers.worker_lock import NEW_EVENT_DURING_PURGE_LOCK_NAME from synapse.logging.opentracing import trace from synapse.metrics.background_process_metrics import run_as_background_process @@ -38,6 +37,8 @@ from synapse.types import ( JsonMapping, Requester, ScheduledTask, + ShutdownRoomParams, + ShutdownRoomResponse, StreamKeyType, TaskStatus, ) |