Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Use connection error to detect network problem #4646

Merged
merged 1 commit into from
May 26, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/stores/RoomViewStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ class RoomViewStore extends Store {
});
let msg = err.message ? err.message : JSON.stringify(err);
console.log("Failed to join room:", msg);
// XXX: We are relying on the error message returned by browsers here.
// This isn't great, but it does generalize the error being shown to users.
if (msg && msg.startsWith("CORS request rejected")) {
if (err.name === "ConnectionError") {
msg = _t("There was an error joining the room");
}
if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
Expand Down