diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
| commit | af7b21447648cba477542bc1786be2a6c0928e37 (patch) | |
| tree | 74c4481acd515a180c0edeb05d1a03b52ba30fd6 /synapse/handlers/message.py | |
| parent | Format the presence events correctly for v2 (diff) | |
| parent | Split the sections of EventStreamHandler.get_stream that handle presence (diff) | |
| download | synapse-af7b21447648cba477542bc1786be2a6c0928e37.tar.xz | |
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index bda8eb5f3f..30949ff7a6 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -383,8 +383,12 @@ class MessageHandler(BaseHandler): } if event.membership == Membership.INVITE: + time_now = self.clock.time_msec() d["inviter"] = event.sender + invite_event = yield self.store.get_event(event.event_id) + d["invite"] = serialize_event(invite_event, time_now, as_client_event) + rooms_ret.append(d) if event.membership not in (Membership.JOIN, Membership.LEAVE): |