From 67409063409322882c8edf32441c147343fe98e5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 18 Oct 2023 20:31:26 -0700
Subject: username in subject

---
 routes/email.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/routes/email.js b/routes/email.js
index a274a7b1..e32222f0 100644
--- a/routes/email.js
+++ b/routes/email.js
@@ -31,20 +31,17 @@ export default {
           new SendEmailCommand({
             Destination: {
               CcAddresses: [],
-              ToAddresses: [config.support],
+              ToAddresses: [config.support]
             },
             Message: {
               Body: {
-                Html: {
-                  Charset,
-                  Data: `${username}<br><br>${message.replace(/\n/g, "<br>")}`
-                },
-                Text: { Charset, Data: `${username}\n\n${message}` }
+                Html: { Charset, Data: message.replace(/\n/g, "<br>") },
+                Text: { Charset, Data: message }
               },
-              Subject: { Charset, Data: body.subject || "Support Request" }
+                Subject: { Charset, Data: body.subject || 'Support Request' + (username ? 'From ' +  username : '') }
             },
             ReplyToAddresses: [email],
-              Source: config.support
+            Source: config.support
           })
         );
 
-- 
cgit v1.2.3


From e26010ea0a1bcfa03545768e19e7d5df1a2d30cb Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 18 Oct 2023 20:31:26 -0700
Subject: username in subject

---
 routes/email.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/routes/email.js b/routes/email.js
index e32222f0..14e51bcb 100644
--- a/routes/email.js
+++ b/routes/email.js
@@ -38,7 +38,12 @@ export default {
                 Html: { Charset, Data: message.replace(/\n/g, "<br>") },
                 Text: { Charset, Data: message }
               },
-                Subject: { Charset, Data: body.subject || 'Support Request' + (username ? 'From ' +  username : '') }
+              Subject: {
+                Charset,
+                Data:
+                  body.subject ||
+                  "Support Request" + (username ? " From " + username : "")
+              }
             },
             ReplyToAddresses: [email],
             Source: config.support
-- 
cgit v1.2.3


From 18512a2355e2255e26a0f7385f73b3966574d9be Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Oct 2023 23:34:53 -0700
Subject: fix classic payments

---
 routes/invoices.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/routes/invoices.js b/routes/invoices.js
index 9cdd4dad..329f163d 100644
--- a/routes/invoices.js
+++ b/routes/invoices.js
@@ -8,8 +8,6 @@ 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}`);
 
@@ -20,10 +18,11 @@ export default {
         "profile",
         "banner",
         "currency",
-        "username"
+        "username",
+        "pubkey"
       ]);
     } else if (config.classic) {
-      invoice = await got(`${config.classic}/invoice/${pr}`).json();
+      invoice = await got(`${config.classic}/invoice/${id}`).json();
       if (invoice) {
         invoice.id = invoice.uuid;
         invoice.classic = true;
-- 
cgit v1.2.3