diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
| commit | 58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12 (patch) | |
| tree | 711215f7fe3121b61e7cd32d57ec47cec3ee5671 /synapse/handlers/message.py | |
| parent | Implement third party identifier invites (diff) | |
| parent | Add 'trusted_private_chat' to room creation presets (diff) | |
| download | synapse-58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
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): |