+
+ );
+ },
+
render: function() {
var self = this;
var Loader = sdk.getComponent("elements.Spinner");
@@ -299,7 +318,7 @@ module.exports = React.createClass({
onValueChanged={ this.onAddThreepidClicked } />
Cryptography
+
+
+ -
+
- Device ID: {deviceId} +
- Device key: {olmKey} +
- 
+
);
@@ -333,7 +352,7 @@ module.exports = React.createClass({
+
Notifications
-
);
}
@@ -390,6 +409,8 @@ module.exports = React.createClass({
{notification_area}
+ {this._renderDeviceInfo()}
+
Advanced
@@ -403,9 +424,8 @@ module.exports = React.createClass({
Identity Server is { MatrixClientPeg.get().getIdentityServerUrl() }
- Version {this.state.clientVersion}
-
- {this.props.version} + matrix-react-sdk version: {this.state.clientVersion}
+ vector-web version: {this.props.version}
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index d852991b9c..2f15a3b5df 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -22,6 +22,7 @@ var sdk = require('../../../index');
var dis = require('../../../dispatcher');
var Signup = require("../../../Signup");
var ServerConfig = require("../../views/login/ServerConfig");
+var MatrixClientPeg = require("../../../MatrixClientPeg");
var RegistrationForm = require("../../views/login/RegistrationForm");
var CaptchaForm = require("../../views/login/CaptchaForm");
@@ -40,6 +41,7 @@ module.exports = React.createClass({
customIsUrl: React.PropTypes.string,
defaultHsUrl: React.PropTypes.string,
defaultIsUrl: React.PropTypes.string,
+ brand: React.PropTypes.string,
email: React.PropTypes.string,
username: React.PropTypes.string,
guestAccessToken: React.PropTypes.string,
@@ -145,6 +147,26 @@ module.exports = React.createClass({
identityServerUrl: self.registerLogic.getIdentityServerUrl(),
accessToken: response.access_token
});
+
+ if (self.props.brand) {
+ MatrixClientPeg.get().getPushers().done((resp)=>{
+ var pushers = resp.pushers;
+ for (var i = 0; i < pushers.length; ++i) {
+ if (pushers[i].kind == 'email') {
+ var emailPusher = pushers[i];
+ emailPusher.data = { brand: self.props.brand };
+ MatrixClientPeg.get().setPusher(emailPusher).done(() => {
+ console.log("Set email branding to " + self.props.brand);
+ }, (error) => {
+ console.error("Couldn't set email branding: " + error);
+ });
+ }
+ }
+ }, (error) => {
+ console.error("Couldn't get pushers: " + error);
+ });
+ }
+
}, function(err) {
if (err.message) {
self.setState({
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index d81ae98718..fed7ff079a 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -39,11 +39,11 @@ module.exports = React.createClass({
focus: true
};
},
-
+
componentDidMount: function() {
if (this.props.focus) {
- // Set the cursor at the end of the text input
- this.refs.textinput.value = this.props.value;
+ // Set the cursor at the end of the text input
+ this.refs.textinput.value = this.props.value;
}
},
@@ -83,13 +83,12 @@ module.exports = React.createClass({
- {this.props.version} + matrix-react-sdk version: {this.state.clientVersion}
+ vector-web version: {this.props.version}
-
-
+
);
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 83bd1ab17c..a172d77bb4 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -17,8 +17,8 @@ limitations under the License.
'use strict';
var React = require('react');
-var Velocity = require('velocity-animate');
-require('velocity-ui-pack');
+var Velocity = require('velocity-vector');
+require('velocity-vector/velocity.ui');
var sdk = require('../../../index');
var Email = require('../../../email');
var Modal = require("../../../Modal");
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index a72608d329..310da598fa 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -45,9 +45,9 @@ module.exports = React.createClass({
getInitialState: function() {
return {
- // the URL (if any) to be previewed with a LinkPreviewWidget
+ // the URLs (if any) to be previewed with a LinkPreviewWidget
// inside this TextualBody.
- link: null,
+ links: [],
// track whether the preview widget is hidden
widgetHidden: false,
@@ -57,9 +57,11 @@ module.exports = React.createClass({
componentDidMount: function() {
linkifyElement(this.refs.content, linkifyMatrix.options);
- var link = this.findLink(this.refs.content.children);
- if (link) {
- this.setState({ link: link.getAttribute("href") });
+ var links = this.findLinks(this.refs.content.children);
+ if (links.length) {
+ this.setState({ links: links.map((link)=>{
+ return link.getAttribute("href");
+ })});
// lazy-load the hidden state of the preview widget from localstorage
if (global.localStorage) {
@@ -74,27 +76,32 @@ module.exports = React.createClass({
shouldComponentUpdate: function(nextProps, nextState) {
// exploit that events are immutable :)
+ // ...and that .links is only ever set in componentDidMount and never changes
return (nextProps.mxEvent.getId() !== this.props.mxEvent.getId() ||
nextProps.highlights !== this.props.highlights ||
nextProps.highlightLink !== this.props.highlightLink ||
- nextState.link !== this.state.link ||
+ nextState.links !== this.state.links ||
nextState.widgetHidden !== this.state.widgetHidden);
},
- findLink: function(nodes) {
+ findLinks: function(nodes) {
+ var links = [];
for (var i = 0; i < nodes.length; i++) {
var node = nodes[i];
if (node.tagName === "A" && node.getAttribute("href"))
{
- return this.isLinkPreviewable(node) ? node : undefined;
+ if (this.isLinkPreviewable(node)) {
+ links.push(node);
+ }
}
else if (node.tagName === "PRE" || node.tagName === "CODE") {
- return;
+ continue;
}
else if (node.children && node.children.length) {
- return this.findLink(node.children)
+ links = links.concat(this.findLinks(node.children));
}
}
+ return links;
},
isLinkPreviewable: function(node) {
@@ -160,14 +167,17 @@ module.exports = React.createClass({
{highlightLink: this.props.highlightLink});
- var widget;
- if (this.state.link && !this.state.widgetHidden) {
+ var widgets;
+ if (this.state.links.length && !this.state.widgetHidden) {
var LinkPreviewWidget = sdk.getComponent('rooms.LinkPreviewWidget');
- widget =
+ Verify
+
+ );
+ }
+ return (
+
+
+ );
+ },
+});
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 76e5af7612..1eee280eb5 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -30,27 +30,106 @@ var MatrixClientPeg = require("../../../MatrixClientPeg");
var dis = require("../../../dispatcher");
var Modal = require("../../../Modal");
var sdk = require('../../../index');
+var createRoom = require('../../../createRoom');
module.exports = React.createClass({
displayName: 'MemberInfo',
+ propTypes: {
+ member: React.PropTypes.object.isRequired,
+ onFinished: React.PropTypes.func,
+ },
+
getDefaultProps: function() {
return {
onFinished: function() {}
};
},
- componentDidMount: function() {
- // work out the current state
- if (this.props.member) {
- var memberState = this._calculateOpsPermissions(this.props.member);
- this.setState(memberState);
+ getInitialState: function() {
+ return {
+ can: {
+ kick: false,
+ ban: false,
+ mute: false,
+ modifyLevel: false
+ },
+ muted: false,
+ isTargetMod: false,
+ updating: 0,
+ devicesLoading: true,
+ devices: null,
}
},
+
+ componentWillMount: function() {
+ this._cancelDeviceList = null;
+ },
+
+ componentDidMount: function() {
+ this._updateStateForNewMember(this.props.member);
+ MatrixClientPeg.get().on("deviceVerified", this.onDeviceVerified);
+ },
+
componentWillReceiveProps: function(newProps) {
- var memberState = this._calculateOpsPermissions(newProps.member);
- this.setState(memberState);
+ if (this.props.member.userId != newProps.member.userId) {
+ this._updateStateForNewMember(newProps.member);
+ }
+ },
+
+ componentWillUnmount: function() {
+ var client = MatrixClientPeg.get();
+ if (client) {
+ client.removeListener("deviceVerified", this.onDeviceVerified);
+ }
+ if (this._cancelDeviceList) {
+ this._cancelDeviceList();
+ }
+ },
+
+ onDeviceVerified: function(userId, device) {
+ if (userId == this.props.member.userId) {
+ // no need to re-download the whole thing; just update our copy of
+ // the list.
+ var devices = MatrixClientPeg.get().listDeviceKeys(userId);
+ this.setState({devices: devices});
+ }
+ },
+
+ _updateStateForNewMember: function(member) {
+ var newState = this._calculateOpsPermissions(member);
+ newState.devicesLoading = true;
+ newState.devices = null;
+ this.setState(newState);
+
+ if (this._cancelDeviceList) {
+ this._cancelDeviceList();
+ this._cancelDeviceList = null;
+ }
+
+ this._downloadDeviceList(member);
+ },
+
+ _downloadDeviceList: function(member) {
+ var cancelled = false;
+ this._cancelDeviceList = function() { cancelled = true; }
+
+ var client = MatrixClientPeg.get();
+ var self = this;
+ client.downloadKeys([member.userId], true).finally(function() {
+ self._cancelDeviceList = null;
+ }).done(function() {
+ if (cancelled) {
+ // we got cancelled - presumably a different user now
+ return;
+ }
+ var devices = client.listDeviceKeys(member.userId);
+ self.setState({devicesLoading: false, devices: devices});
+ }, function(err) {
+ console.log("Error downloading devices", err);
+ self.setState({devicesLoading: false});
+ });
},
onKick: function() {
@@ -315,50 +394,15 @@ module.exports = React.createClass({
this.props.onFinished();
}
else {
- if (MatrixClientPeg.get().isGuest()) {
- var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
- Modal.createDialog(NeedToRegisterDialog, {
- title: "Please Register",
- description: "Guest users can't create new rooms. Please register to create room and start a chat."
- });
- self.props.onFinished();
- return;
- }
-
self.setState({ updating: self.state.updating + 1 });
- MatrixClientPeg.get().createRoom({
- // XXX: FIXME: deduplicate this with "view_create_room" in MatrixChat
- invite: [this.props.member.userId],
- preset: "private_chat",
- // Allow guests by default since the room is private and they'd
- // need an invite. This means clicking on a 3pid invite email can
- // actually drop you right in to a chat.
- initial_state: [
- {
- content: {
- guest_access: 'can_join'
- },
- type: 'm.room.guest_access',
- state_key: '',
- }
- ],
- }).then(
- function(res) {
- dis.dispatch({
- action: 'view_room',
- room_id: res.room_id
- });
- self.props.onFinished();
- }, function(err) {
- Modal.createDialog(ErrorDialog, {
- title: "Failure to start chat",
- description: err.message
- });
- self.props.onFinished();
- }
- ).finally(()=>{
+ createRoom({
+ createOpts: {
+ invite: [this.props.member.userId],
+ },
+ }).finally(function() {
+ self.props.onFinished();
self.setState({ updating: self.state.updating - 1 });
- });
+ }).done();
}
},
@@ -367,21 +411,7 @@ module.exports = React.createClass({
action: 'leave_room',
room_id: this.props.member.roomId,
});
- this.props.onFinished();
- },
-
- getInitialState: function() {
- return {
- can: {
- kick: false,
- ban: false,
- mute: false,
- modifyLevel: false
- },
- muted: false,
- isTargetMod: false,
- updating: 0,
- }
+ this.props.onFinished();
},
_calculateOpsPermissions: function(member) {
@@ -475,6 +505,36 @@ module.exports = React.createClass({
Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
},
+ _renderDevices: function() {
+ var devices = this.state.devices;
+ var MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
+ var Spinner = sdk.getComponent("elements.Spinner");
+
+ var devComponents;
+ if (this.state.devicesLoading) {
+ // still loading
+ devComponents = {this.props.device.id}
+ {this.props.device.key}
+ {indicator}
+ {button}
+
+
+ );
+ },
+
render: function() {
var startChat, kickButton, banButton, muteButton, giveModButton, spinner;
if (this.props.member.userId !== MatrixClientPeg.get().credentials.userId) {
@@ -551,6 +611,8 @@ module.exports = React.createClass({
{ startChat }
+ { this._renderDevices() }
+
{ adminTools }
{ spinner }
@@ -558,4 +620,3 @@ module.exports = React.createClass({
);
}
});
-
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index f029c519bc..328f9774c7 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -166,6 +166,25 @@ module.exports = React.createClass({
});
}, 500),
+ onThirdPartyInvite: function(inputText) {
+ var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
+ Modal.createDialog(TextInputDialog, {
+ title: "Invite members by email",
+ description: "Please enter one or more email addresses",
+ value: inputText,
+ button: "Invite",
+ onFinished: (should_invite, addresses)=>{
+ if (should_invite) {
+ // defer the actual invite to the next event loop to give this
+ // Modal a chance to unmount in case onInvite() triggers a new one
+ setTimeout(()=>{
+ this.onInvite(addresses);
+ }, 0);
+ }
+ }
+ });
+ },
+
onInvite: function(inputText) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
@@ -387,7 +406,9 @@ module.exports = React.createClass({
// console.log(memberA + " and " + memberB + " have same power level");
if (memberA.name && memberB.name) {
// console.log("comparing names: " + memberA.name + " and " + memberB.name);
- return memberA.name.localeCompare(memberB.name);
+ var nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
+ var nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
+ return nameA.localeCompare(nameB);
}
else {
return 0;
@@ -512,6 +533,7 @@ module.exports = React.createClass({
inviteMemberListSection = (
Devices
+ {devComponents} +
+
{ inputBox }
{ list }
- { this.state.query.length ?
: '' }
+ { list ?
: '' }
);
}
diff --git a/src/createRoom.js b/src/createRoom.js
new file mode 100644
index 0000000000..658561e78a
--- /dev/null
+++ b/src/createRoom.js
@@ -0,0 +1,86 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+var MatrixClientPeg = require('./MatrixClientPeg');
+var Modal = require('./Modal');
+var sdk = require('./index');
+var dis = require("./dispatcher");
+
+var q = require('q');
+
+/**
+ * Create a new room, and switch to it.
+ *
+ * Returns a promise which resolves to the room id, or null if the
+ * action was aborted or failed.
+ *
+ * @param {object=} opts parameters for creating the room
+ * @param {object=} opts.createOpts set of options to pass to createRoom call.
+ */
+function createRoom(opts) {
+ var opts = opts || {};
+
+ var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
+ var Loader = sdk.getComponent("elements.Spinner");
+
+ var client = MatrixClientPeg.get();
+ if (client.isGuest()) {
+ Modal.createDialog(NeedToRegisterDialog, {
+ title: "Please Register",
+ description: "Guest users can't create new rooms. Please register to create room and start a chat."
+ });
+ return q(null);
+ }
+
+ // set some defaults for the creation
+ var createOpts = opts.createOpts || {};
+ createOpts.preset = createOpts.preset || 'private_chat';
+ createOpts.visibility = createOpts.visibility || 'private';
+
+ // Allow guests by default since the room is private and they'd
+ // need an invite. This means clicking on a 3pid invite email can
+ // actually drop you right in to a chat.
+ createOpts.initial_state = createOpts.initial_state || [
+ {
+ content: {
+ guest_access: 'can_join'
+ },
+ type: 'm.room.guest_access',
+ state_key: '',
+ }
+ ];
+
+ var modal = Modal.createDialog(Loader);
+
+ return client.createRoom(createOpts).finally(function() {
+ modal.close();
+ }).then(function(res) {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: res.room_id
+ });
+ return res.room_id;
+ }, function(err) {
+ Modal.createDialog(ErrorDialog, {
+ title: "Failure to create room",
+ description: err.toString()
+ });
+ return null;
+ });
+}
+
+module.exports = createRoom;