diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
| commit | 6941a1971548ea8ba37130deeffe2a2e2cd88085 (patch) | |
| tree | 9b6947d42c18e4a7ccb9c4e34525faa8e073cf76 /synapse/handlers/room.py | |
| parent | Begin fleshing out a new Event object (diff) | |
| parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
| download | synapse-6941a1971548ea8ba37130deeffe2a2e2cd88085.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
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 315fb02e7b..6e1c37df03 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -522,7 +522,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, |