Browse Source

removed unnecessary embedding

master
silberengel 7 months ago
parent
commit
49cf654173
  1. 10
      src/lib/components/CommentViewer.svelte
  2. 4
      src/lib/components/EventDetails.svelte
  3. 14
      src/lib/components/Notifications.svelte
  4. 26
      src/routes/events/+page.svelte

10
src/lib/components/CommentViewer.svelte

@ -6,7 +6,7 @@
import { goto } from "$app/navigation"; import { goto } from "$app/navigation";
import { onMount } from "svelte"; import { onMount } from "svelte";
import type { NDKEvent } from "@nostr-dev-kit/ndk"; import type { NDKEvent } from "@nostr-dev-kit/ndk";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
const { event } = $props<{ event: NDKEvent }>(); const { event } = $props<{ event: NDKEvent }>();
@ -772,7 +772,9 @@
<div class="text-sm text-gray-600 dark:text-gray-400 mb-2"> <div class="text-sm text-gray-600 dark:text-gray-400 mb-2">
<span class="font-medium">Comment:</span> <span class="font-medium">Comment:</span>
</div> </div>
<EmbeddedEvent nostrIdentifier={node.event.getMatchingTags("comment")[0]?.[1]} nestingLevel={0} /> <div class="text-sm text-gray-700 dark:text-gray-300">
{node.event.getMatchingTags("comment")[0]?.[1] || "No comment content"}
</div>
</div> </div>
{:else} {:else}
<!-- Simple highlight --> <!-- Simple highlight -->
@ -812,7 +814,9 @@
</div> </div>
{:else} {:else}
<!-- Regular comment content --> <!-- Regular comment content -->
<EmbeddedEvent nostrIdentifier={node.event.id} nestingLevel={0} /> <div class="text-sm text-gray-700 dark:text-gray-300">
{node.event.content || "No content"}
</div>
{/if} {/if}
</div> </div>
</div> </div>

4
src/lib/components/EventDetails.svelte

@ -14,7 +14,7 @@
import { navigateToEvent } from "$lib/utils/nostrEventService"; import { navigateToEvent } from "$lib/utils/nostrEventService";
import ContainingIndexes from "$lib/components/util/ContainingIndexes.svelte"; import ContainingIndexes from "$lib/components/util/ContainingIndexes.svelte";
import Notifications from "$lib/components/Notifications.svelte"; import Notifications from "$lib/components/Notifications.svelte";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
import type { UserProfile } from "$lib/models/user_profile"; import type { UserProfile } from "$lib/models/user_profile";
const { const {
@ -310,7 +310,7 @@
<span class="text-gray-700 dark:text-gray-300 font-semibold">Content:</span> <span class="text-gray-700 dark:text-gray-300 font-semibold">Content:</span>
<div class="prose dark:prose-invert max-w-none text-gray-900 dark:text-gray-100 break-words overflow-wrap-anywhere min-w-0"> <div class="prose dark:prose-invert max-w-none text-gray-900 dark:text-gray-100 break-words overflow-wrap-anywhere min-w-0">
<div class={shouldTruncate ? 'max-h-32 overflow-hidden' : ''}> <div class={shouldTruncate ? 'max-h-32 overflow-hidden' : ''}>
<EmbeddedEvent nostrIdentifier={event.id} nestingLevel={0} /> {event.content}
</div> </div>
{#if shouldTruncate} {#if shouldTruncate}
<button <button

14
src/lib/components/Notifications.svelte

@ -21,7 +21,7 @@
import { buildCompleteRelaySet } from "$lib/utils/relay_management"; import { buildCompleteRelaySet } from "$lib/utils/relay_management";
import { formatDate, neventEncode } from "$lib/utils"; import { formatDate, neventEncode } from "$lib/utils";
import { NDKRelaySetFromNDK } from "$lib/utils/nostrUtils"; import { NDKRelaySetFromNDK } from "$lib/utils/nostrUtils";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
import { getNdkContext } from "$lib/ndk"; import { getNdkContext } from "$lib/ndk";
const { event } = $props<{ event: NDKEvent }>(); const { event } = $props<{ event: NDKEvent }>();
@ -817,7 +817,9 @@
{#if message.content} {#if message.content}
<div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed"> <div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed">
<div class="px-2"> <div class="px-2">
<EmbeddedEvent nostrIdentifier={message.id} nestingLevel={0} /> <div class="text-sm text-gray-700 dark:text-gray-300">
{message.content || "No content"}
</div>
</div> </div>
</div> </div>
{/if} {/if}
@ -894,7 +896,9 @@
{#if notification.content} {#if notification.content}
<div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed"> <div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed">
<div class="px-2"> <div class="px-2">
<EmbeddedEvent nostrIdentifier={notification.id} nestingLevel={0} /> <div class="text-sm text-gray-700 dark:text-gray-300">
{notification.content || "No content"}
</div>
</div> </div>
</div> </div>
{/if} {/if}
@ -929,7 +933,9 @@
<div class="quoted-content mb-4 p-3 rounded-r-lg"> <div class="quoted-content mb-4 p-3 rounded-r-lg">
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">Replying to:</div> <div class="text-sm text-gray-600 dark:text-gray-400 mb-1">Replying to:</div>
<div class="text-sm text-gray-800 dark:text-gray-200"> <div class="text-sm text-gray-800 dark:text-gray-200">
<EmbeddedEvent nostrIdentifier={replyToMessage.id} nestingLevel={0} /> <div class="text-sm text-gray-700 dark:text-gray-300">
{replyToMessage.content || "No content"}
</div>
</div> </div>
</div> </div>
{/if} {/if}

26
src/routes/events/+page.svelte

@ -21,7 +21,7 @@
import { getEventType } from "$lib/utils/mime"; import { getEventType } from "$lib/utils/mime";
import ViewPublicationLink from "$lib/components/util/ViewPublicationLink.svelte"; import ViewPublicationLink from "$lib/components/util/ViewPublicationLink.svelte";
import { checkCommunity } from "$lib/utils/search_utility"; import { checkCommunity } from "$lib/utils/search_utility";
import EmbeddedEvent from "$lib/components/embedded_events/EmbeddedEvent.svelte";
import { userStore } from "$lib/stores/userStore"; import { userStore } from "$lib/stores/userStore";
import { import {
fetchCurrentUserLists, fetchCurrentUserLists,
@ -751,10 +751,10 @@
<div <div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words" class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
> >
<EmbeddedEvent {result.content.slice(0, 200)}
nostrIdentifier={result.id} {#if result.content.length > 200}
nestingLevel={0} <span class="text-gray-500 dark:text-gray-400">...</span>
/> {/if}
</div> </div>
{/if} {/if}
{/if} {/if}
@ -938,10 +938,10 @@
<div <div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words" class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
> >
<EmbeddedEvent {result.content.slice(0, 200)}
nostrIdentifier={result.id} {#if result.content.length > 200}
nestingLevel={0} <span class="text-gray-500 dark:text-gray-400">...</span>
/> {/if}
</div> </div>
{/if} {/if}
{/if} {/if}
@ -1111,10 +1111,10 @@
<div <div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words" class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
> >
<EmbeddedEvent {result.content.slice(0, 200)}
nostrIdentifier={result.id} {#if result.content.length > 200}
nestingLevel={0} <span class="text-gray-500 dark:text-gray-400">...</span>
/> {/if}
</div> </div>
{/if} {/if}
{/if} {/if}

Loading…
Cancel
Save