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

change message priority

pull/21833/head
Bruno Windels 2020-07-30 10:33:36 +02:00
parent d8baad31da
commit bb685cd37a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/stores/RoomViewStore.js
View File

@ -265,7 +265,14 @@ class RoomViewStore extends Store {
}); });
let msg = err.message ? err.message : JSON.stringify(err); let msg = err.message ? err.message : JSON.stringify(err);
console.log("Failed to join room:", msg); console.log("Failed to join room:", msg);
if (err.httpStatus === 404) { if (err.name === "ConnectionError") {
msg = _t("There was an error joining the room");
} else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
msg = <div>
{_t("Sorry, your homeserver is too old to participate in this room.")}<br />
{_t("Please contact your homeserver administrator.")}
</div>;
} else if (err.httpStatus === 404) {
const invitingUserId = this._getInvitingUserId(this._state.roomId); const invitingUserId = this._getInvitingUserId(this._state.roomId);
// only provide a better error message for invites // only provide a better error message for invites
if (invitingUserId) { if (invitingUserId) {
@ -276,13 +283,6 @@ class RoomViewStore extends Store {
msg = _t("The person who invited you already left the room, or their server is offline."); msg = _t("The person who invited you already left the room, or their server is offline.");
} }
} }
} else if (err.name === "ConnectionError") {
msg = _t("There was an error joining the room");
} else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
msg = <div>
{_t("Sorry, your homeserver is too old to participate in this room.")}<br />
{_t("Please contact your homeserver administrator.")}
</div>;
} }
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, { Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {