diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-05 11:52:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-05 11:52:49 +0100 |
| commit | d87b87adf77609c7cfef58cebf21cda6a0eef94a (patch) | |
| tree | 06a5d5600b3a2a1ad1b87408081b6855e16334eb | |
| parent | Remove unused imports (diff) | |
| parent | Merge pull request #1067 from matrix-org/markjh/idempotent (diff) | |
| download | synapse-d87b87adf77609c7cfef58cebf21cda6a0eef94a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bulk_push
| -rw-r--r-- | synapse/handlers/room_member.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 3ba5335af7..ba49075a20 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -85,6 +85,12 @@ class RoomMemberHandler(BaseHandler): prev_event_ids=prev_event_ids, ) + # Check if this event matches the previous membership event for the user. + duplicate = yield msg_handler.deduplicate_state_event(event, context) + if duplicate is not None: + # Discard the new event since this membership change is a no-op. + return + yield msg_handler.handle_new_client_event( requester, event, |