Merge pull request #3879 from matrix-org/matthew/fix-autojoin

don't ratelimit autojoins
This commit is contained in:
Richard van der Hoff 2018-09-18 13:07:01 +01:00 committed by GitHub
commit 286d6930b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

1
changelog.d/3879.bugfix Normal file
View File

@ -0,0 +1 @@
Don't ratelimit autojoins

View File

@ -534,4 +534,5 @@ class RegistrationHandler(BaseHandler):
room_id=room_id, room_id=room_id,
remote_room_hosts=remote_room_hosts, remote_room_hosts=remote_room_hosts,
action="join", action="join",
ratelimit=False,
) )