Merge branch 'ratelimiting' into develop

This commit is contained in:
Mark Haines 2014-09-03 09:15:52 +01:00
commit 30ad0c5674
14 changed files with 244 additions and 10 deletions

View file

@ -49,6 +49,7 @@ class RoomCreationHandler(BaseRoomHandler):
SynapseError if the room ID was taken, couldn't be stored, or
something went horribly wrong.
"""
self.ratelimit(user_id)
if "room_alias_name" in config:
room_alias = RoomAlias.create_local(