Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bu…

…lk_push
matrix-org · Sep 5, 2016 · d87b87a · d87b87a
2 parents caed150 + 274c2f5
commit d87b87a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
@@ -85,6 +85,12 @@ def _local_membership_update(
             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,