Browse Source

fix(PrPage): use l tag for status

instead of t tag to more closely align to nip-32
master
DanConwayDev 2 years ago
parent
commit
dd24dc1236
No known key found for this signature in database
GPG Key ID: 68E15486D73F75E1
  1. 2
      src/lib/components/prs/StatusSelector.svelte
  2. 6
      src/lib/stores/PR.ts
  3. 6
      src/lib/stores/PRs.ts

2
src/lib/components/prs/StatusSelector.svelte

@ -24,7 +24,7 @@
if (!$logged_in_user) return; if (!$logged_in_user) return;
let event = new NDKEvent(ndk); let event = new NDKEvent(ndk);
event.kind = pr_status_kind; event.kind = pr_status_kind;
event.tags.push(["t", new_status]); event.tags.push(["l", new_status]);
event.tags.push(["e", pr_id]); event.tags.push(["e", pr_id]);
event.tags.push(["r", `r-${repo_id}`]); event.tags.push(["r", `r-${repo_id}`]);
loading = true; loading = true;

6
src/lib/stores/PR.ts

@ -136,10 +136,10 @@ export let ensurePRFull = (repo_id: string, pr_id: string) => {
sub_replies.on("event", (event: NDKEvent) => { sub_replies.on("event", (event: NDKEvent) => {
if (event.kind == pr_status_kind if (event.kind == pr_status_kind
&& event.created_at && selected_pr_status_date < event.created_at && event.created_at && selected_pr_status_date < event.created_at
&& event.getMatchingTags("t").length === 1 && event.getMatchingTags("l").length === 1
&& event.getMatchingTags("t")[0].length > 1 && event.getMatchingTags("l")[0].length > 1
) { ) {
let potential_status = event.getMatchingTags("t")[0][1]; let potential_status = event.getMatchingTags("l")[0][1];
if (isPRStatus(potential_status)) { if (isPRStatus(potential_status)) {
selected_pr_status_date = event.created_at; selected_pr_status_date = event.created_at;

6
src/lib/stores/PRs.ts

@ -128,10 +128,10 @@ function getAndUpdatePRStatus(prs: PRSummaries, repo: Repo): void {
if (event.kind == pr_status_kind if (event.kind == pr_status_kind
&& tagged_pr_event && tagged_pr_event
&& event.created_at && event.created_at
&& event.getMatchingTags("t").length === 1 && event.getMatchingTags("l").length === 1
&& event.getMatchingTags("t")[0].length > 1 && event.getMatchingTags("l")[0].length > 1
) { ) {
let potential_status = event.getMatchingTags("t")[0][1]; let potential_status = event.getMatchingTags("l")[0][1];
if (isPRStatus(potential_status)) { if (isPRStatus(potential_status)) {
pr_summaries.update(prs => { pr_summaries.update(prs => {

Loading…
Cancel
Save