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

improve 'no known servers' error

pull/21833/head
Matthew Hodgson 2016-04-12 13:00:52 +01:00
parent f9785f68af
commit 38d27cdbb0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/RoomView.js
View File

@ -586,6 +586,7 @@ module.exports = React.createClass({
if (!error) return; if (!error) return;
// https://matrix.org/jira/browse/SYN-659 // https://matrix.org/jira/browse/SYN-659
// Need specific error message if joining a room is refused because the user is a guest and guest access is not allowed
if ( if (
error.errcode == 'M_GUEST_ACCESS_FORBIDDEN' || error.errcode == 'M_GUEST_ACCESS_FORBIDDEN' ||
( (
@ -601,6 +602,11 @@ module.exports = React.createClass({
} else { } else {
var msg = error.message ? error.message : JSON.stringify(error); var msg = error.message ? error.message : JSON.stringify(error);
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
if (msg === "No known servers") {
// minging kludge until https://matrix.org/jira/browse/SYN-678 is fixed
// 'Error when trying to join an empty room should be more explicit'
msg = "It is not currently possible to re-join an empty room.";
}
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Failed to join room", title: "Failed to join room",
description: msg description: msg