diff options
author | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
commit | 0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch) | |
tree | a01e93cb31ca94d83dba6a9a381997b88f5b3a25 /synapse/handlers/room.py | |
parent | Thank you, pyflakes (diff) | |
parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
download | synapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz |
Merge branch 'master' into pushers
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 88955160c5..a000b44036 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -519,7 +519,11 @@ class RoomMemberHandler(BaseHandler): user_id=user.to_string(), membership_list=membership_list ) - defer.returnValue([r.room_id for r in rooms]) + # For some reason the list of events contains duplicates + # TODO(paul): work out why because I really don't think it should + room_ids = set(r.room_id for r in rooms) + + defer.returnValue(room_ids) @defer.inlineCallbacks def _do_local_membership_update(self, event, membership, snapshot, |