Merge branch 'vector' into irc-style-commands

src/ComponentBroker.js

@@ -63,6 +63,8 @@ require('../skins/base/views/atoms/EnableNotificationsButton');
 require('../skins/base/views/atoms/MessageTimestamp');
 require('../skins/base/views/atoms/create_room/CreateRoomButton');
 require('../skins/base/views/atoms/create_room/RoomNameTextbox');
+require('../skins/base/views/atoms/create_room/RoomTopic');
+require('../skins/base/views/atoms/create_room/RoomAlias');
 require('../skins/base/views/atoms/create_room/Presets');
 require('../skins/base/views/atoms/EditableText');
 require('../skins/base/views/molecules/MatrixToolbar');

src/controllers/atoms/create_room/Presets.js

@@ -18,24 +18,23 @@ limitations under the License.
 
 var React = require('react');
 
+var Presets = {
+    PrivateChat: "private_chat",
+    PublicChat: "public_chat",
+    Custom: "custom",
+};
+
 module.exports = {
     propTypes: {
-        default_preset: React.PropTypes.string
+        onChange: React.PropTypes.func,
+        preset: React.PropTypes.string
     },
 
+    Presets: Presets,
+
     getDefaultProps: function() {
         return {
-            default_preset: 'private_chat',
+            onChange: function() {},
         };
     },
-
-    getInitialState: function() {
-        return {
-            preset: this.props.default_preset,
-        }
-    },
-
-    getPreset: function() {
-        return this.state.preset;
-    },
 };

src/controllers/atoms/create_room/RoomAlias.js

