mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-24 03:35:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

WIP on showing inviter avatar

Browse source
This commit is contained in:
Bruno Windels 2019-04-16 18:48:47 +02:00
parent f9a2b76966
commit 56ade1ead5
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/views/rooms/RoomPreviewBar.js
View file

@ -135,7 +135,7 @@ module.exports = React.createClass({
if (this.props.invitedEmail) {
if (this.state.threePidFetchError) {
return MessageCase.OtherThreePIDError;
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().getUserId()) {
return MessageCase.InvitedEmailMismatch;
}
}
@ -188,6 +188,20 @@ module.exports = React.createClass({
}
},
_getInviteMember: function() {
const {room} = this.props;
if (!room) {
return;
}
const myUserId = MatrixClientPeg.get().getUserId();
const inviteEvent = room.currentState.getMember(myUserId);
if (!inviteEvent) {
return;
}
const inviterUserId = inviteEvent.events.member.getSender();
return room.currentState.getMember(inviterUserId);
},
onLoginClick: function() {
dis.dispatch({ action: 'start_login' });
},
@ -300,12 +314,24 @@ module.exports = React.createClass({
break;
}
case MessageCase.Invite: {
const inviteMember = this._getInviteMember();
let avatar;
let memberName;
if (inviteMember) {
const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
avatar = (<MemberAvatar member={inviteMember} />);
memberName = inviteMember.name;
} else {
memberName = this.props.inviterName;
}
if (this.props.canPreview) {
title = _t("%(memberName)s invited you to this room", {memberName: this.props.inviterName});
title = <span>{avatar}{_t("<userName/> invited you to this room", {}, {userName: name => <strong>{memberName}</strong>})}</span>;
} else {
title = _t("Do you want to join this room?");
subTitle = _t("%(memberName)s invited you", {memberName: this.props.inviterName});
subTitle = <span>{avatar}{_t("<userName/> invited you", {}, {userName: name => <strong>{memberName}</strong>})}</span>;
}
primaryActionLabel = _t("Accept");
primaryActionHandler = this.props.onJoinClick;
secondaryActionLabel = _t("Reject");

4
src/i18n/strings/en_EN.json
View file

@ -810,9 +810,9 @@
"Try to join anyway": "Try to join anyway",
"The room invite wasn't sent to your account": "The room invite wasn't sent to your account",
"Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.",
"%(memberName)s invited you to this room": "%(memberName)s invited you to this room",
"<userName/> invited you to this room": "<userName/> invited you to this room",
"Do you want to join this room?": "Do you want to join this room?",
"%(memberName)s invited you": "%(memberName)s invited you",
"<userName/> invited you": "<userName/> invited you",
"Reject": "Reject",
"You're previewing this room. Want to join it?": "You're previewing this room. Want to join it?",
"%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",