cadence/Carbon
3
9
Fork 1
Code Issues 14 Pull requests 1 Releases Wiki Activity

Refactor homeserver lookup code #12

Merged
bad merged 10 commits from refactor-homeserver-lookup into princess 2020-10-23 08:57:01 +00:00
Conversation 0 Commits 10 Files changed 1 +7 -9
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aa12cd68e6 - Show all commits

14
src/js/login.js
View file

@ -128,15 +128,13 @@ class Form extends ElemJS {
this.status(`Looking up homeserver... trying ${address}`) this.status(`Looking up homeserver... trying ${address}`)
// Check if we found the actual matrix server // Check if we found the actual matrix server
const versionsReq = await fetch(`${address}/_matrix/client/versions`).catch(()=>{}) try {
/* jshint ignore:start */ const versionsReq = await fetch(`${address}/_matrix/client/versions`)
//JsHint doesn't support optional chaining if (versionsReq.ok) {
// https://github.com/jshint/jshint/issues/3448 const versions = await versionsReq.json()
if (versionsReq?.ok) { if (Array.isArray(versions.versions)) return address
const versions = await versionsReq.json().catch(()=>{})
if (Array.isArray(versions?.versions)) return address
} }
/* jshint ignore:end */ } catch(e) {}
// Find the next matrix server in the chain // Find the next matrix server in the chain
const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => { const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => {