Skip to content

Add workaround for missing events in _should_perform_remote_join #19730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tulir wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add workaround for missing events in _should_perform_remote_join #19730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelog.d/19730.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Work around bug that sometimes breaks joining restricted rooms that require a remote join. Contributed by @tulir @ Beeper.
8 changes: 8 additions & 0 deletions synapse/handlers/room_member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,15 @@ async def _should_perform_remote_join(
current_state = {
state_key: event_map[event_id]
for state_key, event_id in state_before_join.items()
# TODO figure out why events present in state_before_join are sometimes not found in event_map
# See https://github.com/element-hq/synapse/issues/19465
if event_id in event_map
}
if len(current_state) < len(state_before_join):
logger.warning(
"Some events from state_before_join were not found in event_map: %s",
set(state_before_join.values()) - set(event_map.keys()),
)
servers_that_can_issue_invite = get_servers_from_users(
get_users_which_can_issue_invite(current_state)
)
Expand Down
Loading