Refactor homeserver lookup code #12
1 changed files with 9 additions and 9 deletions
|
@ -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 */
|
||||||
|
|
||||||
bad marked this conversation as resolved
Outdated
|
|||||||
// 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 => {
|
||||||
|
|
Loading…
Reference in a new issue
Why chain a promise catch here? I don't have a problem with promise chaining, it's just weird considering that we used the try/catch syntax 3 lines up. IMO they should be made consistent?
It was shorter. I actually wanted to write the code like it's written now but jshint errored on the optional chain. It's fixed now