ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix'

This commit is contained in:
keyan 2023-10-04 19:35:09 -05:00
parent 425220d8cb 0767b23d80
commit c77d761ab6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/resolvers/wallet.js
View File

@ -292,6 +292,9 @@ export default {
...payer,
identifier: payer.identifier ? me.name : undefined
}
payer = Object.fromEntries(
Object.entries(payer).filter(([, value]) => !!value)
)
}
const milliamount = 1000 * amount
@ -303,7 +306,7 @@ export default {
}
let encodedPayerData = ''
if (payer) {
if (payer && Object.entries(payer).length) {
encodedPayerData = encodeURIComponent(JSON.stringify(payer))
callback.searchParams.append('payerdata', encodedPayerData)
}

4
pages/api/lnurlp/[username]/pay.js
View File

@ -47,8 +47,8 @@ export default async ({ query: { username, amount, nostr, comment, payerdata: pa
return res.status(400).json({ status: 'ERROR', reason: `comment cannot exceed ${LNURLP_COMMENT_MAX_LENGTH} characters in length` })
}
let parsedPayerData
if (payerData) {
let parsedPayerData
try {
parsedPayerData = JSON.parse(decodeURIComponent(payerData))
} catch (err) {
@ -81,7 +81,7 @@ export default async ({ query: { username, amount, nostr, comment, payerdata: pa
await serialize(models,
models.$queryRaw`SELECT * FROM create_invoice(${invoice.id}, ${invoice.request},
${expiresAt}::timestamp, ${Number(amount)}, ${user.id}::INTEGER, ${noteStr || description},
${comment || null}, ${payerData || null}::JSONB, ${INV_PENDING_LIMIT}::INTEGER, ${BALANCE_LIMIT_MSATS})`)
${comment || null}, ${parsedPayerData || null}::JSONB, ${INV_PENDING_LIMIT}::INTEGER, ${BALANCE_LIMIT_MSATS})`)
return res.status(200).json({
pr: invoice.request,