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

Merge pull request #2818 from matrix-org/travis/leave-room-chain 

Use leaveRoomChain when leaving a room
pull/21833/head
Travis Ralston 2019-03-25 09:57:17 -06:00 committed by GitHub
parent 7b972e476f 389abed574
commit a9ea74610a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SlashCommands.js
View File

@ -431,7 +431,7 @@ export const CommandMap = {
if (!targetRoomId) targetRoomId = roomId; if (!targetRoomId) targetRoomId = roomId;
return success( return success(
cli.leave(targetRoomId).then(function() { cli.leaveRoomChain(targetRoomId).then(function() {
dis.dispatch({action: 'view_next_room'}); dis.dispatch({action: 'view_next_room'});
}), }),
); );

44
src/components/structures/MatrixChat.js
View File

@ -1058,34 +1058,48 @@ export default React.createClass({
button: _t("Leave"), button: _t("Leave"),
onFinished: (shouldLeave) => { onFinished: (shouldLeave) => {
if (shouldLeave) { if (shouldLeave) {
const d = MatrixClientPeg.get().leave(roomId); const d = MatrixClientPeg.get().leaveRoomChain(roomId);
// FIXME: controller shouldn't be loading a view :( // FIXME: controller shouldn't be loading a view :(
const Loader = sdk.getComponent("elements.Spinner"); const Loader = sdk.getComponent("elements.Spinner");
const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner'); const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
d.then(() => { d.then((errors) => {
modal.close(); modal.close();
for (const leftRoomId of Object.keys(errors)) {
const err = errors[leftRoomId];
if (!err) continue;
console.error("Failed to leave room " + leftRoomId + " " + err);
let title = _t("Failed to leave room");
let message = _t("Server may be unavailable, overloaded, or you hit a bug.");
if (err.errcode === 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
title = _t("Can't leave Server Notices room");
message = _t(
"This room is used for important messages from the Homeserver, " +
"so you cannot leave it.",
);
} else if (err && err.message) {
message = err.message;
}
Modal.createTrackedDialog('Failed to leave room', '', ErrorDialog, {
title: title,
description: message,
});
return;
}
if (this.state.currentRoomId === roomId) { if (this.state.currentRoomId === roomId) {
dis.dispatch({action: 'view_next_room'}); dis.dispatch({action: 'view_next_room'});
} }
}, (err) => { }, (err) => {
// This should only happen if something went seriously wrong with leaving the chain.
modal.close(); modal.close();
console.error("Failed to leave room " + roomId + " " + err); console.error("Failed to leave room " + roomId + " " + err);
let title = _t("Failed to leave room");
let message = _t("Server may be unavailable, overloaded, or you hit a bug.");
if (err.errcode == 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
title = _t("Can't leave Server Notices room");
message = _t(
"This room is used for important messages from the Homeserver, " +
"so you cannot leave it.",
);
} else if (err && err.message) {
message = err.message;
}
Modal.createTrackedDialog('Failed to leave room', '', ErrorDialog, { Modal.createTrackedDialog('Failed to leave room', '', ErrorDialog, {
title: title, title: _t("Failed to leave room"),
description: message, description: _t("Unknown error"),
}); });
}); });
} }