diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2018-08-24 11:44:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 11:44:26 -0400 |
| commit | 83caead95a921b0977164468a52c5c0b6e9eee5a (patch) | |
| tree | e87ae6c5d439de1e1dfd7598cab35a14e320ef59 /synapse/handlers/room_member.py | |
| parent | allow session_data to be any JSON instead of just a string (diff) | |
| parent | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags (diff) | |
| download | synapse-83caead95a921b0977164468a52c5c0b6e9eee5a.tar.xz | |
Merge branch 'develop' into e2e_backups
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 0d4a3f4677..f643619047 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -30,7 +30,7 @@ import synapse.types from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, Codes, SynapseError from synapse.types import RoomID, UserID -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.distributor import user_joined_room, user_left_room logger = logging.getLogger(__name__) @@ -344,6 +344,7 @@ class RoomMemberHandler(object): latest_event_ids = ( event_id for (event_id, _, _) in prev_events_and_hashes ) + current_state_ids = yield self.state_handler.get_current_state_ids( room_id, latest_event_ids=latest_event_ids, ) |