summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-11 13:20:07 +0100
committerGitHub <noreply@github.com>2017-10-11 13:20:07 +0100
commit535cc49f27e28dd1148c6b92b6d1584cf3093e5c (patch)
treef1714e604abf696ca1adec12fe7653dad8a3ef61 /synapse/streams
parentMerge pull request #2501 from matrix-org/dbkr/channel_notifications (diff)
parentValidate room ids (diff)
downloadsynapse-535cc49f27e28dd1148c6b92b6d1584cf3093e5c.tar.xz
Merge pull request #2466 from matrix-org/erikj/groups_merged
Initial Group Implementation
Diffstat (limited to 'synapse/streams')
-rw-r--r--synapse/streams/events.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py

index 91a59b0bae..f03ad99118 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py
@@ -45,6 +45,7 @@ class EventSources(object): push_rules_key, _ = self.store.get_push_rules_stream_token() to_device_key = self.store.get_to_device_stream_token() device_list_key = self.store.get_device_stream_token() + groups_key = self.store.get_group_stream_token() token = StreamToken( room_key=( @@ -65,6 +66,7 @@ class EventSources(object): push_rules_key=push_rules_key, to_device_key=to_device_key, device_list_key=device_list_key, + groups_key=groups_key, ) defer.returnValue(token) @@ -73,6 +75,7 @@ class EventSources(object): push_rules_key, _ = self.store.get_push_rules_stream_token() to_device_key = self.store.get_to_device_stream_token() device_list_key = self.store.get_device_stream_token() + groups_key = self.store.get_group_stream_token() token = StreamToken( room_key=( @@ -93,5 +96,6 @@ class EventSources(object): push_rules_key=push_rules_key, to_device_key=to_device_key, device_list_key=device_list_key, + groups_key=groups_key, ) defer.returnValue(token)