mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: minimalist check of status_id and account_id

Browse source
This commit is contained in:
P. Reis 2025-02-26 20:45:02 -03:00
parent cf4d888ad5
commit 8479143ed8
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/ditto/controllers/api/cashu.ts
View file

@ -14,7 +14,6 @@ import { hydrateEvents } from '@/storages/hydrate.ts';
import { nostrNow } from '@/utils.ts'; import { nostrNow } from '@/utils.ts';
import { errorJson } from '@/utils/log.ts'; import { errorJson } from '@/utils/log.ts';
import { getAmount } from '@/utils/bolt11.ts'; import { getAmount } from '@/utils/bolt11.ts';
import { DittoEvent } from '@/interfaces/DittoEvent.ts';
import { organizeProofs, validateAndParseWallet } from '@/utils/cashu.ts'; import { organizeProofs, validateAndParseWallet } from '@/utils/cashu.ts';
import { tokenEventSchema } from '@/schemas/cashu.ts'; import { tokenEventSchema } from '@/schemas/cashu.ts';
@ -306,19 +305,16 @@ route.post('/nutzap', userMiddleware({ enc: 'nip44' }), async (c) => {
} }
const { account_id, status_id, amount, comment } = result.data; const { account_id, status_id, amount, comment } = result.data;
let event: DittoEvent;
const filter = status_id ? [{ kinds: [1], ids: [status_id] }] : [{ kinds: [0], authors: [account_id] }];
const [event] = await relay.query(filter, { signal });
if (!event) {
return c.json({ error: status_id ? 'Status not found' : 'Account not found' }, 404);
}
if (status_id) { if (status_id) {
[event] = await relay.query([{ kinds: [1], ids: [status_id] }], { signal });
if (!event) {
return c.json({ error: 'Status not found' }, 404);
}
await hydrateEvents({ ...c.var, events: [event] }); await hydrateEvents({ ...c.var, events: [event] });
} else {
[event] = await relay.query([{ kinds: [0], authors: [account_id] }], { signal });
if (!event) {
return c.json({ error: 'Account not found' }, 404);
}
} }
if (event.kind === 1 && (event.author?.pubkey !== account_id)) { if (event.kind === 1 && (event.author?.pubkey !== account_id)) {