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}`) this.status(`Looking up homeserver... trying ${address}`)
// Check if we found the actual matrix server // Check if we found the actual matrix server
try { const versionsReq = await fetch(`${address}/_matrix/client/versions`).catch(()=>{})
const versionsReq = await fetch(`${address}/_matrix/client/versions`) /* jshint ignore:start */
if(versionsReq.ok) { //JsHint doesn't support optional chaining
const versions = await versionsReq.json() // https://github.com/jshint/jshint/issues/3448
if (Array.isArray(versions.versions)) { if(versionsReq?.ok) {
return address const versions = await versionsReq.json().catch(()=>{})
} if (Array.isArray(versions?.versions)) return address
} }
} catch(e) {} /* jshint ignore:end */
// 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 => {