diff --git a/src/lib/components/events/EventWrapper.svelte b/src/lib/components/events/EventWrapper.svelte index 673c7d7..14b21eb 100644 --- a/src/lib/components/events/EventWrapper.svelte +++ b/src/lib/components/events/EventWrapper.svelte @@ -7,6 +7,7 @@ import { logged_in_user } from '$lib/stores/users' import type { NDKEvent } from '@nostr-dev-kit/ndk' + export let type: 'proposal' | 'issue' = 'proposal' export let author: User = { ...user_defaults } export let created_at: number | undefined export let event_id = '' @@ -96,7 +97,7 @@ >
- +
{/if} diff --git a/src/lib/components/events/content/utils.ts b/src/lib/components/events/content/utils.ts index 93b0327..f7e8308 100644 --- a/src/lib/components/events/content/utils.ts +++ b/src/lib/components/events/content/utils.ts @@ -104,3 +104,20 @@ export const extractPatchMessage = (s: string): string | undefined => { return undefined } } + +/** this doesn't work for all patch formats and options */ +export const extractPatchTitle = (s: string): string | undefined => { + const msg = extractPatchMessage(s) + if (!msg) return undefined + return s.split('\n')[0] +} + +export const extractIssueTitle = (s: string): string => { + return s.split('\n')[0] || '' +} + +export const extractIssueDescription = (s: string): string => { + const split = s.split('\n') + if (split.length === 0) return '' + return s.substring(split[0].length) || '' +} diff --git a/src/lib/components/proposals/ProposalDetails.svelte b/src/lib/components/proposals/ProposalDetails.svelte index 4be5689..6490100 100644 --- a/src/lib/components/proposals/ProposalDetails.svelte +++ b/src/lib/components/proposals/ProposalDetails.svelte @@ -1,9 +1,12 @@
@@ -26,9 +29,10 @@ {:else}

Status

{/if}
diff --git a/src/lib/components/proposals/ProposalHeader.svelte b/src/lib/components/proposals/ProposalHeader.svelte index 8f7d664..ecabf16 100644 --- a/src/lib/components/proposals/ProposalHeader.svelte +++ b/src/lib/components/proposals/ProposalHeader.svelte @@ -10,6 +10,7 @@ import Status from './Status.svelte' dayjs.extend(relativeTime) + export let type: 'proposal' | 'issue' = 'proposal' export let { title, descritpion, @@ -59,7 +60,7 @@
- +
opened {created_at_ago} diff --git a/src/lib/components/proposals/Status.svelte b/src/lib/components/proposals/Status.svelte index fe17853..5f83274 100644 --- a/src/lib/components/proposals/Status.svelte +++ b/src/lib/components/proposals/Status.svelte @@ -5,9 +5,11 @@ proposal_status_draft, proposal_status_open, } from '$lib/kinds' + import { issue_icon_path } from '../issues/icons' import { proposal_icon_path } from './icons' export let status: number | undefined = undefined + export let type: 'proposal' | 'issue' = 'proposal' export let edit_mode = false @@ -32,7 +34,14 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" class="h-5 w-5 flex-none fill-success-content pt-1" - > + > + {#if type === 'proposal'} + + {:else if type === 'issue'} + {#each issue_icon_path.open as p} + + {/each} + {/if} Open {:else if status === proposal_status_applied} @@ -40,16 +49,30 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="h-5 w-5 flex-none fill-primary-content pt-1" - > + {#if type === 'proposal'} + + {:else if type === 'issue'} + {#each issue_icon_path.resolved as p} + + {/each} + {/if} + Applied {:else if status === proposal_status_closed} + {#if type === 'proposal'} + + {:else if type === 'issue'} + {#each issue_icon_path.closed as p} + + {/each} + {/if} + Closed {:else if status === proposal_status_draft} @@ -70,7 +71,8 @@ try { let _ = await event.publish(NDKRelaySet.fromRelayUrls(relays, ndk)) selected_proposal_full.update((proposal_full) => { - if (proposal_full.summary.id !== proposal_id) return proposal_full + if (proposal_full.summary.id !== proposal_or_issue_id) + return proposal_full return { ...proposal_full, summary: { @@ -89,20 +91,20 @@ {:else}
- + {#if edit_mode}
    - {#if status !== proposal_status_draft} + {#if status !== proposal_status_draft && type !== 'issue'}
  • {statusKindtoText(proposal_status_draft, type)}
    • {/if} @@ -113,7 +115,7 @@ changeStatus(proposal_status_open) }} class="btn btn-success btn-sm mx-2 align-middle" - >{statusKindtoText(proposal_status_open)}{statusKindtoText(proposal_status_open, type)} {/if} @@ -124,7 +126,7 @@ changeStatus(proposal_status_applied) }} class="btn btn-primary btn-sm mx-2 align-middle" - >{statusKindtoText(proposal_status_applied)}{statusKindtoText(proposal_status_applied, type)} {/if} @@ -135,7 +137,7 @@ changeStatus(proposal_status_closed) }} class="btn btn-neutral btn-sm mx-2 align-middle" - >{statusKindtoText(proposal_status_closed)}{statusKindtoText(proposal_status_closed, type)} {/if} diff --git a/src/lib/kinds.ts b/src/lib/kinds.ts index e51d202..ee5838a 100644 --- a/src/lib/kinds.ts +++ b/src/lib/kinds.ts @@ -11,9 +11,13 @@ export const proposal_status_kinds: number[] = [ proposal_status_draft, ] -export function statusKindtoText(kind: number): string { +export function statusKindtoText( + kind: number, + type: 'proposal' | 'issue' +): string { if (kind === proposal_status_open) return 'Open' - if (kind === proposal_status_applied) return 'Applied' + if (type === 'proposal' && kind === proposal_status_applied) return 'Applied' + if (type === 'issue' && kind === proposal_status_applied) return 'Resolved' if (kind === proposal_status_closed) return 'Closed' return 'Draft' } diff --git a/src/lib/stores/Issue.ts b/src/lib/stores/Issue.ts new file mode 100644 index 0000000..320897f --- /dev/null +++ b/src/lib/stores/Issue.ts @@ -0,0 +1,200 @@ +import { NDKRelaySet, type NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk' +import { writable, type Unsubscriber, type Writable } from 'svelte/store' +import { base_relays, ndk } from './ndk' +import type { User } from '$lib/components/users/type' +import { ensureUser } from './users' +import { type IssueFull, full_defaults } from '$lib/components/issues/type' +import { proposal_status_kinds, proposal_status_open } from '$lib/kinds' +import { awaitSelectedRepoCollection } from './repo' +import { + extractIssueDescription, + extractIssueTitle, +} from '$lib/components/events/content/utils' +import { goto } from '$app/navigation' +import { selectRepoFromCollection } from '$lib/components/repo/utils' + +export const selected_issue_full: Writable = writable({ + ...full_defaults, +}) + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +let selected_issue_repo_id: string = '' +let selected_issue_id: string = '' +let issue_summary_author_unsubsriber: Unsubscriber | undefined + +export const selected_issue_replies: Writable = writable([]) + +let selected_issue_status_date = 0 + +let sub: NDKSubscription + +let sub_replies: NDKSubscription + +export const ensureIssueFull = (repo_identifier: string, issue_id: string) => { + if (selected_issue_id == issue_id) return + if (issue_id == '') { + selected_issue_full.set({ ...full_defaults }) + selected_issue_replies.set([]) + return + } + + if (sub) sub.stop() + if (sub_replies) sub_replies.stop() + + selected_issue_repo_id = repo_identifier + selected_issue_id = issue_id + selected_issue_status_date = 0 + selected_issue_replies.set([]) + + selected_issue_full.set({ + ...full_defaults, + summary: { + ...full_defaults.summary, + id: issue_id, + repo_identifier: repo_identifier, + loading: true, + }, + loading: true, + }) + if (issue_summary_author_unsubsriber) issue_summary_author_unsubsriber() + issue_summary_author_unsubsriber = undefined + + new Promise(async (r) => { + const repo_collection = await awaitSelectedRepoCollection(repo_identifier) + const repo = selectRepoFromCollection(repo_collection) + const relays_to_use = + repo && repo.relays.length > 3 + ? repo.relays + : [...base_relays].concat(repo ? repo.relays : []) + + sub = ndk.subscribe( + { + ids: [issue_id], + limit: 50, + }, + { + closeOnEose: true, + }, + NDKRelaySet.fromRelayUrls(relays_to_use, ndk) + ) + + sub.on('event', (event: NDKEvent) => { + try { + if (event.id == issue_id) { + const event_repo_id = event.tagValue('a')?.split(':')[2] + if (event_repo_id && event_repo_id !== repo_identifier) { + goto(`/repo/${encodeURIComponent(event_repo_id)}/issue/${issue_id}`) + } + selected_issue_full.update((full) => { + return { + ...full, + issue_event: event, + summary: { + ...full.summary, + title: extractIssueTitle(event.content), + descritpion: extractIssueDescription(event.content), + created_at: event.created_at, + comments: 0, + author: { + hexpubkey: event.pubkey, + loading: true, + npub: '', + }, + loading: false, + }, + } + }) + + issue_summary_author_unsubsriber = ensureUser(event.pubkey).subscribe( + (u: User) => { + selected_issue_full.update((full) => { + return { + ...full, + summary: { + ...full.summary, + author: + event.pubkey == u.hexpubkey ? u : full.summary.author, + }, + } + }) + } + ) + } + } catch {} + }) + + sub.on('eose', () => { + selected_issue_full.update((full) => { + const updated = { + ...full, + summary: { + ...full.summary, + loading: false, + }, + } + if (full.loading === false) { + r({ ...updated }) + } + return updated + }) + }) + + sub_replies = ndk.subscribe( + { + '#e': [issue_id], + }, + { + closeOnEose: false, + }, + NDKRelaySet.fromRelayUrls(relays_to_use, ndk) + ) + + const process_replies = (event: NDKEvent) => { + if ( + event.kind && + proposal_status_kinds.includes(event.kind) && + event.created_at && + selected_issue_status_date < event.created_at + ) { + selected_issue_status_date = event.created_at + selected_issue_full.update((full) => { + return { + ...full, + summary: { + ...full.summary, + status: event.kind, + // this wont be 0 as we are ensuring it is not undefined above + status_date: event.created_at || 0, + }, + } + }) + } + selected_issue_replies.update((replies) => { + return [...replies, event].sort( + (a, b) => (a.created_at || 0) - (b.created_at || 0) + ) + }) + } + + sub_replies.on('event', (event: NDKEvent) => { + process_replies(event) + }) + + sub_replies.on('eose', () => { + selected_issue_full.update((full) => { + const updated = { + ...full, + summary: { + ...full.summary, + status: full.summary.status || proposal_status_open, + }, + loading: false, + } + if (full.summary.loading === false) { + r({ ...updated }) + } + return updated + }) + }) + }) +} diff --git a/src/lib/stores/Issues.ts b/src/lib/stores/Issues.ts index 018bcec..95ea062 100644 --- a/src/lib/stores/Issues.ts +++ b/src/lib/stores/Issues.ts @@ -15,7 +15,10 @@ import { proposal_status_open, repo_kind, } from '$lib/kinds' -import { extractPatchMessage } from '$lib/components/events/content/utils' +import { + extractIssueDescription, + extractIssueTitle, +} from '$lib/components/events/content/utils' import { selectRepoFromCollection } from '$lib/components/repo/utils' import { summary_defaults, @@ -112,13 +115,8 @@ export const ensureIssueSummaries = async (repo_id: string | undefined) => { id: event.id, repo_identifier: extractRepoIdentiferFromIssueEvent(event) || repo_id || '', - title: ( - event.tagValue('name') || - event.tagValue('description') || - extractPatchMessage(event.content) || - '' - ).split('\n')[0], - descritpion: event.tagValue('description') || '', + title: extractIssueTitle(event.content), + descritpion: extractIssueDescription(event.content), created_at: event.created_at, comments: 0, author: { diff --git a/src/lib/stores/Proposal.ts b/src/lib/stores/Proposal.ts index 999aeda..b332bfb 100644 --- a/src/lib/stores/Proposal.ts +++ b/src/lib/stores/Proposal.ts @@ -30,7 +30,10 @@ let sub: NDKSubscription let sub_replies: NDKSubscription -export const ensureProposalFull = (repo_id: string, proposal_id: string) => { +export const ensureProposalFull = ( + repo_identifier: string, + proposal_id: string +) => { if (selected_proposal_id == proposal_id) return if (proposal_id == '') { selected_proposal_full.set({ ...full_defaults }) @@ -41,7 +44,7 @@ export const ensureProposalFull = (repo_id: string, proposal_id: string) => { if (sub) sub.stop() if (sub_replies) sub_replies.stop() - selected_proposal_repo_id = repo_id + selected_proposal_repo_id = repo_identifier selected_proposal_id = proposal_id selected_proposal_status_date = 0 selected_proposal_replies.set([]) @@ -51,7 +54,7 @@ export const ensureProposalFull = (repo_id: string, proposal_id: string) => { summary: { ...full_defaults.summary, id: proposal_id, - repo_identifier: repo_id, + repo_identifier: repo_identifier, loading: true, }, loading: true, @@ -60,7 +63,7 @@ export const ensureProposalFull = (repo_id: string, proposal_id: string) => { proposal_summary_author_unsubsriber = undefined new Promise(async (r) => { - const repo_collection = await awaitSelectedRepoCollection(repo_id) + const repo_collection = await awaitSelectedRepoCollection(repo_identifier) const repo = selectRepoFromCollection(repo_collection) const relays_to_use = repo && repo.relays.length > 3 @@ -82,7 +85,7 @@ export const ensureProposalFull = (repo_id: string, proposal_id: string) => { try { if (event.id == proposal_id) { const event_repo_id = event.tagValue('a')?.split(':')[2] - if (event_repo_id && event_repo_id !== repo_id) { + if (event_repo_id && event_repo_id !== repo_identifier) { goto( `/repo/${encodeURIComponent(event_repo_id)}/proposal/${proposal_id}` ) diff --git a/src/lib/wrappers/ComposeIssue.svelte b/src/lib/wrappers/ComposeIssue.svelte index cd847fe..21fc6ea 100644 --- a/src/lib/wrappers/ComposeIssue.svelte +++ b/src/lib/wrappers/ComposeIssue.svelte @@ -60,7 +60,7 @@ submitting = false submitted = true setTimeout(() => { - goto(`/repo/${repo_event.identifier}/issues/${event.id}`) + goto(`/repo/${repo_event.identifier}/issue/${event.id}`) }, 2000) } catch {} } diff --git a/src/lib/wrappers/ComposeReply.svelte b/src/lib/wrappers/ComposeReply.svelte index b379572..22730b6 100644 --- a/src/lib/wrappers/ComposeReply.svelte +++ b/src/lib/wrappers/ComposeReply.svelte @@ -9,27 +9,34 @@ } from '$lib/stores/repo' import Compose from '$lib/components/events/Compose.svelte' import { selected_proposal_full } from '$lib/stores/Proposal' + import { selected_issue_full } from '$lib/stores/Issue' + export let type: 'proposal' | 'issue' = 'proposal' export let reply_to_event_id = '' let repo_identifier: string - let proposal_id: string + let proposal_or_issue_id: string let submitting = false let submitted = false let edit_mode = false $: { repo_identifier = $selected_repo_collection.identifier - proposal_id = $selected_proposal_full.summary.id + selected_issue_full + proposal_or_issue_id = ( + type === 'proposal' ? $selected_proposal_full : $selected_issue_full + ).summary.id edit_mode = - repo_identifier.length > 0 && proposal_id.length > 0 && !submitted + repo_identifier.length > 0 && + proposal_or_issue_id.length > 0 && + !submitted } async function sendReply(content: string) { if (!$logged_in_user) return let event = new NDKEvent(ndk) event.kind = reply_kind - event.tags.push(['e', proposal_id, 'root']) + event.tags.push(['e', proposal_or_issue_id, 'root']) if (reply_to_event_id.length > 0) { event.tags.push(['e', reply_to_event_id, 'reply']) } diff --git a/src/lib/wrappers/EventCard.svelte b/src/lib/wrappers/EventCard.svelte index a7551f2..7bd1b52 100644 --- a/src/lib/wrappers/EventCard.svelte +++ b/src/lib/wrappers/EventCard.svelte @@ -11,6 +11,7 @@ import { writable, type Unsubscriber } from 'svelte/store' export let event: NDKEvent + export let type: 'proposal' | 'issue' = 'proposal' let author = writable({ ...user_defaults }) let author_unsubsriber: Unsubscriber @@ -26,6 +27,7 @@ - + {#each $replies_store as event} - + {/each} diff --git a/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte new file mode 100644 index 0000000..de9331f --- /dev/null +++ b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.svelte @@ -0,0 +1,94 @@ + + +{#if !repo_error} + +{/if} + +{#if issue_error} + + + +{:else} + + +
    +
    +
    +
    + +
    + {#each $selected_issue_replies as event} + + {/each} +
    + +
    +
    +
    + +
    +     +{/if} diff --git a/src/routes/repo/[repo_id]/issue/[issue_id]/+page.ts b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.ts new file mode 100644 index 0000000..ce6cc54 --- /dev/null +++ b/src/routes/repo/[repo_id]/issue/[issue_id]/+page.ts @@ -0,0 +1,10 @@ +export const load = ({ + params, +}: { + params: { issue_id: string; repo_id: string } +}) => { + return { + repo_id: decodeURIComponent(params.repo_id), + issue_id: params.issue_id, + } +} diff --git a/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte b/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte index 538eebb..9db6140 100644 --- a/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte +++ b/src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte @@ -110,10 +110,10 @@
{#each $selected_proposal_replies as event} - + {/each}
- +