mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Not all event streams returns SynapseEvents

Browse source
This commit is contained in:
Erik Johnston 2014-08-18 11:06:59 +01:00
parent 2f91d16033
commit 291010f100
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/api/streams/event.py
View file

@ -18,6 +18,7 @@
from twisted.internet import defer
from synapse.api.errors import EventStreamError
from synapse.api.events import SynapseEvent
from synapse.api.events.room import (
RoomMemberEvent, MessageEvent, FeedbackEvent, RoomTopicEvent
)
@ -160,7 +161,10 @@ class EventStream(PaginationStream):
self.user_id, from_pkey, to_pkey, limit
)
chunk += [e.get_dict() for e in event_chunk]
chunk.extend([
e.get_dict() if isinstance(e, SynapseEvent) else e
for e in event_chunk
])
next_ver.append(str(max_pkey))
defer.returnValue((chunk, EventStream.SEPARATOR.join(next_ver)))