Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite

Wmwragg/chat multi invite

src/Invite.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
+import MultiInviter from './utils/MultiInviter';
 
 const emailRegex = /^\S+@\S+\.\S+$/;
 
@@ -43,3 +44,40 @@ export function inviteToRoom(roomId, addr) {
         throw new Error('Unsupported address');
     }
 }
+
+/**
+ * Invites multiple addresses to a room
+ * Simpler interface to utils/MultiInviter but with
+ * no option to cancel.
+ *
+ * @param {roomId} The ID of the room to invite to
+ * @param {array} Array of strings of addresses to invite. May be matrix IDs or 3pids.
+ * @returns Promise
+ */
+export function inviteMultipleToRoom(roomId, addrs) {
+    this.inviter = new MultiInviter(roomId);
+    return this.inviter.invite(addrs);
+}
+
+/**
+ * Checks is the supplied address is valid
+ *
+ * @param {addr} The mx userId or email address to check
+ * @returns true, false, or null for unsure
+ */
+export function isValidAddress(addr) {
+    // Check if the addr is a valid type
+    var addrType = this.getAddressType(addr);
+    if (addrType === "mx") {
+        let user = MatrixClientPeg.get().getUser(addr);
+        if (user) {
+            return true;
+        } else {
+            return null;
+        }
+    } else if (addrType === "email") {
+        return true;
+    } else {
+        return false;
+    }
+}

src/component-index.js

@@ -57,6 +57,7 @@ module.exports.components['views.dialogs.NeedToRegisterDialog'] = require('./com
 module.exports.components['views.dialogs.QuestionDialog'] = require('./components/views/dialogs/QuestionDialog');
 module.exports.components['views.dialogs.SetDisplayNameDialog'] = require('./components/views/dialogs/SetDisplayNameDialog');
 module.exports.components['views.dialogs.TextInputDialog'] = require('./components/views/dialogs/TextInputDialog');
+module.exports.components['views.elements.AddressSelector'] = require('./components/views/elements/AddressSelector');
 module.exports.components['views.elements.AddressTile'] = require('./components/views/elements/AddressTile');
 module.exports.components['views.elements.EditableText'] = require('./components/views/elements/EditableText');
 module.exports.components['views.elements.EditableTextContainer'] = require('./components/views/elements/EditableTextContainer');

src/components/structures/MatrixChat.js

@@ -385,6 +385,9 @@ module.exports = React.createClass({
             case 'view_create_chat':
                 this._createChat();
                 break;
+            case 'view_invite':
+                this._invite(payload.roomId);
+                break;
             case 'notifier_enabled':
                 this.forceUpdate();
                 break;
@@ -524,7 +527,17 @@ module.exports = React.createClass({
     _createChat: function() {
         var ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
         Modal.createDialog(ChatInviteDialog, {
-            title: "Start a one to one chat",
+            title: "Start a new chat",
+        });
+    },
+
+    _invite: function(roomId) {
+        var ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
+        Modal.createDialog(ChatInviteDialog, {
+            title: "Invite new room members",
+            button: "Send Invites",
+            description: "Who would you like to add to this room?",
+            roomId: roomId,
         });
     },