tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't bundle events in /sync or /events

Browse source 
As we'll send down the annotations too anyway, so this just ends up
confusing clients.
This commit is contained in:
Erik Johnston 2019-05-21 13:54:09 +01:00
parent 04d53794d6
commit de7672b78f
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/events/utils.py
View file

@ -330,12 +330,13 @@ class EventClientSerializer(object):
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def serialize_event(self, event, time_now, **kwargs): def serialize_event(self, event, time_now, bundle_aggregations=True, **kwargs):
"""Serializes a single event. """Serializes a single event.
Args: Args:
event (EventBase) event (EventBase)
time_now (int): The current time in milliseconds time_now (int): The current time in milliseconds
bundle_aggregations (bool): Whether to bundle in related events
**kwargs: Arguments to pass to `serialize_event` **kwargs: Arguments to pass to `serialize_event`
Returns: Returns:
@ -350,7 +351,7 @@ class EventClientSerializer(object):
# If MSC1849 is enabled then we need to look if thre are any relations # If MSC1849 is enabled then we need to look if thre are any relations
# we need to bundle in with the event # we need to bundle in with the event
if self.experimental_msc1849_support_enabled: if self.experimental_msc1849_support_enabled and bundle_aggregations:
annotations = yield self.store.get_aggregation_groups_for_event( annotations = yield self.store.get_aggregation_groups_for_event(
event_id, event_id,
) )

3
synapse/handlers/events.py
View file

@ -122,6 +122,9 @@ class EventStreamHandler(BaseHandler):
chunks = yield self._event_serializer.serialize_events( chunks = yield self._event_serializer.serialize_events(
events, time_now, as_client_event=as_client_event, events, time_now, as_client_event=as_client_event,
# We don't bundle "live" events, as otherwise clients
# will end up double counting annotations.
bundle_aggregations=False,
) )
chunk = { chunk = {

3
synapse/rest/client/v2_alpha/sync.py
View file

@ -358,6 +358,9 @@ class SyncRestServlet(RestServlet):
def serialize(events): def serialize(events):
return self._event_serializer.serialize_events( return self._event_serializer.serialize_events(
events, time_now=time_now, events, time_now=time_now,
# We don't bundle "live" events, as otherwise clients
# will end up double counting annotations.
bundle_aggregations=False,
token_id=token_id, token_id=token_id,
event_format=event_formatter, event_format=event_formatter,
only_event_fields=only_fields, only_event_fields=only_fields,