Rework stream token to stop caring about groups. (#12897)
parent
d0e40dfe29
commit
e541bb9eed
|
@ -0,0 +1 @@
|
||||||
|
Remove support for the non-standard groups/communities feature from Synapse.
|
|
@ -54,7 +54,6 @@ class EventSources:
|
||||||
push_rules_key = self.store.get_max_push_rules_stream_id()
|
push_rules_key = self.store.get_max_push_rules_stream_id()
|
||||||
to_device_key = self.store.get_to_device_stream_token()
|
to_device_key = self.store.get_to_device_stream_token()
|
||||||
device_list_key = self.store.get_device_stream_token()
|
device_list_key = self.store.get_device_stream_token()
|
||||||
groups_key = self.store.get_group_stream_token()
|
|
||||||
|
|
||||||
token = StreamToken(
|
token = StreamToken(
|
||||||
room_key=self.sources.room.get_current_key(),
|
room_key=self.sources.room.get_current_key(),
|
||||||
|
@ -65,7 +64,8 @@ class EventSources:
|
||||||
push_rules_key=push_rules_key,
|
push_rules_key=push_rules_key,
|
||||||
to_device_key=to_device_key,
|
to_device_key=to_device_key,
|
||||||
device_list_key=device_list_key,
|
device_list_key=device_list_key,
|
||||||
groups_key=groups_key,
|
# Groups key is unused.
|
||||||
|
groups_key=0,
|
||||||
)
|
)
|
||||||
return token
|
return token
|
||||||
|
|
||||||
|
|
|
@ -639,7 +639,7 @@ class StreamToken:
|
||||||
6. `push_rules_key`: `541479`
|
6. `push_rules_key`: `541479`
|
||||||
7. `to_device_key`: `274711`
|
7. `to_device_key`: `274711`
|
||||||
8. `device_list_key`: `265584`
|
8. `device_list_key`: `265584`
|
||||||
9. `groups_key`: `1`
|
9. `groups_key`: `1` (note that this key is now unused)
|
||||||
|
|
||||||
You can see how many of these keys correspond to the various
|
You can see how many of these keys correspond to the various
|
||||||
fields in a "/sync" response:
|
fields in a "/sync" response:
|
||||||
|
@ -691,6 +691,7 @@ class StreamToken:
|
||||||
push_rules_key: int
|
push_rules_key: int
|
||||||
to_device_key: int
|
to_device_key: int
|
||||||
device_list_key: int
|
device_list_key: int
|
||||||
|
# Note that the groups key is no longer used and may have bogus values.
|
||||||
groups_key: int
|
groups_key: int
|
||||||
|
|
||||||
_SEPARATOR = "_"
|
_SEPARATOR = "_"
|
||||||
|
@ -722,6 +723,9 @@ class StreamToken:
|
||||||
str(self.push_rules_key),
|
str(self.push_rules_key),
|
||||||
str(self.to_device_key),
|
str(self.to_device_key),
|
||||||
str(self.device_list_key),
|
str(self.device_list_key),
|
||||||
|
# Note that the groups key is no longer used, but it is still
|
||||||
|
# serialized so that there will not be confusion in the future
|
||||||
|
# if additional tokens are added.
|
||||||
str(self.groups_key),
|
str(self.groups_key),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue