File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -698,10 +698,19 @@ async def do_invite_join(
698
698
# We may want to reset the partial state info if it's from an
699
699
# old, failed partial state join.
700
700
# https://github.com/matrix-org/synapse/issues/13000
701
+
702
+ # FIXME: Ideally, we would store the full stream token here
703
+ # not just the minimum stream ID, so that we can compute an
704
+ # accurate list of device changes when un-partial-ing the
705
+ # room. The only side effect of this is that we may send
706
+ # extra unecessary device list outbound pokes through
707
+ # federation, which is harmless.
708
+ device_lists_stream_id = self .store .get_device_stream_token ().stream
709
+
701
710
await self .store .store_partial_state_room (
702
711
room_id = room_id ,
703
712
servers = ret .servers_in_room ,
704
- device_lists_stream_id = self . store . get_device_stream_token (). stream ,
713
+ device_lists_stream_id = device_lists_stream_id ,
705
714
joined_via = origin ,
706
715
)
707
716
Original file line number Diff line number Diff line change @@ -1739,7 +1739,7 @@ async def get_device_list_changes_in_rooms(
1739
1739
1740
1740
min_stream_id = await self ._get_min_device_lists_changes_in_room ()
1741
1741
1742
- # XXX: is that right?
1742
+ # Return early if there are no rows to process in device_lists_changes_in_room
1743
1743
if min_stream_id > from_token .stream :
1744
1744
return None
1745
1745
You can’t perform that action at this time.
0 commit comments