summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-06-09 10:52:26 +0100
committerErik Johnston <erik@matrix.org>2017-06-09 10:52:26 +0100
commit0185b75381c160edaf2bec0b9f4def0bb0d67a02 (patch)
tree55e8ba309e5736457b3c187974d2eb6f33049803 /synapse/handlers
parentMerge pull request #2263 from matrix-org/erikj/fix_state_woes (diff)
downloadsynapse-0185b75381c160edaf2bec0b9f4def0bb0d67a02.tar.xz
Change is_host_joined to use current_state table
This bypasses a bug where using the state groups to figure out if a host
is in a room sometimes errors if the servers isn't in the room. (For
example when the server rejected an invite to a remote room)
Diffstat (limited to 'synapse/handlers')
-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 43eb1c78e9..02b720b654 100644
--- a/synapse/handlers/user_directory.py
+++ b/synapse/handlers/user_directory.py
@@ -151,7 +151,7 @@ class UserDirectoyHandler(object):
     def _handle_intial_room(self, room_id):
         """Called when we initially fill out user_directory one room at a time
         """
-        is_in_room = yield self.state.get_is_host_in_room(room_id, self.server_name)
+        is_in_room = yield self.store.is_host_joined(room_id, self.server_name)
         if not is_in_room:
             return
 
@@ -209,7 +209,7 @@ class UserDirectoyHandler(object):
                 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
-                    is_in_room = yield self.state.get_is_host_in_room(
+                    is_in_room = yield self.store.is_host_joined(
                         room_id, self.server_name,
                     )
                     if not is_in_room:
@@ -346,7 +346,7 @@ class UserDirectoyHandler(object):
             if not update_user_in_public and not update_user_dir:
                 break
 
-            is_in_room = yield self.state.get_is_host_in_room(
+            is_in_room = yield self.store.is_host_joined(
                 j_room_id, self.server_name,
             )