@@ -1910,6 +1901,7 @@ module.exports = React.createClass({
{ statusBar }
+ { previewBar }
{ messageComposer }
-
- { _t("Login") }
-
-
- { _t("Register") }
-
-
- );
-
- return (
-
- { loginButton }
-
- );
- },
-});
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 0d47de4266..75898736f1 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -23,7 +23,7 @@ import sdk from '../../../index';
import Flair from '../elements/Flair.js';
import FlairStore from '../../../stores/FlairStore';
import { _t } from '../../../languageHandler';
-import {hashCode} from '../../../utils/FormattingUtils';
+import {getUserNameColorClass} from '../../../utils/FormattingUtils';
export default React.createClass({
displayName: 'SenderProfile',
@@ -97,7 +97,7 @@ export default React.createClass({
render() {
const EmojiText = sdk.getComponent('elements.EmojiText');
const {mxEvent} = this.props;
- const colorNumber = (hashCode(mxEvent.getSender()) % 8) + 1;
+ const colorClass = getUserNameColorClass(mxEvent.getSender());
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const {msgtype} = mxEvent.getContent();
@@ -121,7 +121,7 @@ export default React.createClass({
// Name + flair
const nameFlair =
-
+
{ nameElem }
{ flair }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index dbe409d6d7..55c39d3947 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -17,12 +17,29 @@ limitations under the License.
'use strict';
-const React = require('react');
+import React from 'react';
import PropTypes from 'prop-types';
-const sdk = require('../../../index');
-const MatrixClientPeg = require('../../../MatrixClientPeg');
-
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import dis from '../../../dispatcher';
+import classNames from 'classnames';
import { _t } from '../../../languageHandler';
+import {getUserNameColorClass} from '../../../utils/FormattingUtils';
+
+const MessageCase = Object.freeze({
+ NotLoggedIn: "NotLoggedIn",
+ Joining: "Joining",
+ Loading: "Loading",
+ Rejecting: "Rejecting",
+ Kicked: "Kicked",
+ Banned: "Banned",
+ OtherThreePIDError: "OtherThreePIDError",
+ InvitedEmailMismatch: "InvitedEmailMismatch",
+ Invite: "Invite",
+ ViewingRoom: "ViewingRoom",
+ RoomNotFound: "RoomNotFound",
+ OtherError: "OtherError",
+});
module.exports = React.createClass({
displayName: 'RoomPreviewBar',
@@ -31,7 +48,6 @@ module.exports = React.createClass({
onJoinClick: PropTypes.func,
onRejectClick: PropTypes.func,
onForgetClick: PropTypes.func,
-
// if inviterName is specified, the preview bar will shown an invite to the room.
// You should also specify onRejectClick if specifiying inviterName
inviterName: PropTypes.string,
@@ -50,7 +66,9 @@ module.exports = React.createClass({
// purpose of the spinner.
spinner: PropTypes.bool,
spinnerState: PropTypes.oneOf(["joining"]),
-
+ loading: PropTypes.bool,
+ joining: PropTypes.bool,
+ rejecting: PropTypes.bool,
// The alias that was used to access this room, if appropriate
// If given, this will be how the room is referred to (eg.
// in error messages).
@@ -60,7 +78,6 @@ module.exports = React.createClass({
getDefaultProps: function() {
return {
onJoinClick: function() {},
- canPreview: true,
};
},
@@ -72,7 +89,7 @@ module.exports = React.createClass({
componentWillMount: function() {
// If this is an invite and we've been told what email
- // address was invited, fetch the user's list of 3pids
+ // address was invited, fetch the user's list of Threepids
// so we can check them against the one that was invited
if (this.props.inviterName && this.props.invitedEmail) {
this.setState({busy: true});
@@ -88,157 +105,334 @@ module.exports = React.createClass({
}
},
- _roomNameElement: function() {
- return this.props.room ? this.props.room.name : (this.props.room_alias || "");
+ _onInviterClick(evt) {
+ evt.preventDefault();
+ const member = this._getInviteMember();
+ dis.dispatch({action: 'view_user_info', userId: member.userId});
},
- render: function() {
- let joinBlock; let previewBlock;
+ _getMessageCase() {
+ const isGuest = MatrixClientPeg.get().isGuest();
- if (this.props.spinner || this.state.busy) {
- const Spinner = sdk.getComponent("elements.Spinner");
- let spinnerIntro = "";
- if (this.props.spinnerState === "joining") {
- spinnerIntro = _t("Joining room...");
- }
- return (
-
);
+ 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) {
+ return MessageCase.Joining;
+ } else if (this.props.rejecting) {
+ return MessageCase.Rejecting;
+ } else if (this.props.loading || this.state.busy) {
+ return MessageCase.Loading;
+ }
+
+ if (this.props.inviterName) {
+ if (this.props.invitedEmail) {
+ if (this.state.threePidFetchError) {
+ return MessageCase.OtherThreePIDError;
+ } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().getUserId()) {
+ return MessageCase.InvitedEmailMismatch;
+ }
+ }
+ return MessageCase.Invite;
+ } else if (this.props.error) {
+ if (this.props.error.errcode == 'M_NOT_FOUND') {
+ return MessageCase.RoomNotFound;
+ } else {
+ return MessageCase.OtherError;
+ }
+ } else {
+ return MessageCase.ViewingRoom;
+ }
+ },
+
+ _getKickOrBanInfo() {
const myMember = this.props.room ?
this.props.room.getMember(MatrixClientPeg.get().getUserId()) :
null;
- const kicked = myMember && myMember.isKicked();
- const banned = myMember && myMember && myMember.membership == 'ban';
+ if (!myMember) {
+ return {};
+ }
+ const kickerMember = this.props.room.currentState.getMember(
+ myMember.events.member.getSender(),
+ );
+ const memberName = kickerMember ?
+ kickerMember.name : myMember.events.member.getSender();
+ const reason = myMember.events.member.getContent().reason;
+ return {memberName, reason};
+ },
- if (this.props.inviterName) {
- let emailMatchBlock;
- if (this.props.invitedEmail) {
- if (this.state.threePidFetchError) {
- emailMatchBlock = { spinnerIntro }
-
- { _t("Unable to ascertain that the address this invite was sent to matches one associated with your account.") }
-
;
- } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
- emailMatchBlock =
-
-
;
- }
- }
- joinBlock = (
-
- ![/!\\]({require("../../../../res/img/warning.svg")} "/!\\")
-
-
-
- { _t("This invitation was sent to an email address which is not associated with this account:") }
- { this.props.invitedEmail }
-
- { _t("You may wish to login with a different account, or add this email to this account.") } -
- - { _t("You may wish to login with a different account, or add this email to this account.") } -
-
- );
- } else if (kicked || banned) {
- const roomName = this._roomNameElement();
- const kickerMember = this.props.room.currentState.getMember(
- myMember.events.member.getSender(),
- );
- const kickerName = kickerMember ?
- kickerMember.name : myMember.events.member.getSender();
- let reason;
- if (myMember.events.member.getContent().reason) {
- reason =
- { _t('You have been invited to join this room by %(inviterName)s', {inviterName: this.props.inviterName}) }
-
-
- { emailMatchBlock }
- { _t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason}) }
;
- }
- let rejoinBlock;
- if (!banned) {
- rejoinBlock = ;
+ _joinRule: function() {
+ const room = this.props.room;
+ if (room) {
+ const joinRules = room.currentState.getStateEvents('m.room.join_rules', '');
+ if (joinRules) {
+ return joinRules.getContent().join_rule;
}
+ }
+ },
- let actionText;
- if (kicked) {
- if (roomName) {
- actionText = _t("You have been kicked from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
- } else {
- actionText = _t("You have been kicked from this room by %(userName)s.", {userName: kickerName});
- }
- } else if (banned) {
- if (roomName) {
- actionText = _t("You have been banned from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
- } else {
- actionText = _t("You have been banned from this room by %(userName)s.", {userName: kickerName});
- }
- } // no other options possible due to the kicked || banned check above.
-
- joinBlock = (
-
-
- );
- } else if (this.props.error) {
- const name = this.props.roomAlias || _t("This room");
- let error;
- if (this.props.error.errcode == 'M_NOT_FOUND') {
- error = _t("%(roomName)s does not exist.", {roomName: name});
- } else {
- error = _t("%(roomName)s is not accessible at this time.", {roomName: name});
- }
- joinBlock = (
-
- { actionText }
-
- { reason } - { rejoinBlock } - { _t("Forget room") } -
- - { reason } - { rejoinBlock } - { _t("Forget room") } -
-
- );
+ _roomName: function(atStart = false) {
+ const name = this.props.room ? this.props.room.name : this.props.roomAlias;
+ if (name) {
+ return name;
+ } else if (atStart) {
+ return _t("This room");
} else {
- const name = this._roomNameElement();
- joinBlock = (
-
- { error }
-
-
-
+ return _t("this room");
+ }
+ },
+
+ _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' });
+ },
+
+ onRegisterClick: function() {
+ dis.dispatch({ action: 'start_registration' });
+ },
+
+ render: function() {
+ let showSpinner = false;
+ let darkStyle = false;
+ let title;
+ let subTitle;
+ let primaryActionHandler;
+ let primaryActionLabel;
+ let secondaryActionHandler;
+ let secondaryActionLabel;
+
+ const messageCase = this._getMessageCase();
+ switch (messageCase) {
+ case MessageCase.Joining: {
+ title = _t("Joining room …");
+ showSpinner = true;
+ break;
+ }
+ case MessageCase.Loading: {
+ title = _t("Loading …");
+ showSpinner = true;
+ break;
+ }
+ case MessageCase.Rejecting: {
+ title = _t("Rejecting invite …");
+ showSpinner = true;
+ break;
+ }
+ case MessageCase.NotLoggedIn: {
+ darkStyle = true;
+ title = _t("Join the conversation with an account");
+ primaryActionLabel = _t("Sign Up");
+ primaryActionHandler = this.onRegisterClick;
+ secondaryActionLabel = _t("Sign In");
+ secondaryActionHandler = this.onLoginClick;
+ break;
+ }
+ case MessageCase.Kicked: {
+ const {memberName, reason} = this._getKickOrBanInfo();
+ title = _t("You were kicked from %(roomName)s by %(memberName)s",
+ {memberName, roomName: this._roomName()});
+ subTitle = _t("Reason: %(reason)s", {reason});
+
+ if (this._joinRule() === "invite") {
+ primaryActionLabel = _t("Forget this room");
+ primaryActionHandler = this.props.onForgetClick;
+ } else {
+ primaryActionLabel = _t("Re-join");
+ primaryActionHandler = this.props.onJoinClick;
+ secondaryActionLabel = _t("Forget this room");
+ secondaryActionHandler = this.props.onForgetClick;
+ }
+ break;
+ }
+ case MessageCase.Banned: {
+ const {memberName, reason} = this._getKickOrBanInfo();
+ title = _t("You were banned from %(roomName)s by %(memberName)s",
+ {memberName, roomName: this._roomName()});
+ subTitle = _t("Reason: %(reason)s", {reason});
+ primaryActionLabel = _t("Forget this room");
+ primaryActionHandler = this.props.onForgetClick;
+ break;
+ }
+ case MessageCase.OtherThreePIDError: {
+ title = _t("Something went wrong with your invite to this room");
+ const joinRule = this._joinRule();
+ const errCodeMessage = _t("%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.",
+ {errcode: this.state.threePidFetchError.errcode},
+ );
+ switch (joinRule) {
+ case "invite":
+ subTitle = [
+ _t("You can only join it with a working invite."),
+ errCodeMessage,
+ ];
+ break;
+ case "public":
+ subTitle = _t("You can still join it because this is a public room.");
+ primaryActionLabel = _t("Join the discussion");
+ primaryActionHandler = this.props.onJoinClick;
+ break;
+ default:
+ subTitle = errCodeMessage;
+ primaryActionLabel = _t("Try to join anyway");
+ primaryActionHandler = this.props.onJoinClick;
+ break;
+ }
+ break;
+ }
+ case MessageCase.InvitedEmailMismatch: {
+ title = _t("The room invite wasn't sent to your account");
+ const joinRule = this._joinRule();
+ if (joinRule === "public") {
+ subTitle = _t("You can still join it because this is a public room.");
+ primaryActionLabel = _t("Join the discussion");
+ primaryActionHandler = this.props.onJoinClick;
+ } else {
+ subTitle = _t("Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.", {email: this.props.invitedEmail});
+ if (joinRule !== "invite") {
+ primaryActionLabel = _t("Try to join anyway");
+ primaryActionHandler = this.props.onJoinClick;
+ }
+ }
+ break;
+ }
+ case MessageCase.Invite: {
+ const inviteMember = this._getInviteMember();
+ let avatar;
+ let inviterElement;
+ if (inviteMember) {
+ const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
+ avatar = (
- { name ? _t('You are trying to access %(roomName)s.', {roomName: name}) : _t('You are trying to access a room.') }
-
- { _t("Click here to join the discussion!", - {}, - { 'a': (sub) => { sub } }, - ) } -
- - { _t("Click here to join the discussion!", - {}, - { 'a': (sub) => { sub } }, - ) } -
{t}
); + } + + let titleElement; + if (showSpinner) { + titleElement =
;
+ } else {
+ titleElement = { title }
; + } + + let primaryButton; + if (primaryActionHandler) { + primaryButton = ( +
- { _t('This is a preview of this room. Room interactions have been disabled') }.
-
+ let secondaryButton;
+ if (secondaryActionHandler) {
+ secondaryButton = (
+
-
- { joinBlock }
- { previewBlock }
+ accept or decline this invitation?": "Would you like to accept or decline this invitation?",
- "Reason: %(reasonText)s": "Reason: %(reasonText)s",
- "Rejoin": "Rejoin",
- "You have been kicked from %(roomName)s by %(userName)s.": "You have been kicked from %(roomName)s by %(userName)s.",
- "You have been kicked from this room by %(userName)s.": "You have been kicked from this room by %(userName)s.",
- "You have been banned from %(roomName)s by %(userName)s.": "You have been banned from %(roomName)s by %(userName)s.",
- "You have been banned from this room by %(userName)s.": "You have been banned from this room by %(userName)s.",
"This room": "This room",
+ "Joining room …": "Joining room …",
+ "Loading …": "Loading …",
+ "Rejecting invite …": "Rejecting invite …",
+ "Join the conversation with an account": "Join the conversation with an account",
+ "Sign Up": "Sign Up",
+ "Sign In": "Sign In",
+ "You were kicked from %(roomName)s by %(memberName)s": "You were kicked from %(roomName)s by %(memberName)s",
+ "Reason: %(reason)s": "Reason: %(reason)s",
+ "Forget this room": "Forget this room",
+ "Re-join": "Re-join",
+ "You were banned from %(roomName)s by %(memberName)s": "You were banned from %(roomName)s by %(memberName)s",
+ "Something went wrong with your invite to this room": "Something went wrong with your invite to this room",
+ "%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.": "%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.",
+ "You can only join it with a working invite.": "You can only join it with a working invite.",
+ "You can still join it because this is a public room.": "You can still join it because this is a public room.",
+ "Join the discussion": "Join the discussion",
+ "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.",
+ "Do you want to join this room?": "Do you want to join this room?",
+ "submit a bug report .": "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report .",
"Use Key Backup": "Use Key Backup",
"Never lose encrypted messages": "Never lose encrypted messages",
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
@@ -1245,7 +1256,6 @@
"Reject invitation": "Reject invitation",
"Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
"Unable to reject invite": "Unable to reject invite",
- "Reject": "Reject",
"You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
"Resend": "Resend",
"Cancel Sending": "Cancel Sending",
@@ -1279,7 +1289,6 @@
"Hide": "Hide",
"Home": "Home",
"Sign in": "Sign in",
- "Login": "Login",
"powered by Matrix": "powered by Matrix",
"This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
"Custom Server Options": "Custom Server Options",
diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.js
index 435b33ac5d..b461d22079 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.js
@@ -58,3 +58,8 @@ export function hashCode(str) {
}
return Math.abs(hash);
}
+
+export function getUserNameColorClass(userId) {
+ const colorNumber = (hashCode(userId) % 8) + 1;
+ return `mx_Username_color${colorNumber}`;
+}
+
);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d0f265e430..2b50fd9ad3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -601,7 +601,7 @@
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
"Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
"this room": "this room",
- "View older messages in %(roomName)s": "View older messages in %(roomName)s",
+ "View older messages in %(roomName)s.": "View older messages in %(roomName)s.",
"Room information": "Room information",
"Internal room ID:": "Internal room ID:",
"Room version": "Room version",
@@ -792,25 +792,36 @@
"Low priority": "Low priority",
"Historical": "Historical",
"System Alerts": "System Alerts",
- "Joining room...": "Joining room...",
- "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.",
- "This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:",
- "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
- "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(inviterName)s",
- "Would you like to
+ { titleElement }
+ { subTitleElements }
+
+
+ { secondaryButton }
+ { primaryButton }