highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-09-27 20:36:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

marginally improve the checkpending situation.

Browse Source
This commit is contained in:
fiatjaf
2021-03-21 17:10:53 -03:00
parent e4fb18a53a
commit f27c2ebc21
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lnbits/core/static/js/wallet.js
View File

@@ -584,10 +584,8 @@ new Vue({
LNbits.href.deleteWallet(walletId, user) LNbits.href.deleteWallet(walletId, user)
}) })
}, },
fetchPayments: function (checkPending) { fetchPayments: function () {
return LNbits.api return LNbits.api.getPayments(this.g.wallet).then(response => {
.getPayments(this.g.wallet, checkPending)
.then(response => {
this.payments = response.data this.payments = response.data
.map(obj => { .map(obj => {
return LNbits.map.payment(obj) return LNbits.map.payment(obj)
@@ -612,7 +610,10 @@ new Vue({
message: 'Checking pending transactions...' message: 'Checking pending transactions...'
}) })
this.fetchPayments(true).then(() => { LNbits.api
.checkPending(this.g.wallet)
.then(() => LNbits.api.fetchPayments)
.then(() => {
dismissMsg() dismissMsg()
}) })
}, },
@@ -628,7 +629,7 @@ new Vue({
created: function () { created: function () {
this.fetchBalance() this.fetchBalance()
this.fetchPayments() this.fetchPayments()
setTimeout(this.checkPendingPayments(), 1200) this.checkPendingPayments()
}, },
mounted: function () { mounted: function () {
// show disclaimer // show disclaimer

15
lnbits/core/views/api.py
View File

@@ -3,7 +3,7 @@ import json
import lnurl # type: ignore import lnurl # type: ignore
import httpx import httpx
from urllib.parse import urlparse, urlunparse, urlencode, parse_qs, ParseResult from urllib.parse import urlparse, urlunparse, urlencode, parse_qs, ParseResult
from quart import g, jsonify, request, make_response from quart import g, jsonify, make_response
from http import HTTPStatus from http import HTTPStatus
from binascii import unhexlify from binascii import unhexlify
from typing import Dict, Union from typing import Dict, Union
@@ -32,15 +32,20 @@ async def api_wallet():
) )
@core_app.route("/api/v1/payments", methods=["GET"]) @core_app.route("/api/v1/checkpending", methods=["POST"])
@api_check_wallet_key("invoice") @api_check_wallet_key("invoice")
async def api_payments(): async def api_checkpending():
if "check_pending" in request.args: g.nursery.start_soon(delete_expired_invoices)
await delete_expired_invoices()
for payment in await g.wallet.get_payments(complete=False, pending=True, exclude_uncheckable=True): for payment in await g.wallet.get_payments(complete=False, pending=True, exclude_uncheckable=True):
await payment.check_pending() await payment.check_pending()
return "", HTTPStatus.NO_CONTENT
@core_app.route("/api/v1/payments", methods=["GET"])
@api_check_wallet_key("invoice")
async def api_payments():
return jsonify(await g.wallet.get_payments(pending=True)), HTTPStatus.OK return jsonify(await g.wallet.get_payments(pending=True)), HTTPStatus.OK

12
lnbits/static/js/base.js
View File

@@ -52,13 +52,11 @@ window.LNbits = {
getWallet: function (wallet) { getWallet: function (wallet) {
return this.request('get', '/api/v1/wallet', wallet.inkey) return this.request('get', '/api/v1/wallet', wallet.inkey)
}, },
getPayments: function (wallet, checkPending) { checkPending: function (wallet) {
var query_param = checkPending ? '?check_pending' : '' return this.request('post', '/api/v1/checkpending', wallet.inkey)
return this.request( },
'get', getPayments: function (wallet) {
['/api/v1/payments', query_param].join(''), return this.request('get', '/api/v1/payments', wallet.inkey)
wallet.inkey
)
}, },
getPayment: function (wallet, paymentHash) { getPayment: function (wallet, paymentHash) {
return this.request( return this.request(