diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index b4c4c23499..97db0388bd 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -1821,16 +1821,16 @@ class SyncHandler: # of a non lazy-loading-members sync. un_partial_stated_rooms = set() if not sync_result_builder.sync_config.filter_collection.lazy_load_members(): - un_partial_state_rooms_since = 0 + un_partial_stated_rooms_since = 0 if sync_result_builder.since_token is not None: - un_partial_state_rooms_since = ( - sync_result_builder.since_token.un_partial_state_rooms_key + un_partial_stated_rooms_since = ( + sync_result_builder.since_token.un_partial_stated_rooms_key ) un_partial_stated_rooms = ( await self.store.get_un_partial_stated_rooms_between( - un_partial_state_rooms_since, - sync_result_builder.now_token.un_partial_state_rooms_key, + un_partial_stated_rooms_since, + sync_result_builder.now_token.un_partial_stated_rooms_key, ) ) diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py index 95787c2cfd..84f844b79e 100644 --- a/synapse/storage/databases/main/relations.py +++ b/synapse/storage/databases/main/relations.py @@ -292,7 +292,7 @@ class RelationsWorkerStore(SQLBaseStore): to_device_key=0, device_list_key=0, groups_key=0, - un_partial_state_rooms_key=0, + un_partial_stated_rooms_key=0, ) return events[:limit], next_token diff --git a/synapse/streams/events.py b/synapse/streams/events.py index 7e7bd160b5..584ad1004b 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py @@ -58,7 +58,7 @@ class EventSources: push_rules_key = self.store.get_max_push_rules_stream_id() to_device_key = self.store.get_to_device_stream_token() device_list_key = self.store.get_device_stream_token() - un_partial_state_rooms_key = self.store.get_un_partial_stated_rooms_token() + un_partial_stated_rooms_key = self.store.get_un_partial_stated_rooms_token() token = StreamToken( room_key=self.sources.room.get_current_key(), @@ -71,7 +71,7 @@ class EventSources: device_list_key=device_list_key, # Groups key is unused. groups_key=0, - un_partial_state_rooms_key=un_partial_state_rooms_key, + un_partial_stated_rooms_key=un_partial_stated_rooms_key, ) return token @@ -109,6 +109,6 @@ class EventSources: to_device_key=0, device_list_key=0, groups_key=0, - un_partial_state_rooms_key=0, + un_partial_stated_rooms_key=0, ) return token diff --git a/synapse/types/__init__.py b/synapse/types/__init__.py index d378c39ec2..a45d7cf2e6 100644 --- a/synapse/types/__init__.py +++ b/synapse/types/__init__.py @@ -646,7 +646,7 @@ class StreamToken: 7. `to_device_key`: `274711` 8. `device_list_key`: `265584` 9. `groups_key`: `1` (note that this key is now unused) - 10. `un_partial_state_rooms_key`: `379` + 10. `un_partial_stated_rooms_key`: `379` You can see how many of these keys correspond to the various fields in a "/sync" response: @@ -700,7 +700,7 @@ class StreamToken: device_list_key: int # Note that the groups key is no longer used and may have bogus values. groups_key: int - un_partial_state_rooms_key: int + un_partial_stated_rooms_key: int _SEPARATOR = "_" START: ClassVar["StreamToken"] @@ -739,7 +739,7 @@ class StreamToken: # serialized so that there will not be confusion in the future # if additional tokens are added. str(self.groups_key), - str(self.un_partial_state_rooms_key), + str(self.un_partial_stated_rooms_key), ] )