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 +9 -9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1b97351ca0 - Show all commits

18
src/js/login.js
View file

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