summary refs log tree commit diff
path: root/synapse/handlers/user_directory.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-12-04 14:58:39 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-12-04 14:58:39 +0000
commit1bd40ca73e1a6dc83d0a6c96f52071553960b3a8 (patch)
tree644933c87362e2eac73ae69b9bd94f444813fd44 /synapse/handlers/user_directory.py
parentMerge branch 'develop' into matthew/search-all-local-users (diff)
downloadsynapse-1bd40ca73e1a6dc83d0a6c96f52071553960b3a8.tar.xz
switch to a simpler 'search_all_users' button as per review feedback
Diffstat (limited to 'synapse/handlers/user_directory.py')
-rw-r--r--synapse/handlers/user_directory.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py
index b902f5d4e6..c1f8e20bfd 100644
--- a/synapse/handlers/user_directory.py
+++ b/synapse/handlers/user_directory.py
@@ -54,7 +54,7 @@ class UserDirectoryHandler(object):
         self.notifier = hs.get_notifier()
         self.is_mine_id = hs.is_mine_id
         self.update_user_directory = hs.config.update_user_directory
-        self.include_pattern = hs.config.user_directory_include_pattern
+        self.search_all_users = hs.config.user_directory_search_all_users
 
         # When start up for the first time we need to populate the user_directory.
         # This is a set of user_id's we've inserted already
@@ -169,7 +169,7 @@ class UserDirectoryHandler(object):
 
         logger.info("Processed all rooms.")
 
-        if self.include_pattern:
+        if self.search_all_users:
             num_processed_users = 0
             user_ids = yield self.store.get_all_local_users()
             logger.info("Doing initial update of user directory. %d users", len(user_ids))
@@ -413,7 +413,7 @@ class UserDirectoryHandler(object):
     def _handle_local_user(self, user_id):
         """Adds a new local roomless user into the user_directory_search table.
         Used to populate up the user index when we have an
-        user_directory_include_pattern specified.
+        user_directory_search_all_users specified.
         """
         logger.debug("Adding new local user to dir, %r", user_id)