diff options
| -rw-r--r-- | bitcoinPayments.js | 4 | ||||
| -rw-r--r-- | sendCoins.js | 4 | ||||
| -rw-r--r-- | sendPayment.js | 4 | ||||
| -rw-r--r-- | sockets.js | 19 |
4 files changed, 21 insertions, 10 deletions
diff --git a/bitcoinPayments.js b/bitcoinPayments.js index fc29e1d5..1ff402a2 100644 --- a/bitcoinPayments.js +++ b/bitcoinPayments.js @@ -130,7 +130,9 @@ module.exports = (app, bc, db, addresses, payments, emit) => { await p.save(); let payments = await db.Payment.findAll({ - where: { user_id: user.id } + where: { user_id: user.id }, + order: [['id', 'DESC']], + limit: 20 }); emit(user.username, "payments", payments); diff --git a/sendCoins.js b/sendCoins.js index b65fe94c..8aaecb28 100644 --- a/sendCoins.js +++ b/sendCoins.js @@ -67,7 +67,7 @@ module.exports = (app, bc, db, emit) => async (req, res) => { await req.user.save({ transaction }); emit(req.user.username, "user", req.user); - await db.Payment.create( + const payment = await db.Payment.create( { amount: -total, user_id: req.user.id, @@ -79,6 +79,8 @@ module.exports = (app, bc, db, emit) => async (req, res) => { }, { transaction } ); + + emit(req.user.username, "payment", payment); }); res.send({ txid, tx, amount, fees: fee }); diff --git a/sendPayment.js b/sendPayment.js index c5ce7ea3..2450e6bc 100644 --- a/sendPayment.js +++ b/sendPayment.js @@ -50,7 +50,7 @@ module.exports = (app, db, emit, seen, lna, lnb) => async (req, res) => { await db.transaction(async transaction => { await req.user.save({ transaction }); - await db.Payment.create( + const payment = await db.Payment.create( { amount: -total, user_id: req.user.id, @@ -61,6 +61,8 @@ module.exports = (app, db, emit, seen, lna, lnb) => async (req, res) => { }, { transaction } ); + + emit(req.user.username, "payment", payment); }); emit(req.user.username, "user", req.user); @@ -40,14 +40,19 @@ module.exports = (app, db, server) => { socket.emit("connected"); if (app.get("rates")) socket.emit("rate", app.get("rates").ask); socket.on("getuser", async (data, callback) => { - /* eslint-disable-next-line */ - const user = - await db.User.findOne({ - include: [{ model: db.Payment, as: "payments" }], - where: { - username: socket.request.user + const user = await db.User.findOne({ + include: [ + { + model: db.Payment, + as: "payments", + order: [["id", "DESC"]], + limit: 20 } - }) + ], + where: { + username: socket.request.user + } + }); callback(user); }); |