feat: event previews for issues, patches and repos

to be displayed when they are embedded into events

src/lib/components/events/EventWrapperLite.svelte

@@ -18,6 +18,6 @@
         <UserHeader user={author} inline />
       </div>
     </div>
-    <span class="m-auto pr-1 text-xs">{created_at_ago}</span>
+    <span class="m-auto flex-none py-1 text-xs">{created_at_ago}</span>
   </div>
 </div>

src/lib/components/events/content/IssuePreview.svelte

@@ -0,0 +1,21 @@
+<script lang="ts">
+  import { extractAReference } from '$lib/components/repo/utils'
+  import { extractRepoAFromProposalEvent } from '$lib/stores/Proposals'
+  import type { NDKEvent } from '@nostr-dev-kit/ndk'
+  import { nip19 } from 'nostr-tools'
+
+  export let event: NDKEvent
+  let nevent = nip19.neventEncode({
+    id: event.id,
+    relays: event.relay ? [event.relay.url] : undefined,
+  })
+  let a_string = extractRepoAFromProposalEvent(event)
+  let pointer = a_string ? extractAReference(a_string) : undefined
+  let naddr = pointer ? nip19.naddrEncode(pointer) : undefined
+</script>
+
+<span>
+  Git Issue for <a class="opacity-50" href={`/e/${naddr}`}
+    >{pointer?.identifier}</a
+  >: <a href={`/e/${nevent}`}>{event.content?.split('\n')[0]}</a> by
+</span>

src/lib/components/events/content/ParsedContent.svelte

@@ -43,7 +43,7 @@
         <UserHeader user={part.hex} inline={true} size="sm" />
       </div>
     {:else if isParsedNevent(part) || isParsedNote(part) || isParsedNaddr(part)}
-      <EventPreview parsed_nostr_ref={part} />
+      <EventPreview pointer={part.data} />
     {:else if isParsedText(part)}
       {part.value}
     {/if}

src/lib/components/events/content/Patch.svelte

@@ -1,20 +1,28 @@
 <script lang="ts">
-  import type { NDKTag } from '@nostr-dev-kit/ndk'
+  import type { NDKEvent, NDKTag } from '@nostr-dev-kit/ndk'
   import parseDiff from 'parse-diff'
   import hljs from 'highlight.js/lib/common'
   import 'highlight.js/styles/agate.min.css'
   import type { Change, AddChange, DeleteChange } from 'parse-diff'
   import ParsedContent from './ParsedContent.svelte'
-  import { extractPatchMessage } from './utils'
+  import { extractPatchMessage, extractTagContent } from './utils'
+  import { nip19 } from 'nostr-tools'
+  import { extractRepoAFromProposalEvent } from '$lib/stores/Proposals'
+  import { extractAReference } from '$lib/components/repo/utils'
+
+  export let event: NDKEvent
+  export let preview = false
+
+  let content: string = event ? event.content : ''
+  let tags: NDKTag[] = event ? event.tags : []
 
-  export let content: string = ''
-  export let tags: NDKTag[] = []
   let commit_id_shorthand =
-    extractTagContent('commit')?.substring(0, 8) || '[commit_id unknown]'
+    extractTagContent('commit', tags)?.substring(0, 8) || '[commit_id unknown]'
   let commit_message =
-    extractTagContent('description') ||
+    extractTagContent('description', tags) ||
     extractPatchMessage(content) ||
     '[untitled]'
+  let commit_title = commit_message.split('\n')[0]
 
   let files = parseDiff(content)
   let expand_files = files.map((file) => file.deletions + file.additions < 20)
@@ -27,11 +35,6 @@
 
   let expand_full_files = files.map((_) => false)
 
-  function extractTagContent(name: string): string | undefined {
-    let tag = tags.find((tag) => tag[0] === name)
-    return tag ? tag[1] : undefined
-  }
-
   let isAddChange = (change: Change): change is AddChange =>
     change.type == 'add'
   let isDeleteChange = (change: Change): change is DeleteChange =>
@@ -59,9 +62,24 @@
       return undefined
     }
   }
