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

Reuse showRoom for onJoinClick so we join using alias if its available #3444

Merged
merged 2 commits into from
Sep 16, 2019

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Sep 15, 2019

Fixes element-hq/element-web#10866
Seems to be caused by 7754e08#diff-c03ee7f6d50afc9c4fc20dc9d59e76c6
Which skips the existing logic for some reason.

Signed-off-by: Michael Telatynski 7t3chguy@gmail.com

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from a team September 15, 2019 20:30
Copy link
Contributor

@bwindels bwindels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, thanks for the fix!
Wasn't aware that joining with id didn't work (even though there is a big fat comment for it in showRoom).

@bwindels bwindels merged commit 129d369 into develop Sep 16, 2019
@t3chguy t3chguy deleted the t3chguy/nvl/fix_room_directory branch May 25, 2020 18:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Directory should use the alias or server information to join the room
2 participants