diff options
| author | Adam Soltys <[email protected]> | 2022-11-03 01:28:48 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-11-03 01:28:48 -0700 |
| commit | 4f5a5014cc097dc8a30f691bd49bf5055708a5e9 (patch) | |
| tree | 7d2bf5a509da2cc5465b53a4147e7754ffd65de1 /lib | |
| parent | bba0fc2708130962cd4d9373acc3ab68c9334c7e (diff) | |
| parent | da2a1713b13b31310843136eeaabe524c4eee42c (diff) | |
| download | coinos-server-4f5a5014cc097dc8a30f691bd49bf5055708a5e9.tar.gz coinos-server-4f5a5014cc097dc8a30f691bd49bf5055708a5e9.zip | |
Merge branch 'master' into prod
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sendInternal.js | 5 | ||||
| -rw-r--r-- | lib/sockets.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/sendInternal.js b/lib/sendInternal.js index 3090e94a..640587b5 100644 --- a/lib/sendInternal.js +++ b/lib/sendInternal.js @@ -139,7 +139,8 @@ export default async ( hash: `#${v4().substr(0, 6)} Payment from ${user.username}`, memo, network: "COINOS", - received: true + received: true, + with_id: user.id }; if (invoice) { @@ -194,7 +195,7 @@ export default async ( hash: `#${v4().substr(0, 6)} ${ username ? `Payment to ${username}` : "Internal Transfer" }`, - network: "COINOS" + network: "COINOS", }; if (!username) { diff --git a/lib/sockets.js b/lib/sockets.js index 87cf7116..fb007a17 100644 --- a/lib/sockets.js +++ b/lib/sockets.js @@ -85,7 +85,7 @@ app.register(async function(app) { switch (type) { case "heartbeat": ws.beats = 0; - if (ws.user) emit(ws.user.username, "id", ws.id); + ws.send(JSON.stringify({ type: "id", data: ws.id })); break; case "login": |