diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 02:23:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 02:23:36 +0100 |
| commit | 781ff713ba65e9a8075063ee5112479afcb412ed (patch) | |
| tree | 1df45adf38713cac9d045c43296f1026897c91c6 /synapse/storage/roommember.py | |
| parent | Document new invite key added to createRoom api (diff) | |
| download | synapse-781ff713ba65e9a8075063ee5112479afcb412ed.tar.xz | |
When getting a state event also include the previous content
Diffstat (limited to 'synapse/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 75c9a60101..9a393e2568 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -88,7 +88,7 @@ class RoomMemberStore(SQLBaseStore): txn.execute(sql, (user_id, room_id)) rows = self.cursor_to_dict(txn) if rows: - return self._parse_event_from_row(rows[0]) + return self._parse_events_txn(txn, rows)[0] else: return None @@ -161,7 +161,7 @@ class RoomMemberStore(SQLBaseStore): # logger.debug("_get_members_query Got rows %s", rows) - results = [self._parse_event_from_row(r) for r in rows] + results = yield self._parse_events(rows) defer.returnValue(results) @defer.inlineCallbacks |