matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-10-26 15:51:21 +03:00
Code Activity

Fix rejoin of knock rooms (#11980)

Browse Source 
Signed-off-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
This commit is contained in:
maheichyk
2023-12-04 13:20:24 +03:00
committed by GitHub
parent e2bc437774
commit 74ea0d134e
5 changed files with 160 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.tsx
View File

@@ -2229,8 +2229,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
<div className="mx_RoomView" data-room-header={roomHeaderType}>
<ErrorBoundary>
<RoomPreviewBar
onJoinClick={this.onJoinButtonClicked}
room={this.state.room}
promptAskToJoin={myMembership === "leave" || this.state.promptAskToJoin}
canAskToJoinAndMembershipIsLeave={myMembership === "leave"}
promptAskToJoin={this.state.promptAskToJoin}
knocked={myMembership === "knock"}
onSubmitAskToJoin={this.onSubmitAskToJoin}
onCancelAskToJoin={this.onCancelAskToJoin}

5
src/components/views/rooms/RoomPreviewBar.tsx
View File

@@ -106,6 +106,7 @@ interface IProps {
onRejectAndIgnoreClick?(): void;
onForgetClick?(): void;
canAskToJoinAndMembershipIsLeave?: boolean;
promptAskToJoin?: boolean;
knocked?: boolean;
onSubmitAskToJoin?(reason?: string): void;
@@ -193,6 +194,8 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
if (myMember.isKicked()) {
if (previousMembership === "knock") {
return MessageCase.RequestDenied;
} else if (this.props.promptAskToJoin) {
return MessageCase.PromptAskToJoin;
}
return MessageCase.Kicked;
} else if (myMember.membership === "ban") {
@@ -208,7 +211,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
return MessageCase.Loading;
} else if (this.props.knocked) {
return MessageCase.Knocked;
} else if (this.props.promptAskToJoin) {
} else if (this.props.canAskToJoinAndMembershipIsLeave || this.props.promptAskToJoin) {
return MessageCase.PromptAskToJoin;
}