diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
| commit | 9d8f798a3fa0a0a98626218ff1602bf06be0fb82 (patch) | |
| tree | 7226008bc691b4599c2c499de63c4bbced486a1b /synapse/handlers/message.py | |
| parent | Move bump schema delta (diff) | |
| parent | SYN-252: Supply the stream and topological parts in the correct order to the ... (diff) | |
| download | synapse-9d8f798a3fa0a0a98626218ff1602bf06be0fb82.tar.xz | |
Merge changes from develop
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 9c3271fe88..6fbd2af4ab 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -114,7 +114,8 @@ class MessageHandler(BaseHandler): defer.returnValue(chunk) @defer.inlineCallbacks - def create_and_send_event(self, event_dict, ratelimit=True): + def create_and_send_event(self, event_dict, ratelimit=True, + client=None, txn_id=None): """ Given a dict from a client, create and handle a new event. Creates an FrozenEvent object, filling out auth_events, prev_events, @@ -148,6 +149,15 @@ class MessageHandler(BaseHandler): builder.content ) + if client is not None: + if client.token_id is not None: + builder.internal_metadata.token_id = client.token_id + if client.device_id is not None: + builder.internal_metadata.device_id = client.device_id + + if txn_id is not None: + builder.internal_metadata.txn_id = txn_id + event, context = yield self._create_new_client_event( builder=builder, ) |