From bbdae13248476e9ff49fcefc64cf8c8e97b5f679 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Wed, 5 Mar 2025 13:35:31 -0800
Subject: use getInvoice helper

---
 lib/lightning.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib/lightning.ts')

diff --git a/lib/lightning.ts b/lib/lightning.ts
index 966a7954..326b5721 100644
--- a/lib/lightning.ts
+++ b/lib/lightning.ts
@@ -3,8 +3,8 @@ import ln from "$lib/ln";
 import { err, warn } from "$lib/logging";
 import { handleZap } from "$lib/nostr";
 import { credit } from "$lib/payments";
-import { getPayment, getUser } from "$lib/utils";
 import { PaymentType } from "$lib/types";
+import { getInvoice, getPayment, getUser } from "$lib/utils";
 
 export async function listenForLightning() {
   const inv = await ln.waitanyinvoice((await g("pay_index")) || 0);
@@ -27,8 +27,10 @@ export async function listenForLightning() {
   try {
     if (!preimage) return;
 
-    const id = bolt11 ? (await g(`invoice:${bolt11}`)) : (await g(`invoice:${local_offer_id}`));
-    const invoice = await g(`invoice:${id}`);
+    const id = bolt11
+      ? await getInvoice(bolt11)
+      : await getInvoice(local_offer_id);
+    const invoice = await getInvoice(id);
     if (!invoice) return warn("received lightning with no invoice", bolt11);
 
     const p = await getPayment(bolt11 || bolt12);
@@ -76,8 +78,10 @@ export async function replay(index) {
   try {
     if (!preimage) return;
 
-    const id = bolt11 ? (await g(`invoice:${bolt11}`)) : (await g(`invoice:${local_offer_id}`));
-    const invoice = await g(`invoice:${id}`);
+    const id = bolt11
+      ? await getInvoice(bolt11)
+      : await getInvoice(local_offer_id);
+    const invoice = await getInvoice(id);
     if (!invoice) return warn("received lightning with no invoice", bolt11);
 
     const p = await getPayment(bolt11 || bolt12);
-- 
cgit v1.2.3