Browse Source

refactor: rename Compose to ComposeReply

and rename repo_id to identifier to make it clear
that is what is needed
master
DanConwayDev 2 years ago
parent
commit
72ff0bdf42
No known key found for this signature in database
GPG Key ID: 68E15486D73F75E1
  1. 4
      src/lib/components/events/EventWrapper.svelte
  2. 19
      src/lib/wrappers/ComposeReply.svelte
  3. 4
      src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte

4
src/lib/components/events/EventWrapper.svelte

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
import UserHeader from '../users/UserHeader.svelte'
import type { User } from '../users/type'
import { defaults as user_defaults } from '../users/type'
import Compose from '$lib/wrappers/Compose.svelte'
import ComposeReply from '$lib/wrappers/ComposeReply.svelte'
import { logged_in_user } from '$lib/stores/users'
import type { NDKEvent } from '@nostr-dev-kit/ndk'
@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
>
</div>
<div class="">
<Compose reply_to_event_id={event_id} />
<ComposeReply reply_to_event_id={event_id} />
</div>
</div>
{/if}

19
src/lib/wrappers/Compose.svelte → src/lib/wrappers/ComposeReply.svelte

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<script lang="ts">
import { ndk } from '$lib/stores/ndk'
import { base_relays, ndk } from '$lib/stores/ndk'
import { NDKEvent, NDKRelaySet } from '@nostr-dev-kit/ndk'
import { reply_kind, repo_kind } from '$lib/kinds'
import { getUserRelays, logged_in_user } from '$lib/stores/users'
@ -11,18 +11,18 @@ @@ -11,18 +11,18 @@
import { selected_proposal_full } from '$lib/stores/Proposal'
export let reply_to_event_id = ''
let repo_id: string
let repo_identifier: string
let proposal_id: string
let submitting = false
let submitted = false
let edit_mode = false
$: {
repo_id = $selected_repo_collection.identifier
repo_identifier = $selected_repo_collection.identifier
proposal_id = $selected_proposal_full.summary.id
edit_mode = repo_id.length > 0 && proposal_id.length > 0 && !submitted
edit_mode =
repo_identifier.length > 0 && proposal_id.length > 0 && !submitted
}
async function sendReply(content: string) {
@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
}
event.tags.push([
'a',
`${repo_kind}:${$selected_repo_event.maintainers[0].hexpubkey}:${repo_id}`,
`${repo_kind}:${$selected_repo_event.maintainers[0].hexpubkey}:${repo_identifier}`,
])
$selected_repo_event.maintainers.forEach((m) =>
event.tags.push(['p', m.hexpubkey])
@ -46,7 +46,12 @@ @@ -46,7 +46,12 @@
// TODO nip-10 reply chain p tags
event.content = content
submitting = true
let relays = [...$selected_repo_event.relays]
let relays = [
...($selected_repo_event.relays.length > 3
? $selected_repo_event.relays
: [...base_relays].concat($selected_repo_event.relays)),
]
try {
event.sign()
} catch {

4
src/routes/repo/[repo_id]/proposal/[proposal_id]/+page.svelte

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
import ProposalDetails from '$lib/components/proposals/ProposalDetails.svelte'
import Container from '$lib/components/Container.svelte'
import ParsedContent from '$lib/components/events/content/ParsedContent.svelte'
import Compose from '$lib/wrappers/Compose.svelte'
import ComposeReply from '$lib/wrappers/ComposeReply.svelte'
import { patch_kind } from '$lib/kinds'
import Patch from '$lib/components/events/content/Patch.svelte'
@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
<Thread {event} replies={[]} />
{/each}
<div class="my-3">
<Compose />
<ComposeReply />
</div>
</div>
</div>

Loading…
Cancel
Save