diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-03 18:02:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-03 18:02:33 +0000 |
commit | 036516d647c6fbd8ec4642a3308e73f71868b1b3 (patch) | |
tree | 6cfacc683f68a9e9748058335c36e8ee2fa7f83d /synapse/handlers/room.py | |
parent | Bump version (diff) | |
parent | Bump changes and version (diff) | |
download | synapse-036516d647c6fbd8ec4642a3308e73f71868b1b3.tar.xz |
Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse v0.5.4
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, |