OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor _startDm invite flow to use async/await

pull/21833/head
Germain Souquet 2021-04-14 08:44:33 +01:00
parent d0dfc5df2b
commit 8d95c012ef
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/views/dialogs/InviteDialog.tsx
View File

@ -656,35 +656,30 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
// Check if it's a traditional DM and create the room if required. // Check if it's a traditional DM and create the room if required.
// TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
let createRoomPromise = Promise.resolve(null) as Promise<string | null | boolean>;
const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
if (targetIds.length === 1 && !isSelf) {
createRoomOptions.dmUserId = targetIds[0];
createRoomPromise = createRoom(createRoomOptions);
} else if (isSelf) {
createRoomPromise = createRoom(createRoomOptions);
} else {
// Create a boring room and try to invite the targets manually.
createRoomPromise = createRoom(createRoomOptions).then(roomId => {
return inviteMultipleToRoom(roomId, targetIds);
}).then(result => {
if (this._shouldAbortAfterInviteError(result)) {
return true; // abort
}
});
}
// the createRoom call will show the room for us, so we don't need to worry about that. try {
createRoomPromise.then(abort => { const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
if (abort === true) return; // only abort on true booleans, not roomIds or something if (targetIds.length === 1 && !isSelf) {
this.props.onFinished(); createRoomOptions.dmUserId = targetIds[0];
}).catch(err => { await createRoom(createRoomOptions);
} else if (isSelf) {
await createRoom(createRoomOptions);
} else {
const roomId = await createRoom(createRoomOptions);
const invitesState = await inviteMultipleToRoom(roomId, targetIds);
const abort = this._shouldAbortAfterInviteError(invitesState);
if (abort === false) {
this.props.onFinished();
}
}
} catch (err) {
console.error(err); console.error(err);
this.setState({ this.setState({
busy: false, busy: false,
errorText: _t("We couldn't create your DM."), errorText: _t("We couldn't create your DM."),
}); });
}); }
}; };
_inviteUsers = async () => { _inviteUsers = async () => {