diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
| commit | 61fc37e467bafe8b1178ec35daf0655049b3cc73 (patch) | |
| tree | fd47305db5a3d6d8f08514d0c1620628b35495a2 /synapse/handlers/message.py | |
| parent | import Image as PIL.Image. (diff) | |
| parent | point the entry_point for synapse-homeserver at the right method (diff) | |
| download | synapse-61fc37e467bafe8b1178ec35daf0655049b3cc73.tar.xz | |
Merge branch 'develop' into media_repository
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index ae0fc43ca2..42dc4d46f3 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -306,7 +306,7 @@ class MessageHandler(BaseHandler): auth_user = self.hs.parse_userid(user_id) # TODO: These concurrently - state_tuples = yield self.store.get_current_state(room_id) + state_tuples = yield self.state_handler.get_current_state(room_id) state = [self.hs.serialize_event(x) for x in state_tuples] member_event = (yield self.store.get_room_member( |