diff options
| author | Adrien Hopkins <[email protected]> | 2022-05-31 15:51:30 -0500 |
|---|---|---|
| committer | Adrien Hopkins <[email protected]> | 2022-05-31 15:51:30 -0500 |
| commit | bea6dda302df971dbf9b4797c95f169cce6dafb3 (patch) | |
| tree | dc806d941945f7ee5f3cee730393fdd175da55e3 /lib | |
| parent | ca7224037fb01ded28b51d765e040d5cad36183b (diff) | |
| parent | 510a3bf2f63cb6edbcc9ad24dacdf6faefd80c52 (diff) | |
| download | coinos-server-bea6dda302df971dbf9b4797c95f169cce6dafb3.tar.gz coinos-server-bea6dda302df971dbf9b4797c95f169cce6dafb3.zip | |
Merge branch 'feature-withdrawal-fee'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sockets.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/sockets.js b/lib/sockets.js index e876663b..30a6b49d 100644 --- a/lib/sockets.js +++ b/lib/sockets.js @@ -121,11 +121,16 @@ wss.on("connection", function(ws, req) { }, order: [["id", "DESC"]], limit: 12, - include: { + include: [{ model: db.Account, as: "account" - } + }, + { + model: db.Payment, + as: "fee_payment" + }] }); + let accounts = await user.getAccounts(); let keys = await user.getKeys(); user = user.get({ plain: true }); @@ -143,7 +148,7 @@ wss.on("connection", function(ws, req) { if (e.message.includes("locked")) { ws.send(JSON.stringify({ type: "locked" })); ws.send(JSON.stringify({ type: "logout" })); - } + } if (e.message.includes("not found")) ws.send(JSON.stringify({ type: "logout" })); setTimeout(() => ws && ws.close(), 1000); |
