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

14
src/js/login.js
View file

@ -128,13 +128,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
const versionsReq = await fetch(`${address}/_matrix/client/versions`).catch(()=>{}); try {
if(versionsReq?.ok) { const versionsReq = await fetch(`${address}/_matrix/client/versions`)
const versions = await versionsReq.json().catch(()=>{}) if(versionsReq.ok) {
if (Array.isArray(versions.versions)) { const versions = await versionsReq.json().catch(()=>{})
return address if (Array.isArray(versions.versions)) {
return address
}
} }
} } catch(e) {}
// find the next matrix server in the chain // find the next matrix server in the chain
bad marked this conversation as resolved Outdated
cadence commented 2020-10-22 04:45:27 +00:00
Outdated
Review
Copy link

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?

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?
bad commented 2020-10-22 05:52:18 +00:00
Outdated
Review
Copy link

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

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
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 => {