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

feat: improve auto zapper

Browse Source
This commit is contained in:
Kieran 2023-03-11 17:03:42 +00:00
parent 335905449f
commit d228e25b35
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/app/src/Element/NoteFooter.tsx
View File

@ -10,7 +10,7 @@ import Spinner from "Icons/Spinner";
import { formatShort } from "Number"; import { formatShort } from "Number";
import useEventPublisher from "Feed/EventPublisher"; import useEventPublisher from "Feed/EventPublisher";
import { bech32ToHex, hexToBech32, normalizeReaction, unwrap } from "Util"; import { bech32ToHex, delay, hexToBech32, normalizeReaction, unwrap } from "Util";
import { NoteCreator } from "Element/NoteCreator"; import { NoteCreator } from "Element/NoteCreator";
import Reactions from "Element/Reactions"; import Reactions from "Element/Reactions";
import SendSats from "Element/SendSats"; import SendSats from "Element/SendSats";
@ -59,6 +59,19 @@ class DumbZapCache {
} }
const ZapCache = new DumbZapCache(); const ZapCache = new DumbZapCache();
let isZapperBusy = false;
const barrierZapper = async <T,>(then: () => Promise<T>): Promise<T> => {
while (isZapperBusy) {
await delay(100);
}
isZapperBusy = true;
try {
return await then();
} finally {
isZapperBusy = false;
}
};
export interface Translation { export interface Translation {
text: string; text: string;
fromLanguage: string; fromLanguage: string;
@ -163,11 +176,14 @@ export default function NoteFooter(props: NoteFooterProps) {
async function fastZapInner(lnurl: string, amount: number, key: HexKey, id?: u256) { async function fastZapInner(lnurl: string, amount: number, key: HexKey, id?: u256) {
if (wallet?.isReady() && lnurl) { if (wallet?.isReady() && lnurl) {
const handler = new LNURL(lnurl); // only allow 1 invoice req/payment at a time to avoid hitting rate limits
await handler.load(); await barrierZapper(async () => {
const zap = handler.canZap ? await publisher.zap(amount * 1000, key, id) : undefined; const handler = new LNURL(lnurl);
const invoice = await handler.getInvoice(amount, undefined, zap); await handler.load();
await wallet.payInvoice(unwrap(invoice.pr)); const zap = handler.canZap ? await publisher.zap(amount * 1000, key, id) : undefined;
const invoice = await handler.getInvoice(amount, undefined, zap);
await wallet.payInvoice(unwrap(invoice.pr));
});
if (prefs.fastZapDonate > 0) { if (prefs.fastZapDonate > 0) {
// spin off donate // spin off donate
@ -185,9 +201,9 @@ export default function NoteFooter(props: NoteFooterProps) {
useEffect(() => { useEffect(() => {
if (prefs.autoZap) { if (prefs.autoZap) {
const lnurl = author?.lud16 || author?.lud06; const lnurl = author?.lud16 || author?.lud06;
if (wallet?.isReady() && lnurl && !ZapCache.has(ev.Id)) { if (wallet?.isReady() && lnurl && !ZapCache.has(ev.Id) && !zapping && !isMine) {
setZapping(true);
queueMicrotask(async () => { queueMicrotask(async () => {
setZapping(true);
try { try {
await fastZapInner(lnurl, prefs.defaultZapAmount, ev.PubKey, ev.Id); await fastZapInner(lnurl, prefs.defaultZapAmount, ev.PubKey, ev.Id);
ZapCache.add(ev.Id); ZapCache.add(ev.Id);
@ -197,7 +213,7 @@ export default function NoteFooter(props: NoteFooterProps) {
}); });
} }
} }
}, [prefs.autoZap]); }, [prefs.autoZap, author, zapping]);
function tipButton() { function tipButton() {
const service = author?.lud16 || author?.lud06; const service = author?.lud16 || author?.lud06;