From 77b9560d8faccdcd3c8fbdfa1d4cf1d67b4c91c8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 26 Jan 2024 12:19:39 -0800
Subject: define invoice id

---
 index.js           | 2 +-
 lib/payments.js    | 6 ++++--
 routes/payments.js | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 6dececdb..f20bcce2 100644
--- a/index.js
+++ b/index.js
@@ -111,5 +111,5 @@ let port = process.env.PORT || 3119;
 
 app.listen({ host, port });
 
-  process.on("unhandledRejection", (e) => err("Unhandled error", e.message));
+process.on("unhandledRejection", (e) => err("Unhandled error", e.message));
 process.on("uncaughtException", (e) => err("Uncaught exception", e.message));
diff --git a/lib/payments.js b/lib/payments.js
index fe96d2a0..c924dd2b 100644
--- a/lib/payments.js
+++ b/lib/payments.js
@@ -45,11 +45,13 @@ export let debit = async ({
 }) => {
   let ref;
   let { id: uid, currency, username } = user;
-  if (!rate) rate = store.rates[currency];
+      if (!rate) rate = store.rates[currency];
 
   let invoice = await getInvoice(hash);
+  let iid;
 
   if (invoice) {
+    ({ id: iid } = invoice);
     ref = invoice.uid;
 
     let equivalentRate =
@@ -89,7 +91,7 @@ export let debit = async ({
     hash,
     ourfee: r.ourfee,
     memo,
-    iid: invoice.id,
+    iid,
     uid,
     confirmed: true,
     rate,
diff --git a/routes/payments.js b/routes/payments.js
index edcc6b72..fbd20ddb 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -4,7 +4,7 @@ import { emit } from "$lib/sockets";
 import { v4 } from "uuid";
 import { db, g, s, t } from "$lib/db";
 import { l, err, warn } from "$lib/logging";
-import { bail, fail, btc, sats, SATS } from "$lib/utils";
+import { bail, fail, getInvoice, btc, sats, SATS } from "$lib/utils";
 import { requirePin } from "$lib/auth";
 import {
   debit,
@@ -78,8 +78,8 @@ export default {
 
       res.send(p);
     } catch (e) {
-      warn(e.message);
-      warn("failed to create payment", user.username, amount, hash, payreq);
+      warn(user.username, "payment failed", amount, hash, payreq);
+      err(e.message);
       bail(res, e.message);
     }
   },
-- 
cgit v1.2.3