Update usage

element-hq · Jun 3, 2024 · 939695d · 939695d
1 parent 4155e18
commit 939695d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
@@ -126,13 +126,7 @@ async def export_user_data(self, user_id: str, writer: "ExfiltrationWriter") ->
         # Get all rooms the user is in or has been in
         rooms = await self._store.get_rooms_for_local_user_where_membership_is(
             user_id,
-            membership_list=(
-                Membership.JOIN,
-                Membership.LEAVE,
-                Membership.BAN,
-                Membership.INVITE,
-                Membership.KNOCK,
-            ),
+            membership_list=Membership.LIST,
         )
 
         # We only try and fetch events for rooms the user has been in. If
@@ -179,7 +173,7 @@ async def export_user_data(self, user_id: str, writer: "ExfiltrationWriter") ->
             if room.membership == Membership.JOIN:
                 stream_ordering = self._store.get_room_max_stream_ordering()
             else:
-                stream_ordering = room.stream_ordering
+                stream_ordering = room.event_pos.stream
 
             from_key = RoomStreamToken(topological=0, stream=0)
             to_key = RoomStreamToken(stream=stream_ordering)

diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py
@@ -199,7 +199,7 @@ async def handle_room(event: RoomsForUser) -> None:
                     )
                 elif event.membership == Membership.LEAVE:
                     room_end_token = RoomStreamToken(
-                        stream=event.stream_ordering,
+                        stream=event.event_pos.stream,
                     )
                     deferred_room_state = run_in_background(
                         self._state_storage_controller.get_state_for_events,

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -40,7 +40,6 @@
 )
 
 import attr
-from typing_extensions import TypedDict
 
 import synapse.events.snapshot
 from synapse.api.constants import (

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
@@ -2805,7 +2805,7 @@ async def _get_room_changes_for_initial_sync(
                             continue
 
                 leave_token = now_token.copy_and_replace(
-                    StreamKeyType.ROOM, RoomStreamToken(stream=event.stream_ordering)
+                    StreamKeyType.ROOM, RoomStreamToken(stream=event.event_pos.stream)
                 )
                 room_entries.append(
                     RoomSyncResultBuilder(