+  let nevent = nip19.neventEncode({
+    id: event.id,
+    relays: event.relay ? [event.relay.url] : undefined,
+  })
+
+  let a_string = extractRepoAFromProposalEvent(event)
+  let pointer = a_string ? extractAReference(a_string) : undefined
+  let naddr = pointer ? nip19.naddrEncode(pointer) : undefined
 </script>
 
-<div class="">
+{#if preview}
+  <span>
+    Git Patch for <a class="opacity-50" href={`/e/${naddr}`}
+      >{pointer?.identifier}</a
+    >: <a href={`/e/${nevent}`}>{commit_title}</a> by
+  </span>
+{:else}
+  <div class="">
     <div class="flex rounded-t bg-base-300 p-1">
       <article class="ml-2 flex-grow font-mono text-sm">
         <ParsedContent content={commit_message} />
@@ -230,4 +248,5 @@
         </div>
       {/if}
     {/each}
-</div>
+  </div>
+{/if}

src/lib/components/events/content/Repo.svelte

@@ -0,0 +1,19 @@
+<script lang="ts">
+  import type { RepoEvent } from '$lib/components/repo/type'
+  import { eventToRepoEvent } from '$lib/stores/repos'
+  import type { NDKEvent } from '@nostr-dev-kit/ndk'
+
+  export let event: NDKEvent | RepoEvent
+
+  const isRepoEvent = (event: NDKEvent | RepoEvent): event is RepoEvent => {
+    return Object.keys(event).includes('web')
+  }
+
+  let repo = isRepoEvent(event) ? event : eventToRepoEvent(event)
+</script>
+
+{#if repo}
+  <span class="">
+    Git Repository: <a href={`/r/${repo.naddr}`}>{repo.name}</a> by
+  </span>
+{/if}

src/lib/components/events/content/utils.ts

@@ -1,5 +1,6 @@
 import type { NDKTag } from '@nostr-dev-kit/ndk'
 import { nip19 } from 'nostr-tools'
+import type { AddressPointer, EventPointer } from 'nostr-tools/lib/types/nip19'
 import { last } from 'ramda'
 
 export const TOPIC = 'topic'
@@ -67,31 +68,29 @@ export const NOSTR_NOTE = 'nostr:note'
 type PartTypeNote = 'nostr:note'
 export type ParsedNote = {
   type: PartTypeNote
-  id: string
+  data: EventPointer
-  relays: string[]
 }
 
 export const NOSTR_NEVENT = 'nostr:nevent'
 type PartTypeNevent = 'nostr:nevent'
 export type ParsedNevent = {
   type: PartTypeNevent
-  id: string
+  data: EventPointer
-  relays: string[]
 }
 
-
 export const NOSTR_NADDR = 'nostr:naddr'
 type PartTypeNaddr = 'nostr:naddr'
 export type ParsedNaddr = {
   type: PartTypeNaddr
-  identifier: string
+  data: AddressPointer
-  pubkey: string
-  kind: number
-  relays: string[]
 }
 
-
+export type ParsedNostrLink =
-export type ParsedNostrLink = ParsedNpub | ParsedNprofile | ParsedNevent | ParsedNote | ParsedNaddr
+  | ParsedNpub
+  | ParsedNprofile
+  | ParsedNevent
+  | ParsedNote
+  | ParsedNaddr
 
 export const TEXT = 'text'
 type PartTypeText = 'text'
@@ -113,7 +112,11 @@ export const isParsedLink = (part: ParsedPart): part is ParsedLink =>
   part.type == LINK
 
 export const isParsedNostrLink = (part: ParsedPart): part is ParsedNostrLink =>
-  part.type == NOSTR_NPUB || part.type == NOSTR_NPROFILE || part.type == NOSTR_NEVENT || part.type == NOSTR_NOTE || part.type == NOSTR_NADDR
+  part.type == NOSTR_NPUB ||
+  part.type == NOSTR_NPROFILE ||
+  part.type == NOSTR_NEVENT ||
+  part.type == NOSTR_NOTE ||
+  part.type == NOSTR_NADDR
 
 export const isParsedNpub = (part: ParsedPart): part is ParsedNpub =>
   part.type == NOSTR_NPUB
@@ -219,13 +222,13 @@ export const parseContent = (content: string, tags: NDKTag[]): ParsedPart[] => {
           return [bech32, { type: NOSTR_NPUB, hex: decoded.data.pubkey }]
         }
         if (decoded.type === 'note') {
-          return [bech32, { type: NOSTR_NOTE, id: decoded.data, relays: [] }]
+          return [bech32, { type: NOSTR_NOTE, data: { id: decoded.data } }]
         }
         if (decoded.type === 'nevent') {
-          return [bech32, { type: NOSTR_NEVENT, id: decoded.data.id, relays: decoded.data.relays || [] }]
+          return [bech32, { type: NOSTR_NEVENT, data: decoded.data }]
         }
         if (decoded.type === 'naddr') {
-          return [bech32, { ...decoded.data, type: NOSTR_NADDR, relays: decoded.data.relays || [] }]
+          return [bech32, { type: NOSTR_NADDR, data: decoded.data }]
         }
       } catch {}
     }
