Review comments

This commit is contained in:
Erik Johnston 2019-03-28 13:48:41 +00:00
parent d5a5d1c632
commit 40e56997bc
2 changed files with 73 additions and 51 deletions

View File

@ -934,6 +934,9 @@ class PresenceHandler(object):
joining rooms and require being sent presence. joining rooms and require being sent presence.
""" """
if self._event_processing:
return
@defer.inlineCallbacks @defer.inlineCallbacks
def _process_presence(): def _process_presence():
if self._event_processing: if self._event_processing:
@ -993,14 +996,29 @@ class PresenceHandler(object):
# Ignore changes to join events. # Ignore changes to join events.
continue continue
if self.is_mine_id(state_key): yield self._on_user_joined_room(room_id, state_key)
@defer.inlineCallbacks
def _on_user_joined_room(self, room_id, user_id):
"""Called when we detect a user joining the room via the current state
delta stream.
Args:
room_id (str)
user_id (str)
Returns:
Deferred
"""
if self.is_mine_id(user_id):
# If this is a local user then we need to send their presence # If this is a local user then we need to send their presence
# out to hosts in the room (who don't already have it) # out to hosts in the room (who don't already have it)
# TODO: We should be able to filter the hosts down to those that # TODO: We should be able to filter the hosts down to those that
# haven't previously seen the user # haven't previously seen the user
state = yield self.current_state_for_user(state_key) state = yield self.current_state_for_user(user_id)
hosts = yield self.state.get_current_hosts_in_room(room_id) hosts = yield self.state.get_current_hosts_in_room(room_id)
# Filter out ourselves. # Filter out ourselves.
@ -1043,7 +1061,7 @@ class PresenceHandler(object):
if states: if states:
self.federation.send_presence_to_destinations( self.federation.send_presence_to_destinations(
states=states, states=states,
destinations=[get_domain_from_id(state_key)], destinations=[get_domain_from_id(user_id)],
) )

View File

@ -461,7 +461,9 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
) )
self.reactor.pump([0]) # Wait for presence updates to be handled self.reactor.pump([0]) # Wait for presence updates to be handled
# Test that a new server gets told about existing presence # #
# Test that a new server gets told about existing presence
#
self.federation_sender.reset_mock() self.federation_sender.reset_mock()
@ -482,7 +484,9 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
destinations=["server2"], states=[expected_state] destinations=["server2"], states=[expected_state]
) )
# Test that only the new server gets sent presence and not existing servers # #
# Test that only the new server gets sent presence and not existing servers
#
self.federation_sender.reset_mock() self.federation_sender.reset_mock()
self._add_new_user(room_id, "@bob:server3") self._add_new_user(room_id, "@bob:server3")
@ -517,7 +521,9 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
self.reactor.pump([0]) # Wait for presence updates to be handled self.reactor.pump([0]) # Wait for presence updates to be handled
# Test that when a local join happens remote servers get told about it # #
# Test that when a local join happens remote servers get told about it
#
self.federation_sender.reset_mock() self.federation_sender.reset_mock()
@ -547,7 +553,6 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
room_version = self.get_success(self.store.get_room_version(room_id)) room_version = self.get_success(self.store.get_room_version(room_id))
# No we want to have other servers "join"
builder = EventBuilder( builder = EventBuilder(
state=self.state, state=self.state,
auth=self.auth, auth=self.auth,
@ -555,7 +560,6 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
clock=self.clock, clock=self.clock,
hostname=hostname, hostname=hostname,
signing_key=self.random_signing_key, signing_key=self.random_signing_key,
format_version=room_version_to_event_format(room_version), format_version=room_version_to_event_format(room_version),
room_id=room_id, room_id=room_id,
type=EventTypes.Member, type=EventTypes.Member,