diff options
| author | Tulir Asokan <tulir@maunium.net> | 2023-06-14 17:42:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 15:42:33 +0100 |
| commit | 1404f68a03e684434dea6b2a9a5c2739c719549d (patch) | |
| tree | c395318c97ac0bdacdafaaba74f40702867ed363 | |
| parent | Merge branch 'release-v1.86' into develop (diff) | |
| download | synapse-1404f68a03e684434dea6b2a9a5c2739c719549d.tar.xz | |
Fix joining rooms through aliases where the alias server isn't a real homeserver (#15776)
| -rw-r--r-- | changelog.d/15776.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/room_member.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15776.bugfix b/changelog.d/15776.bugfix new file mode 100644 index 0000000000..f146a85f1a --- /dev/null +++ b/changelog.d/15776.bugfix @@ -0,0 +1 @@ +Fix joining rooms through aliases where the alias server isn't a real homeserver. Contributed by @tulir @ Beeper. diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index af0ca5c26d..55df34bd06 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -1498,7 +1498,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): # put the server which owns the alias at the front of the server list. if room_alias.domain in servers: servers.remove(room_alias.domain) - servers.insert(0, room_alias.domain) + servers.insert(0, room_alias.domain) return RoomID.from_string(room_id), servers |