diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-04 11:56:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-04 11:56:40 +0100 |
| commit | bf14883a04c702a553cc81b3f4ee66608be663fa (patch) | |
| tree | f29ab95ef6fab9ef87a7f7f67226ad472474262c /synapse/handlers/message.py | |
| parent | Merge pull request #686 from matrix-org/markjh/doc_strings (diff) | |
| parent | Use computed prev event ids (diff) | |
| download | synapse-bf14883a04c702a553cc81b3f4ee66608be663fa.tar.xz | |
Merge pull request #689 from matrix-org/erikj/member
Do checks for memberships before creating events
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 0bb111d047..10608c0dd9 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -176,7 +176,7 @@ class MessageHandler(BaseHandler): defer.returnValue(chunk) @defer.inlineCallbacks - def create_event(self, event_dict, token_id=None, txn_id=None): + def create_event(self, event_dict, token_id=None, txn_id=None, prev_event_ids=None): """ Given a dict from a client, create a new event. @@ -187,6 +187,9 @@ class MessageHandler(BaseHandler): Args: event_dict (dict): An entire event + token_id (str) + txn_id (str) + prev_event_ids (list): The prev event ids to use when creating the event Returns: Tuple of created event (FrozenEvent), Context @@ -225,6 +228,7 @@ class MessageHandler(BaseHandler): event, context = yield self._create_new_client_event( builder=builder, + prev_event_ids=prev_event_ids, ) defer.returnValue((event, context)) |