saner order for message case detection (can't be joining when kicked)
This commit is contained in:
parent
e40757a801
commit
523311b50c
1 changed files with 18 additions and 11 deletions
|
@ -106,6 +106,23 @@ module.exports = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
_getMessageCase() {
|
_getMessageCase() {
|
||||||
|
const isGuest = MatrixClientPeg.get().isGuest();
|
||||||
|
|
||||||
|
if (isGuest) {
|
||||||
|
return MessageCase.NotLoggedIn;
|
||||||
|
}
|
||||||
|
|
||||||
|
const myMember = this.props.room &&
|
||||||
|
this.props.room.getMember(MatrixClientPeg.get().getUserId());
|
||||||
|
|
||||||
|
if (myMember) {
|
||||||
|
if (myMember.isKicked()) {
|
||||||
|
return MessageCase.Kicked;
|
||||||
|
} else if (myMember.membership === "ban") {
|
||||||
|
return MessageCase.Banned;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (this.props.joining) {
|
if (this.props.joining) {
|
||||||
return MessageCase.Joining;
|
return MessageCase.Joining;
|
||||||
} else if (this.props.rejecting) {
|
} else if (this.props.rejecting) {
|
||||||
|
@ -113,14 +130,8 @@ module.exports = React.createClass({
|
||||||
} else if (this.props.loading) {
|
} else if (this.props.loading) {
|
||||||
return MessageCase.Loading;
|
return MessageCase.Loading;
|
||||||
}
|
}
|
||||||
const isGuest = MatrixClientPeg.get().isGuest();
|
|
||||||
const myMember = !isGuest && this.props.room ?
|
|
||||||
this.props.room.getMember(MatrixClientPeg.get().getUserId()) :
|
|
||||||
null;
|
|
||||||
|
|
||||||
if (isGuest) {
|
if (this.props.inviterName) {
|
||||||
return MessageCase.NotLoggedIn;
|
|
||||||
} else if (this.props.inviterName) {
|
|
||||||
if (this.props.invitedEmail) {
|
if (this.props.invitedEmail) {
|
||||||
if (this.state.threePidFetchError) {
|
if (this.state.threePidFetchError) {
|
||||||
return MessageCase.OtherThreePIDError;
|
return MessageCase.OtherThreePIDError;
|
||||||
|
@ -129,10 +140,6 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return MessageCase.Invite;
|
return MessageCase.Invite;
|
||||||
} else if (myMember && myMember.isKicked()) {
|
|
||||||
return MessageCase.Kicked;
|
|
||||||
} else if (myMember && myMember && myMember.membership == 'ban') {
|
|
||||||
return MessageCase.Banned;
|
|
||||||
} else if (this.props.error) {
|
} else if (this.props.error) {
|
||||||
if (this.props.error.errcode == 'M_NOT_FOUND') {
|
if (this.props.error.errcode == 'M_NOT_FOUND') {
|
||||||
return MessageCase.RoomNotFound;
|
return MessageCase.RoomNotFound;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue