fix issue with internal invoices

2 files changed, 10 insertions, 1 deletions

diff --git a/lib/invoices.js b/lib/invoices.js
index 8ac49a79..607a67fc 100644
--- a/lib/invoices.js
+++ b/lib/invoices.js
@@ -81,6 +81,7 @@ export let generate = async ({ invoice, user, sender, memo }) => {
   l("creating invoice", id, user.username, amount, tip, currency, invoice.hash);
 
   await s(`invoice:${hash}`, id);
+  console.log("SETTING", invoice)
   await s(`invoice:${id}`, invoice);
   await db.lPush(`${user.id}:invoices`, id);
 
diff --git a/routes/invoices.js b/routes/invoices.js
index d1ef1a68..9cdd4dad 100644
--- a/routes/invoices.js
+++ b/routes/invoices.js
@@ -9,11 +9,19 @@ import ln from "$lib/ln";
 export default {
   async get({ params: { id } }, res) {
     let pr;
+
     let invoice = await g(`invoice:${id}`);
+    if (typeof invoice === "string") invoice = await g(`invoice:${invoice}`);
 
     if (invoice) {
       delete invoice.secret;
-      invoice.user = pick(await g(`user:${invoice.uid}`), ['id', 'profile', 'banner', 'currency', 'username']);
+      invoice.user = pick(await g(`user:${invoice.uid}`), [
+        "id",
+        "profile",
+        "banner",
+        "currency",
+        "username"
+      ]);
     } else if (config.classic) {
       invoice = await got(`${config.classic}/invoice/${pr}`).json();
       if (invoice) {