aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2025-12-20 15:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename zap_split to dittoZapSplit

Browse Source
This commit is contained in:
P. Reis
2024-08-05 16:20:38 -03:00
parent 0a3ed4e160
commit bce404728b
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/controllers/api/ditto.ts
View File

@@ -173,8 +173,8 @@ export const updateZapSplitsController: AppController = async (c) => {
return c.json({ error: result.error }, 400); return c.json({ error: result.error }, 400);
} }
const zap_split = await getZapSplits(store, Conf.pubkey); const dittoZapSplit = await getZapSplits(store, Conf.pubkey);
if (!zap_split) { if (!dittoZapSplit) {
return c.json({ error: 'Zap split not activated, restart the server.' }, 404); return c.json({ error: 'Zap split not activated, restart the server.' }, 404);
} }
@@ -208,8 +208,8 @@ export const deleteZapSplitsController: AppController = async (c) => {
return c.json({ error: result.error }, 400); return c.json({ error: result.error }, 400);
} }
const zap_split = await getZapSplits(store, Conf.pubkey); const dittoZapSplit = await getZapSplits(store, Conf.pubkey);
if (!zap_split) { if (!dittoZapSplit) {
return c.json({ error: 'Zap split not activated, restart the server.' }, 404); return c.json({ error: 'Zap split not activated, restart the server.' }, 404);
} }
@@ -230,24 +230,24 @@ export const deleteZapSplitsController: AppController = async (c) => {
export const getZapSplitsController: AppController = async (c) => { export const getZapSplitsController: AppController = async (c) => {
const store = c.get('store'); const store = c.get('store');
const zap_split: DittoZapSplits | undefined = await getZapSplits(store, Conf.pubkey) ?? {}; const dittoZapSplit: DittoZapSplits | undefined = await getZapSplits(store, Conf.pubkey) ?? {};
if (!zap_split) { if (!dittoZapSplit) {
return c.json({ error: 'Zap split not activated, restart the server.' }, 404); return c.json({ error: 'Zap split not activated, restart the server.' }, 404);
} }
const pubkeys = Object.keys(zap_split); const pubkeys = Object.keys(dittoZapSplit);
const zapSplitEntity = await Promise.all(pubkeys.map(async (pubkey) => { const zapSplits = await Promise.all(pubkeys.map(async (pubkey) => {
const author = await getAuthor(pubkey); const author = await getAuthor(pubkey);
const account = author ? await renderAccount(author) : await accountFromPubkey(pubkey); const account = author ? await renderAccount(author) : await accountFromPubkey(pubkey);
return { return {
account, account,
weight: zap_split[pubkey].weight, weight: dittoZapSplit[pubkey].weight,
message: zap_split[pubkey].message, message: dittoZapSplit[pubkey].message,
}; };
})); }));
return c.json(zapSplitEntity, 200); return c.json(zapSplits, 200);
}; };

10
src/controllers/api/statuses.ts
View File

@@ -179,12 +179,12 @@ const createStatusController: AppController = async (c) => {
const meta = n.json().pipe(n.metadata()).catch({}).parse(author?.content); const meta = n.json().pipe(n.metadata()).catch({}).parse(author?.content);
const lnurl = getLnurl(meta); const lnurl = getLnurl(meta);
const zap_split = await getZapSplits(store, Conf.pubkey); const dittoZapSplit = await getZapSplits(store, Conf.pubkey);
if (lnurl && zap_split) { if (lnurl && dittoZapSplit) {
let totalSplit = 0; let totalSplit = 0;
for (const pubkey in zap_split) { for (const pubkey in dittoZapSplit) {
totalSplit += zap_split[pubkey].weight; totalSplit += dittoZapSplit[pubkey].weight;
tags.push(['zap', pubkey, Conf.relay, zap_split[pubkey].weight.toString()]); tags.push(['zap', pubkey, Conf.relay, dittoZapSplit[pubkey].weight.toString()]);
} }
if (totalSplit) { if (totalSplit) {
tags.push(['zap', author?.pubkey as string, Conf.relay, Math.max(0, 100 - totalSplit).toString()]); tags.push(['zap', author?.pubkey as string, Conf.relay, Math.max(0, 100 - totalSplit).toString()]);