heierbtc/lnbits
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update the rest of update_payment_extra calls

Browse Source
This commit is contained in:
Vlad Stan 2022-12-22 11:28:12 +02:00
parent b56d08a70e
commit a434731729
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lnbits/core/crud.py
View File

@ -452,7 +452,7 @@ async def update_payment_details(
async def update_payment_extra( async def update_payment_extra(
hash: str, payment_hash: str,
extra: dict, extra: dict,
outgoing: bool = False, outgoing: bool = False,
incoming: bool = False, incoming: bool = False,
@ -472,7 +472,7 @@ async def update_payment_extra(
row = await (conn or db).fetchone( row = await (conn or db).fetchone(
f"SELECT hash, extra from apipayments WHERE hash = ? {amount_clause}", f"SELECT hash, extra from apipayments WHERE hash = ? {amount_clause}",
(hash,), (payment_hash,),
) )
if not row: if not row:
return return
@ -481,7 +481,7 @@ async def update_payment_extra(
await (conn or db).execute( await (conn or db).execute(
f"UPDATE apipayments SET extra = ? WHERE hash = ? {amount_clause} ", f"UPDATE apipayments SET extra = ? WHERE hash = ? {amount_clause} ",
(json.dumps(db_extra), hash), (json.dumps(db_extra), payment_hash),
) )

4
lnbits/extensions/lnurlp/tasks.py
View File

@ -67,4 +67,6 @@ async def mark_webhook_sent(
payment.extra["wh_message"] = reason_phrase payment.extra["wh_message"] = reason_phrase
payment.extra["wh_response"] = text payment.extra["wh_response"] = text
await update_payment_extra(payment.payment_hash, payment.extra) await update_payment_extra(
payment_hash=payment.payment_hash, extra=payment.extra, incoming=True
)

7
lnbits/extensions/withdraw/lnurl.py
View File

@ -163,7 +163,7 @@ async def api_lnurl_callback(
r: httpx.Response = await client.post(link.webhook_url, **kwargs) r: httpx.Response = await client.post(link.webhook_url, **kwargs)
await update_payment_extra( await update_payment_extra(
hash=payment_hash, payment_hash=payment_hash,
extra={ extra={
"wh_success": r.is_success, "wh_success": r.is_success,
"wh_message": r.reason_phrase, "wh_message": r.reason_phrase,
@ -177,8 +177,9 @@ async def api_lnurl_callback(
"Caught exception when dispatching webhook url: " + str(exc) "Caught exception when dispatching webhook url: " + str(exc)
) )
await update_payment_extra( await update_payment_extra(
payment_hash, payment_hash=payment_hash,
{"wh_success": False, "wh_message": str(exc)}, extra={"wh_success": False, "wh_message": str(exc)},
outgoing=True,
) )
return {"status": "OK"} return {"status": "OK"}