mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-13 06:35:00 +03:00
6b6e59e0dd
After creating a room, display the activity spinner while we wait for the room to come down the event stream. This was the intention before but I can't see how it would have worked: we were setting the 'joining' flag, but then resetting it by claiming we were already joined in the view_room dispatch. * Send 'joining' instead of 'joined' in view_room dispatch, which will set the corresponding joining flag (ie. to indicate we've sent a request to join the room). Remove the 'joined' flag. * Reset 'joining' to false otherwise on a view_room dispatch to prevent it from leaking between rooms (this may have been the intention of the `if (payload.joined) newState.joining = false`? Fixes https://github.com/vector-im/riot-web/issues/4701
122 lines
4.2 KiB
JavaScript
122 lines
4.2 KiB
JavaScript
/*
|
|
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.
|
|
*/
|
|
|
|
import MatrixClientPeg from './MatrixClientPeg';
|
|
import Modal from './Modal';
|
|
import sdk from './index';
|
|
import { _t } from './languageHandler';
|
|
import dis from "./dispatcher";
|
|
import * as Rooms from "./Rooms";
|
|
|
|
import Promise from 'bluebird';
|
|
|
|
/**
|
|
* Create a new room, and switch to it.
|
|
*
|
|
* @param {object=} opts parameters for creating the room
|
|
* @param {string=} opts.dmUserId If specified, make this a DM room for this user and invite them
|
|
* @param {object=} opts.createOpts set of options to pass to createRoom call.
|
|
*
|
|
* @returns {Promise} which resolves to the room id, or null if the
|
|
* action was aborted or failed.
|
|
*/
|
|
function createRoom(opts) {
|
|
opts = opts || {};
|
|
|
|
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
|
const Loader = sdk.getComponent("elements.Spinner");
|
|
|
|
const client = MatrixClientPeg.get();
|
|
if (client.isGuest()) {
|
|
dis.dispatch({action: 'view_set_mxid'});
|
|
return Promise.resolve(null);
|
|
}
|
|
|
|
const defaultPreset = opts.dmUserId ? 'trusted_private_chat' : 'private_chat';
|
|
|
|
// set some defaults for the creation
|
|
const createOpts = opts.createOpts || {};
|
|
createOpts.preset = createOpts.preset || defaultPreset;
|
|
createOpts.visibility = createOpts.visibility || 'private';
|
|
if (opts.dmUserId && createOpts.invite === undefined) {
|
|
createOpts.invite = [opts.dmUserId];
|
|
}
|
|
if (opts.dmUserId && createOpts.is_direct === undefined) {
|
|
createOpts.is_direct = true;
|
|
}
|
|
|
|
// By default, view the room after creating it
|
|
if (opts.andView === undefined) {
|
|
opts.andView = true;
|
|
}
|
|
|
|
// 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: '',
|
|
},
|
|
];
|
|
|
|
const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
|
|
|
|
let roomId;
|
|
return client.createRoom(createOpts).finally(function() {
|
|
modal.close();
|
|
}).then(function(res) {
|
|
roomId = res.room_id;
|
|
if (opts.dmUserId) {
|
|
return Rooms.setDMRoom(roomId, opts.dmUserId);
|
|
} else {
|
|
return Promise.resolve();
|
|
}
|
|
}).then(function() {
|
|
// NB createRoom doesn't block on the client seeing the echo that the
|
|
// room has been created, so we race here with the client knowing that
|
|
// the room exists, causing things like
|
|
// https://github.com/vector-im/vector-web/issues/1813
|
|
if (opts.andView) {
|
|
dis.dispatch({
|
|
action: 'view_room',
|
|
room_id: roomId,
|
|
should_peek: false,
|
|
// Creating a room will have joined us to the room,
|
|
// so we are expecting the room to come down the sync
|
|
// stream, if it hasn't already.
|
|
joining: true,
|
|
});
|
|
}
|
|
return roomId;
|
|
}, function(err) {
|
|
// We also failed to join the room (this sets joining to false in RoomViewStore)
|
|
dis.dispatch({
|
|
action: 'join_room_error',
|
|
});
|
|
console.error("Failed to create room " + roomId + " " + err);
|
|
Modal.createTrackedDialog('Failure to create room', '', ErrorDialog, {
|
|
title: _t("Failure to create room"),
|
|
description: _t("Server may be unavailable, overloaded, or you hit a bug."),
|
|
});
|
|
return null;
|
|
});
|
|
}
|
|
|
|
module.exports = createRoom;
|