summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2017-11-07 17:31:11 +0000
committerGitHub <noreply@github.com>2017-11-07 17:31:11 +0000
commit228ccf1fe388c7c489e8eaf03c01ec42537f423a (patch)
tree7f22d632f946b79ad68789946c2b669e8b889493 /synapse/handlers
parentMerge pull request #2636 from farialima/me-master (diff)
parentcreate new indexes before dropping old ones to keep safetynet in place (diff)
downloadsynapse-228ccf1fe388c7c489e8eaf03c01ec42537f423a.tar.xz
Merge pull request #2643 from matrix-org/matthew/user_dir_typos
Fix various embarrassing typos around user_directory and add some doc.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/user_directory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py
index 2a49456bfc..b5be5d9623 100644
--- a/synapse/handlers/user_directory.py
+++ b/synapse/handlers/user_directory.py
@@ -152,7 +152,7 @@ class UserDirectoyHandler(object):
 
         for room_id in room_ids:
             logger.info("Handling room %d/%d", num_processed_rooms, len(room_ids))
-            yield self._handle_intial_room(room_id)
+            yield self._handle_initial_room(room_id)
             num_processed_rooms += 1
             yield sleep(self.INITIAL_SLEEP_MS / 1000.)
 
@@ -166,7 +166,7 @@ class UserDirectoyHandler(object):
         yield self.store.update_user_directory_stream_pos(new_pos)
 
     @defer.inlineCallbacks
-    def _handle_intial_room(self, room_id):
+    def _handle_initial_room(self, room_id):
         """Called when we initially fill out user_directory one room at a time
         """
         is_in_room = yield self.store.is_host_joined(room_id, self.server_name)