diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-11-13 23:12:58 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-11-13 23:12:58 +0000 |
| commit | b01271a12be164d5f8286aa3c3106a32c6ac6be3 (patch) | |
| tree | 9eb3a69566a1fba08c3a707d7ee35c94410bfb23 /synapse/handlers | |
| parent | fix unit tests (diff) | |
| download | synapse-b01271a12be164d5f8286aa3c3106a32c6ac6be3.tar.xz | |
tweak tests and tidy
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/register.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/user_directory.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 70fd191717..ceab38f18c 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -230,11 +230,9 @@ class RegistrationHandler(BaseHandler): # the room is never created, though this seems unlikely and # recoverable from given the support user being involved in the first # place. - if (self.hs.config.autocreate_auto_join_rooms and not is_support): count = yield self.store.count_all_users() should_auto_create_rooms = count == 1 - for r in self.hs.config.auto_join_rooms: try: if should_auto_create_rooms: diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py index 1e233e044f..821058cfcb 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py @@ -332,8 +332,6 @@ class UserDirectoryHandler(object): public_value=Membership.JOIN, ) - - if not change: # Need to check if the server left the room entirely, if so # we might need to remove all the users in that room |