Correctly return new token when returning events. Serialize events correctly.

This commit is contained in:
Erik Johnston 2014-08-15 15:28:54 +01:00
parent 114984a236
commit 01f089d9fb
5 changed files with 25 additions and 9 deletions

View file

@ -57,7 +57,8 @@ class DataStore(RoomMemberStore, RoomStore,
elif event.type == RoomTopicEvent.TYPE:
yield self._store_room_topic(event)
yield self._store_event(event)
ret = yield self._store_event(event)
defer.returnValue(ret)
@defer.inlineCallbacks
def get_event(self, event_id):
@ -114,6 +115,9 @@ class DataStore(RoomMemberStore, RoomStore,
}
)
latest = yield self.get_room_events_max_id()
defer.returnValue(latest)
@defer.inlineCallbacks
def get_current_state(self, room_id, event_type=None, state_key=""):
sql = (