From b01271a12be164d5f8286aa3c3106a32c6ac6be3 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Tue, 13 Nov 2018 23:12:58 +0000 Subject: tweak tests and tidy --- synapse/handlers/register.py | 2 -- synapse/handlers/user_directory.py | 2 -- 2 files changed, 4 deletions(-) (limited to 'synapse/handlers') 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 -- cgit 1.5.1