summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2017-01-04 13:34:35 +0000
committerMark Haines <mark.haines@matrix.org>2017-01-04 13:56:20 +0000
commitb6b67715edc496ea95fd8005ee5b5685adcf2601 (patch)
treec76b2f0846fbee8fd97091168d75c6e719bc7167
parentBump version and changelog (diff)
downloadsynapse-b6b67715edc496ea95fd8005ee5b5685adcf2601.tar.xz
Send ALL membership events to the server that was affected.
Send all membership changes to the server that was affected.
This ensures that if the last member of a room on a server
was kicked or banned they get told about it.
Diffstat (limited to '')
-rw-r--r--synapse/federation/transaction_queue.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 51b656d74a..b00dda2908 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -19,7 +19,7 @@ from twisted.internet import defer
 from .persistence import TransactionActions
 from .units import Transaction, Edu
 
-from synapse.api.constants import EventTypes, Membership
+from synapse.api.constants import EventTypes
 from synapse.api.errors import HttpResponseException
 from synapse.util.async import run_on_reactor
 from synapse.util.logcontext import preserve_context_over_fn
@@ -161,9 +161,11 @@ class TransactionQueue(object):
                         get_domain_from_id(user_id) for user_id in users_in_room
                     )
 
+                    # Send all membership changes to the server that was affected.
+                    # This ensures that if the last member of a room on a server
+                    # was kicked or banned they get told about it.
                     if event.type == EventTypes.Member:
-                        if event.content["membership"] == Membership.JOIN:
-                            destinations.add(get_domain_from_id(event.state_key))
+                        destinations.add(get_domain_from_id(event.state_key))
 
                     logger.debug("Sending %s to %r", event, destinations)