Merge branch 'message-zap-split' into 'main'

feat: implement fifth parameter in zap tag

See merge request soapbox-pub/ditto!468
This commit is contained in:
Alex Gleason 2024-08-27 22:04:05 +00:00
commit 0d44932a04
2 changed files with 5 additions and 3 deletions

View file

@ -276,10 +276,12 @@ export const statusZapSplitsController: AppController = async (c) => {
const weight = percentageSchema.catch(0).parse(zapsTag.find((name) => name[1] === pubkey)![3]) ?? 0; const weight = percentageSchema.catch(0).parse(zapsTag.find((name) => name[1] === pubkey)![3]) ?? 0;
const message = zapsTag.find((name) => name[1] === pubkey)![4] ?? '';
return { return {
account, account,
message: '', message,
weight: weight, weight,
}; };
}))).filter((zapSplit) => zapSplit.weight > 0); }))).filter((zapSplit) => zapSplit.weight > 0);

View file

@ -177,7 +177,7 @@ const createStatusController: AppController = async (c) => {
let totalSplit = 0; let totalSplit = 0;
for (const pubkey in dittoZapSplit) { for (const pubkey in dittoZapSplit) {
totalSplit += dittoZapSplit[pubkey].weight; totalSplit += dittoZapSplit[pubkey].weight;
tags.push(['zap', pubkey, Conf.relay, dittoZapSplit[pubkey].weight.toString()]); tags.push(['zap', pubkey, Conf.relay, dittoZapSplit[pubkey].weight.toString(), dittoZapSplit[pubkey].message]);
} }
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()]);