diff options
| author | Adam Soltys <[email protected]> | 2023-02-10 23:36:34 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-02-11 00:37:46 -0800 |
| commit | 60cf57d56f617998e093e81b229e18c9a221e312 (patch) | |
| tree | a7d0dbc1096b00cdc940ce1138e527fdbf92c2c2 /routes | |
| parent | a059697ad1dab4308f9bc9c2957dc574f6e5518a (diff) | |
| download | coinos-server-60cf57d56f617998e093e81b229e18c9a221e312.tar.gz coinos-server-60cf57d56f617998e093e81b229e18c9a221e312.zip | |
prettier
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/payments.js | 8 | ||||
| -rw-r--r-- | routes/users.js | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/routes/payments.js b/routes/payments.js index 0ee2bce0..eee0990b 100644 --- a/routes/payments.js +++ b/routes/payments.js @@ -43,9 +43,7 @@ export default { if (invoice) { if (invoice.uid === user.id) fail("Cannot send to self"); hash = payment_hash; - } - - else { + } else { p = await debit( hash, amount + maxfee, @@ -109,7 +107,9 @@ export default { }, async get({ params: { hash } }, res) { - res.send(await g(`payment:${hash}`)); + let p = await g(`payment:${hash}`); + if (p.type === types.internal) p.with = await g(`user:${p.ref}`); + res.send(p); }, async parse({ body: { payreq } }, res) { diff --git a/routes/users.js b/routes/users.js index 2cdd3247..c6fb848d 100644 --- a/routes/users.js +++ b/routes/users.js @@ -244,9 +244,12 @@ export default { let u = id && (await g(`user:${id}`)); if (!u) { - u = await got(`${classic}/admin/migrate/${p.with.username.toLowerCase()}`, { - headers: { authorization: `Bearer ${config.admin}` } - }).json(); + u = await got( + `${classic}/admin/migrate/${p.with.username.toLowerCase()}`, + { + headers: { authorization: `Bearer ${config.admin}` } + } + ).json(); u = { id: u.uuid, about: u.address, ...pick(u, fields) }; delete u.address; @@ -369,7 +372,9 @@ export default { if (!(authorization && authorization.includes(config.admin))) return res.code(401).send("unauthorized"); - let { id, pubkey } = await g(`user:${await g(`user:${username.toLowerCase()}`)}`); + let { id, pubkey } = await g( + `user:${await g(`user:${username.toLowerCase()}`)}` + ); let invoices = await db.lRange(`${id}:invoices`, 0, -1); let payments = await db.lRange(`${id}:payments`, 0, -1); @@ -385,7 +390,7 @@ export default { async lower(req, res) { for await (let k of db.scanIterator({ MATCH: "balance:*" })) { let b = await g(k); - if (b < 0) console.log(k, b) + if (b < 0) console.log(k, b); } res.send("ok"); |
