Merge pull request #2266 from matrix-org/erikj/host_in_room

Change is_host_joined to use current_state table
This commit is contained in:
Erik Johnston 2017-06-12 09:49:51 +01:00 committed by GitHub
commit a837765e8c
5 changed files with 31 additions and 55 deletions

View file

@ -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,
)