Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Send ALL membership events, including bans to the server that was banned #1758

Merged
merged 2 commits into from
Jan 4, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions synapse/federation/transaction_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from .persistence import TransactionActions
from .units import Transaction, Edu

from synapse.api.constants import EventTypes, Membership
from synapse.api.errors import HttpResponseException
from synapse.util.async import run_on_reactor
from synapse.util.logcontext import preserve_context_over_fn
Expand Down Expand Up @@ -153,18 +152,22 @@ def notify_new_events(self, current_id):
break

for event in events:
# Get the state from before the event.
# We need to make sure that this is the state from before
# the event and not from after it.
# Otherwise if the last member on a server in a room is
# banned then it won't receive the event because it won't
# be in the room after the ban.
users_in_room = yield self.state.get_current_user_in_room(
event.room_id, latest_event_ids=[event.event_id],
event.room_id, latest_event_ids=[
prev_id for prev_id, _ in event.prev_events
],
)

destinations = set(
get_domain_from_id(user_id) for user_id in users_in_room
)

if event.type == EventTypes.Member:
if event.content["membership"] == Membership.JOIN:
destinations.add(get_domain_from_id(event.state_key))

logger.debug("Sending %s to %r", event, destinations)

self._send_pdu(event, destinations)
Expand Down