diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-10 19:29:58 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-10 19:29:58 +0000 |
| commit | 1fd81391385703475bd5c30e7617228cf33c7087 (patch) | |
| tree | 146e316b2d49fb6f90e8208f7b56d3b56c0c4937 /synapse/handlers | |
| parent | Have room initialSync return the room's room_id (diff) | |
| download | synapse-1fd81391385703475bd5c30e7617228cf33c7087.tar.xz | |
Put room state in room initialSync output - I guess this is right; I really can't find any other tests similar...
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/message.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index bb1290fd05..d8764a8933 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -336,10 +336,13 @@ class MessageHandler(BaseHandler): feedback=False): yield self.auth.check_joined_room(room_id, user_id) + state_tuples = yield self.store.get_current_state(room_id) + state = [self.hs.serialize_event(x) for x in state_tuples] + defer.returnValue({ #"membership": membership, "room_id": room_id, #"messages": messages, - #"state": state, - #"presence": presence, + "state": state, + #"presence": presence }) |