@@ -20,22 +20,30 @@ var React = require('react');
 
 module.exports = {
     propTypes: {
-        default_name: React.PropTypes.string
+        // Specifying a homeserver will make magical things happen when you,
+        // e.g. start typing in the room alias box.
+        homeserver: React.PropTypes.string,
+        alias: React.PropTypes.string,
+        onChange: React.PropTypes.func,
     },
 
     getDefaultProps: function() {
         return {
-            default_name: '',
+            onChange: function() {},
+            alias: '',
         };
     },
 
-    getInitialState: function() {
-        return {
-            room_name: this.props.default_name,
-        }
-    },
+    getAliasLocalpart: function() {
+        var room_alias = this.props.alias;
 
-    getName: function() {
-        return this.state.room_name;
+        if (room_alias && this.props.homeserver) {
+            var suffix = ":" + this.props.homeserver;
+            if (room_alias.startsWith("#") && room_alias.endsWith(suffix)) {
+                room_alias = room_alias.slice(1, -suffix.length);
+            }
+        }
+
+        return room_alias;
     },
 };

src/controllers/molecules/UserSelector.js

@@ -20,38 +20,26 @@ var React = require('react');
 
 module.exports = {
     propTypes: {
-        initially_selected: React.PropTypes.arrayOf(React.PropTypes.string),
+        onChange: React.PropTypes.func,
+        selected_users: React.PropTypes.arrayOf(React.PropTypes.string),
     },
 
     getDefaultProps: function() {
         return {
-            initially_selected: [],
+            onChange: function() {},
+            selected: [],
         };
     },
 
-    getInitialState: function() {
-        return {
-            selected_users: this.props.initially_selected,
-        }
-    },
-
     addUser: function(user_id) {
-        if (this.state.selected_users.indexOf(user_id == -1)) {
-            this.setState({
-                selected_users: this.state.selected_users.concat([user_id]),
-            });
+        if (this.props.selected_users.indexOf(user_id == -1)) {
+            this.props.onChange(this.props.selected_users.concat([user_id]));
         }
     },
 
     removeUser: function(user_id) {
-        this.setState({
-            selected_users: this.state.selected_users.filter(function(e) {
-                return e != user_id;
-            }),
-        });
+        this.props.onChange(this.props.selected_users.filter(function(e) {
+            return e != user_id;
+        }));
     },
-
-    getUserIds: function() {
-        return this.state.selected_users;
-    }
 };

src/controllers/organisms/CreateRoom.js

@@ -18,6 +18,7 @@ limitations under the License.
 
 var React = require("react");
 var MatrixClientPeg = require("../../MatrixClientPeg");
+var PresetValues = require('../atoms/create_room/Presets').Presets;
 
 module.exports = {
     propTypes: {
@@ -41,25 +42,52 @@ module.exports = {
         return {
             phase: this.phases.CONFIG,
             error_string: "",
+            is_private: true,
+            share_history: false,
+            default_preset: PresetValues.PrivateChat,
+            topic: '',
+            room_name: '',
+            invited_users: [],
         };
     },
 
     onCreateRoom: function() {
         var options = {};
 
-        var room_name = this.getName();
-        if (room_name) {
-            options.name = room_name;
+        if (this.state.room_name) {
+            options.name = this.state.room_name;
         }
 
-        var preset = this.getPreset();
-        if (preset) {
-            options.preset = preset;
+        if (this.state.topic) {
+            options.topic = this.state.topic;
         }
 
-        var invited_users = this.getInvitedUsers();
-        if (invited_users) {
-            options.invite = invited_users;
+        if (this.state.preset) {
+            if (this.state.preset != PresetValues.Custom) {
+                options.preset = this.state.preset;
+            } else {
+                options.initial_state = [
+                    {
+                        type: "m.room.join_rules",
+                        content: {
+                            "join_rules": this.state.is_private ? "invite" : "public"
+                        }
+                    },
+                    {
+                        type: "m.room.history_visibility",
+                        content: {
+                            "history_visibility": this.state.share_history ? "shared" : "invited"
+                        }
+                    },
+                ];
+            }
+        }
+
+        options.invite = this.state.invited_users;
+
+        var alias = this.getAliasLocalpart();
+        if (alias) {
+            options.room_alias_name = alias;
         }
 
         var cli = MatrixClientPeg.get();
@@ -77,11 +105,11 @@ module.exports = {
 
         var self = this;
 
-        deferred.then(function () {
+        deferred.then(function (resp) {
             self.setState({
                 phase: self.phases.CREATED,
             });
-            self.props.onRoomCreated();
+            self.props.onRoomCreated(resp.room_id);
         }, function(err) {
             self.setState({
                 phase: self.phases.ERROR,

src/controllers/pages/MatrixChat.js

@@ -32,6 +32,11 @@ module.exports = {
     PageTypes: {
         RoomView: "room_view",
         UserSettings: "user_settings",
+        CreateRoom: "create_room",
+    },
+
+    AuxPanel: {
+        RoomSettings: "room_settings",
     },
 
     getInitialState: function() {
@@ -39,6 +44,7 @@ module.exports = {
             logged_in: !!(MatrixClientPeg.get() && MatrixClientPeg.get().credentials),
             ready: false,
             page_type: this.PageTypes.RoomView,
+            aux_panel: null,
         };
     },
 
@@ -143,6 +149,11 @@ module.exports = {
                     page_type: this.PageTypes.UserSettings,
                 });
                 break;
+            case 'view_create_room':
+                this.setState({
+                    page_type: this.PageTypes.CreateRoom,
+                });
+                break;
         }
     },
 

src/controllers/templates/Login.js

@@ -41,18 +41,18 @@ module.exports = {
     onHSChosen: function(ev) {
         ev.preventDefault();
         MatrixClientPeg.replaceUsingUrls(
-            this.refs.serverConfig.getHsUrl(),
-            this.refs.serverConfig.getIsUrl()
+            this.getHsUrl(),
+            this.getIsUrl()
         );
         this.setState({
-            hs_url: this.refs.serverConfig.getHsUrl(),
-            is_url: this.refs.serverConfig.getIsUrl()
+            hs_url: this.getHsUrl(),
+            is_url: this.getIsUrl()
         });
         this.setStep("fetch_stages");
         var cli = MatrixClientPeg.get();
         this.setState({busy: true});
         var that = this;
-        cli.loginFlows().then(function(result) {
+        cli.loginFlows().done(function(result) {
             that.setState({
                 flows: result.flows,
                 currentStep: 1,
@@ -69,9 +69,12 @@ module.exports = {
         ev.preventDefault();
         this.setState({busy: true});
         var that = this;
+
+        var formVals = this.getFormVals();
+
         MatrixClientPeg.get().login('m.login.password', {
-            'user': that.refs.user.getDOMNode().value,
-            'password': that.refs.pass.getDOMNode().value
+            'user': formVals.username,
+            'password': formVals.password
         }).done(function(data) {
             // XXX: we assume this means we're logged in, but there could be a next stage
             MatrixClientPeg.replace(Matrix.createClient({