Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit e541bb9

Browse files
authored
Rework stream token to stop caring about groups. (#12897)
1 parent d0e40df commit e541bb9

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

changelog.d/12897.removal

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove support for the non-standard groups/communities feature from Synapse.

synapse/streams/events.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def get_current_token(self) -> StreamToken:
5454
push_rules_key = self.store.get_max_push_rules_stream_id()
5555
to_device_key = self.store.get_to_device_stream_token()
5656
device_list_key = self.store.get_device_stream_token()
57-
groups_key = self.store.get_group_stream_token()
5857

5958
token = StreamToken(
6059
room_key=self.sources.room.get_current_key(),
@@ -65,7 +64,8 @@ def get_current_token(self) -> StreamToken:
6564
push_rules_key=push_rules_key,
6665
to_device_key=to_device_key,
6766
device_list_key=device_list_key,
68-
groups_key=groups_key,
67+
# Groups key is unused.
68+
groups_key=0,
6969
)
7070
return token
7171

synapse/types.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ class StreamToken:
639639
6. `push_rules_key`: `541479`
640640
7. `to_device_key`: `274711`
641641
8. `device_list_key`: `265584`
642-
9. `groups_key`: `1`
642+
9. `groups_key`: `1` (note that this key is now unused)
643643
644644
You can see how many of these keys correspond to the various
645645
fields in a "/sync" response:
@@ -691,6 +691,7 @@ class StreamToken:
691691
push_rules_key: int
692692
to_device_key: int
693693
device_list_key: int
694+
# Note that the groups key is no longer used and may have bogus values.
694695
groups_key: int
695696

696697
_SEPARATOR = "_"
@@ -722,6 +723,9 @@ async def to_string(self, store: "DataStore") -> str:
722723
str(self.push_rules_key),
723724
str(self.to_device_key),
724725
str(self.device_list_key),
726+
# Note that the groups key is no longer used, but it is still
727+
# serialized so that there will not be confusion in the future
728+
# if additional tokens are added.
725729
str(self.groups_key),
726730
]
727731
)

0 commit comments

Comments
 (0)