@@ -266,6 +269,14 @@ export const isCoverLetter = (s: string): boolean => {
   return s.indexOf('PATCH 0/') > 0
 }
 
+export function extractTagContent(
+  name: string,
+  tags: NDKTag[]
+): string | undefined {
+  const tag = tags.find((tag) => tag[0] === name)
+  return tag ? tag[1] : undefined
+}
+
 /** this doesn't work for all patch formats and options */
 export const extractPatchMessage = (s: string): string | undefined => {
   try {

src/lib/wrappers/EventCard.svelte

@@ -5,7 +5,12 @@
   import Patch from '$lib/components/events/content/Patch.svelte'
   import ParsedContent from '$lib/components/events/content/ParsedContent.svelte'
   import { defaults as user_defaults } from '$lib/components/users/type'
-  import { patch_kind, proposal_status_kinds } from '$lib/kinds'
+  import {
+    issue_kind,
+    patch_kind,
+    proposal_status_kinds,
+    repo_kind,
+  } from '$lib/kinds'
   import { ensureUser } from '$lib/stores/users'
   import type { NDKEvent } from '@nostr-dev-kit/ndk'
   import { onDestroy } from 'svelte'
@@ -14,9 +19,12 @@
     extractPatchMessage,
     isCoverLetter,
   } from '$lib/components/events/content/utils'
+  import Repo from '$lib/components/events/content/Repo.svelte'
+  import IssuePreview from '$lib/components/events/content/IssuePreview.svelte'
 
   export let event: NDKEvent
   export let type: 'proposal' | 'issue' = 'proposal'
+  export let preview = false
 
   let author = writable({ ...user_defaults })
   let author_unsubsriber: Unsubscriber
@@ -45,6 +53,18 @@
   <EventWrapperLite author={$author} created_at={event.created_at}>
     added to '{getDtag(event) || 'unknown'}' list by
   </EventWrapperLite>
+{:else if event.kind && event.kind == repo_kind}
+  <EventWrapperLite author={$author} created_at={event.created_at}>
+    <Repo {event} />
+  </EventWrapperLite>
+{:else if preview && event.kind && event.kind === patch_kind}
+  <EventWrapperLite author={$author} created_at={event.created_at}>
+    <Patch {event} {preview} />
+  </EventWrapperLite>
+{:else if preview && event.kind && event.kind === issue_kind}
+  <EventWrapperLite author={$author} created_at={event.created_at}>
+    <IssuePreview {event} />
+  </EventWrapperLite>
 {:else}
   <EventWrapper {type} author={$author} created_at={event.created_at} {event}>
     {#if event.kind == patch_kind}
@@ -54,7 +74,7 @@
           tags={event.tags}
         />
       {:else}
-        <Patch content={event.content} tags={event.tags} />
+        <Patch {event} />
       {/if}
     {:else if event.kind && proposal_status_kinds.includes(event.kind)}
       <Status {type} status={event.kind} />

src/lib/wrappers/EventPreview.svelte

@@ -1,39 +1,47 @@
 <script lang="ts">
-  import EventWrapper from '$lib/components/events/EventWrapper.svelte'
-  import EventWrapperLite from '$lib/components/events/EventWrapperLite.svelte'
-  import Status from '$lib/components/events/content/Status.svelte'
-  import Patch from '$lib/components/events/content/Patch.svelte'
-  import ParsedContent from '$lib/components/events/content/ParsedContent.svelte'
-  import { defaults as user_defaults } from '$lib/components/users/type'
-  import { patch_kind, proposal_status_kinds } from '$lib/kinds'
-  import { ensureUser } from '$lib/stores/users'
   import { NDKRelaySet, type NDKEvent } from '@nostr-dev-kit/ndk'
-  import { onDestroy, onMount } from 'svelte'
+  import { onMount } from 'svelte'
-  import { get, writable, type Unsubscriber, type Writable } from 'svelte/store'
+  import { get, writable, type Writable } from 'svelte/store'
-  import {
-    extractPatchMessage,
-    isCoverLetter,
-    isParsedNaddr,
-    type ParsedNaddr,
-    type ParsedNevent,
-    type ParsedNote,
-  } from '$lib/components/events/content/utils'
   import { base_relays, ndk } from '$lib/stores/ndk'
   import EventCard from './EventCard.svelte'
+  import type {
+    AddressPointer,
+    EventPointer,
+  } from 'nostr-tools/lib/types/nip19'
+  import { repo_kind } from '$lib/kinds'
+  import { ensureRepo } from '$lib/stores/repos'
+  import EventWrapperLite from '$lib/components/events/EventWrapperLite.svelte'
+  import Repo from '$lib/components/events/content/Repo.svelte'
 
-  export let parsed_nostr_ref: ParsedNaddr | ParsedNevent | ParsedNote
+  export let pointer: AddressPointer | EventPointer
 
-  let cannot_find_event = false;
+  let cannot_find_event = false
   let event: Writable<undefined | NDKEvent> = writable(undefined)
 
+  const isAddressPointer = (
+    pointer: AddressPointer | EventPointer
+  ): pointer is AddressPointer => {
+    return Object.keys(pointer).includes('identifier')
+  }
+  let is_repo = isAddressPointer(pointer) && pointer.kind == repo_kind
+  let repo =
+    is_repo && isAddressPointer(pointer)
+      ? ensureRepo(`${pointer.kind}:${pointer.pubkey}:${pointer.identifier}`)
+      : undefined
+
   onMount(() => {
+    if (!is_repo) {
       let sub = ndk.subscribe(
-      isParsedNaddr(parsed_nostr_ref) ? {
+        isAddressPointer(pointer)
-        '#a': [`${parsed_nostr_ref.kind}:${parsed_nostr_ref.pubkey}:${parsed_nostr_ref.identifier}`],
+          ? {
-      } :
+              '#a': [`${pointer.kind}:${pointer.pubkey}:${pointer.identifier}`],
-      { ids: [parsed_nostr_ref.id] },
+            }
-      {closeOnEose: true},
+          : { ids: [pointer.id] },
-      NDKRelaySet.fromRelayUrls([ ...base_relays, ...parsed_nostr_ref.relays ], ndk)
+        { closeOnEose: true },
+        NDKRelaySet.fromRelayUrls(
+          pointer.relays ? [...base_relays, ...pointer.relays] : base_relays,
+          ndk
+        )
       )
 
       sub.on('event', (e: NDKEvent) => {
@@ -43,16 +51,22 @@
       sub.on('eose', () => {
         if (!get(event)) cannot_find_event = true
       })
+    }
   })
 </script>
 
-  <div class="card shadow-xl border border-base-400 p-2 pt-0 my-3">
+<div class="card my-3 border border-base-400 shadow-xl">
-    {#if $event && $event.pubkey}
+  {#if repo && $repo}
-      <EventCard event={$event} />
+    <EventWrapperLite author={$repo?.author} created_at={$repo?.created_at}>
+      <Repo event={$repo} />
+    </EventWrapperLite>
+  {:else if $event && $event.pubkey}
+    <div class="p-2 pt-0">
+      <EventCard event={$event} preview={true} />
+    </div>
   {:else if cannot_find_event}
-      cannot find event
+    <div class="m-3 text-center text-sm">cannot find event</div>
   {:else}
-      loading...
+    <div class="m-3 text-center text-sm">loading...</div>
   {/if}
-  </div>
+</div>
-