tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Get current member state from current_state snapshot. Fix leave test.

Browse source
This commit is contained in:
Erik Johnston 2014-12-15 15:03:27 +00:00
parent 57e0e619f3
commit 65cdf4e724
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/room.py
View file

@ -343,9 +343,9 @@ class RoomMemberHandler(BaseHandler):
"""
target_user_id = event.state_key
# TODO(markjh): get prev state from snapshot.
prev_state = yield self.store.get_room_member(
target_user_id, event.room_id
prev_state = context.current_state.get(
(RoomMemberEvent.TYPE, target_user_id),
None
)
room_id = event.room_id

13
tests/handlers/test_room.py
View file

@ -270,7 +270,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
(RoomMemberEvent.TYPE, "@bob:red"): self._create_member(
user_id="@bob:red",
room_id=room_id,
membership=Membership.INVITE
membership=Membership.JOIN
),
}
@ -297,6 +297,17 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
# Actual invocation
yield room_handler.change_membership(event, context)
self.federation.handle_new_event.assert_called_once_with(
event, None, destinations=set(['red'])
)
self.datastore.persist_event.assert_called_once_with(
event, context=context
)
self.notifier.on_new_room_event.assert_called_once_with(
event, extra_users=[user]
)
leave_signal_observer.assert_called_with(
user=user, room_id=room_id
)