diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-10 17:00:25 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-10 17:00:25 +0000 |
| commit | 466b4ec01d823163dc395f1e805a4ea47182a955 (patch) | |
| tree | dcf5f90f670641aec7adb957186fd23f8d5b916f /synapse/handlers/message.py | |
| parent | Merge pull request #356 from matrix-org/daniel/3pidyetagain (diff) | |
| parent | Allow guest users to join and message rooms (diff) | |
| download | synapse-466b4ec01d823163dc395f1e805a4ea47182a955.tar.xz | |
Merge pull request #355 from matrix-org/daniel/anonymouswriting
Allow guest users to join and message rooms
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 654ecd2b37..7d31ff8d46 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -167,7 +167,7 @@ class MessageHandler(BaseHandler): @defer.inlineCallbacks def create_and_send_event(self, event_dict, ratelimit=True, - token_id=None, txn_id=None): + token_id=None, txn_id=None, is_guest=False): """ Given a dict from a client, create and handle a new event. Creates an FrozenEvent object, filling out auth_events, prev_events, @@ -213,7 +213,7 @@ class MessageHandler(BaseHandler): if event.type == EventTypes.Member: member_handler = self.hs.get_handlers().room_member_handler - yield member_handler.change_membership(event, context) + yield member_handler.change_membership(event, context, is_guest=is_guest) else: yield self.handle_new_client_event( event=event, |