Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: fix url builder

Browse Source
This commit is contained in:
Kieran
2023-02-14 19:50:08 +00:00
parent 1a09d13e4b
commit 829b1cd703
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/app/src/Element/SendSats.tsx
View File

@ -145,18 +145,33 @@ export default function LNURLTip(props: LNURLTipProps) {
async function loadInvoice() { async function loadInvoice() {
if (!amount || !payService) return null; if (!amount || !payService) return null;
let url = "";
const amountParam = `amount=${Math.floor(amount * 1000)}`; const callback = new URL(payService.callback);
const commentParam = comment && payService?.commentAllowed ? `&comment=${encodeURIComponent(comment)}` : ""; const query = new Map<string, string>();
if (callback.search.length > 0) {
callback.search
.slice(1)
.split("&")
.forEach(a => {
const pSplit = a.split("=");
query.set(pSplit[0], pSplit[1]);
});
}
query.set("amount", Math.floor(amount * 1000).toString());
if (comment && payService?.commentAllowed) {
query.set("comment", comment);
}
if (payService.nostrPubkey && author) { if (payService.nostrPubkey && author) {
const ev = await publisher.zap(author, note, comment); const ev = await publisher.zap(author, note, comment);
const nostrParam = ev && `&nostr=${encodeURIComponent(JSON.stringify(ev.ToObject()))}`; if (ev) {
url = `${payService.callback}?${amountParam}${commentParam}${nostrParam}`; query.set("nostr", JSON.stringify(ev.ToObject()));
} else { }
url = `${payService.callback}?${amountParam}${commentParam}`;
} }
const baseUrl = `${callback.protocol}//${callback.host}${callback.pathname}`;
const queryJoined = [...query.entries()].map(v => `${v[0]}=${encodeURIComponent(v[1])}`).join("&");
try { try {
const rsp = await fetch(url); const rsp = await fetch(`${baseUrl}?${queryJoined}`);
if (rsp.ok) { if (rsp.ok) {
const data = await rsp.json(); const data = await rsp.json();
console.log(data); console.log(data);