problem: can't see if merit request is approved/rejected/pending

This commit is contained in:
Bob
2024-07-23 16:26:32 +08:00
parent b854895ff9
commit ed504b0590
2 changed files with 78 additions and 6 deletions

View File

@@ -3,7 +3,8 @@
import { base } from '$app/paths'; import { base } from '$app/paths';
import * as Card from '@/components/ui/card'; import * as Card from '@/components/ui/card';
import * as Table from '@/components/ui/table'; import * as Table from '@/components/ui/table';
import { MeritRequest } from '@/event_helpers/merits'; import { MapOfMeritResult, MeritRequest } from '@/event_helpers/merits';
import { Rocket, RocketATagFilter } from '@/event_helpers/rockets';
import { unixToRelativeTime } from '@/helpers'; import { unixToRelativeTime } from '@/helpers';
import { ndk } from '@/ndk'; import { ndk } from '@/ndk';
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk'; import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
@@ -12,6 +13,7 @@
import { derived } from 'svelte/store'; import { derived } from 'svelte/store';
export let rocket: NDKEvent; export let rocket: NDKEvent;
let parsedRocket = new Rocket(rocket);
let _merits = $ndk.storeSubscribe( let _merits = $ndk.storeSubscribe(
[{ '#a': [`31108:${rocket.author.pubkey}:${rocket.dTag}`], kinds: [1409 as NDKKind] }], [{ '#a': [`31108:${rocket.author.pubkey}:${rocket.dTag}`], kinds: [1409 as NDKKind] }],
@@ -20,14 +22,19 @@
} }
); );
let _votes = $ndk.storeSubscribe({ '#a': [RocketATagFilter(rocket)], kinds: [1410 as NDKKind] });
onDestroy(() => { onDestroy(() => {
_merits?.unsubscribe(); _merits?.unsubscribe();
_votes?.unsubscribe();
}); });
let merits = derived(_merits, ($merits) => { let merits = derived(_merits, ($merits) => {
let map = new Map<string, MeritRequest>(); let map = new Map<string, MeritRequest>();
for (let z of $merits) { for (let z of $merits) {
console.log('z', z);
let meritRequest = new MeritRequest(z); let meritRequest = new MeritRequest(z);
console.log('meritRequest', meritRequest);
if (meritRequest.BasicValidation()) { if (meritRequest.BasicValidation()) {
if (meritRequest.Event.sig) { if (meritRequest.Event.sig) {
//broadcast the events to our relays //broadcast the events to our relays
@@ -40,6 +47,32 @@
return map; return map;
}); });
let votes = derived(_votes, ($_votes) => {
return new MapOfMeritResult($_votes, parsedRocket).meritResult;
});
type MeritUIStatus = 'approved' | 'rejected' | 'pending';
const status = (merit: MeritRequest): MeritUIStatus => {
if (merit.IncludedInRocketState(parsedRocket)) {
return 'approved';
}
if ($votes.get(merit.ID) === 'blackball') {
return 'rejected';
}
return 'pending';
};
const background = (merit: MeritRequest) => {
if (status(merit) === 'approved') {
return 'bg-lime-600';
} else if (status(merit) === 'rejected') {
return 'bg-red-600';
} else {
return 'bg-accent';
}
};
//todo: update rocket event with confirmed zaps if we have votepower //todo: update rocket event with confirmed zaps if we have votepower
</script> </script>
@@ -65,7 +98,7 @@
on:click={() => { on:click={() => {
goto(`${base}/rockets/merits/${merit.ID}`); goto(`${base}/rockets/merits/${merit.ID}`);
}} }}
class="cursor-pointer bg-accent" class={`cursor-pointer ${background(merit)}`}
> >
<Table.Cell> <Table.Cell>
<div class="flex flex-nowrap"> <div class="flex flex-nowrap">
@@ -87,6 +120,7 @@
<Table.Cell class="hidden text-right md:table-cell" <Table.Cell class="hidden text-right md:table-cell"
>{unixToRelativeTime(merit.TimeStamp * 1000)}</Table.Cell >{unixToRelativeTime(merit.TimeStamp * 1000)}</Table.Cell
> >
<Table.Cell class="table-cell">{status(merit).toUpperCase()}</Table.Cell>
</Table.Row> </Table.Row>
{/each} {/each}
</Table.Body> </Table.Body>

View File

@@ -33,8 +33,8 @@ export class MeritRequest {
return _solution; return _solution;
} }
IncludedInRocketState(rocket: Rocket): boolean { IncludedInRocketState(rocket: Rocket): boolean {
let included = rocket.ApprovedMeritRequests() let included = rocket.ApprovedMeritRequests();
return Boolean(included.get(this.ID)) return Boolean(included.get(this.ID));
} }
BasicValidation(): boolean { BasicValidation(): boolean {
//todo: make a ValidateAgainstRocket and check that pubkey is in WoT //todo: make a ValidateAgainstRocket and check that pubkey is in WoT
@@ -67,9 +67,9 @@ export class MeritRequest {
} }
constructor(request: NDKEvent | string) { constructor(request: NDKEvent | string) {
if (typeof request == 'string') { if (typeof request == 'string') {
console.log(69) console.log(69);
} else { } else {
console.log(71) console.log(71);
this.LeadTime = 0; this.LeadTime = 0;
this.LastLTUpdate = 0; this.LastLTUpdate = 0;
this.Event = request; this.Event = request;
@@ -301,3 +301,41 @@ export class MapOfVotes {
} }
} }
} }
export class MapOfMeritResult {
meritResult: Map</* merit id */ string, VoteDirection | undefined>;
constructor(votes: NDKEvent[], rocket: Rocket) {
const meritVotes = new Map<string, Votes>();
for (let v of votes) {
let vote = new Vote(v);
if (vote.BasicValidation() && vote.ValidateAgainstRocket(rocket)) {
const mVotes = meritVotes.get(vote.Request);
if (mVotes) {
meritVotes.set(vote.Request, pubkeyLatestVote(new Votes([...mVotes.Votes, vote])));
} else {
meritVotes.set(vote.Request, new Votes([vote]));
}
}
}
this.meritResult = new Map<string, VoteDirection | undefined>();
for (let [merit, votes] of meritVotes) {
const result = votes.Results().Result(rocket);
this.meritResult.set(merit, result);
}
}
}
/**
* only show the latest vote from each pubkey
*/
function pubkeyLatestVote(votes: Votes) {
let pMap = new Map<string, Vote>();
for (let v of votes.Votes) {
let existing = pMap.get(v.Pubkey);
if (!existing || (existing && existing.TimeStamp < v.TimeStamp)) {
//todo: check if this merit request has already been included in the rocket. If not, and if we have enough votes to approve it, update the rocket.
pMap.set(v.Pubkey, v);
}
}
return new Votes([...pMap.values()]);
}