diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:40 +0100 |
| commit | 6f8e2d517e8141f62cb0cfcc73c3842a367ff21c (patch) | |
| tree | 4f4569d1bbf7b6fcc2a67c1664da38b75e81a5ee /synapse/handlers/room.py | |
| parent | Shuffle operations so that locking upsert happens last in the txn. This ensur... (diff) | |
| parent | Merge pull request #132 from matrix-org/observer_and_locks (diff) | |
| download | synapse-6f8e2d517e8141f62cb0cfcc73c3842a367ff21c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index bc7f1c2402..a0ee9913bd 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -124,7 +124,7 @@ class RoomCreationHandler(BaseHandler): msg_handler = self.hs.get_handlers().message_handler for event in creation_events: - yield msg_handler.create_and_send_event(event) + yield msg_handler.create_and_send_event(event, ratelimit=False) if "name" in config: name = config["name"] @@ -134,7 +134,7 @@ class RoomCreationHandler(BaseHandler): "sender": user_id, "state_key": "", "content": {"name": name}, - }) + }, ratelimit=False) if "topic" in config: topic = config["topic"] @@ -144,7 +144,7 @@ class RoomCreationHandler(BaseHandler): "sender": user_id, "state_key": "", "content": {"topic": topic}, - }) + }, ratelimit=False) for invitee in invite_list: yield msg_handler.create_and_send_event({ @@ -153,7 +153,7 @@ class RoomCreationHandler(BaseHandler): "room_id": room_id, "sender": user_id, "content": {"membership": Membership.INVITE}, - }) + }, ratelimit=False) result = {"room_id": room_id} |