Skip to content

Commit

Permalink
feat(components/MessageBar): remove message content from reply preview
Browse files Browse the repository at this point in the history
  • Loading branch information
jgmontoya committed Feb 25, 2025
1 parent 9d104a3 commit d20c9e8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
20 changes: 19 additions & 1 deletion src/lib/components/MessageBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { activeAccount } from "$lib/stores/accounts";
import type { NEvent, NostrMlsGroup, NostrMlsGroupWithRelays } from "$lib/types/nostr";
import { hexMlsGroupId } from "$lib/utils/group";
import { messageHasDeletionTag } from "$lib/utils/message";
import { invoke } from "@tauri-apps/api/core";
import { PaperPlaneTilt, X } from "phosphor-svelte";
import { onMount } from "svelte";
Expand All @@ -11,15 +12,26 @@ let {
group,
replyToMessageEvent = $bindable(),
handleNewMessage,
messages = [],
}: {
group: NostrMlsGroup;
replyToMessageEvent?: NEvent;
handleNewMessage: (message: NEvent, replaceTemp: boolean) => void;
messages: NEvent[];
} = $props();
let message = $state("");
let textarea: HTMLTextAreaElement;
let sendingMessage: boolean = $state(false);
let isReplyToMessageDeleted = $state(false);
$effect(() => {
if (replyToMessageEvent?.id) {
isReplyToMessageDeleted = messageHasDeletionTag(replyToMessageEvent.id, messages);
} else {
isReplyToMessageDeleted = false;
}
});
function adjustTextareaHeight() {
textarea.style.height = "auto";
Expand Down Expand Up @@ -101,7 +113,13 @@ onMount(() => {
<div class="messagebar sticky bottom-0 left-0 right-0 bg-gray-900 drop-shadow-message-bar">
{#if replyToMessageEvent}
<div class="w-full py-4 px-6 pl-8 bg-blue-700/50 text-white backdrop-blur-sm border-t border-gray-700 border-l-4 border-l-blue-500 flex flex-row gap-2 items-start justify-between rounded-t-xl">
<span>{replyToMessageEvent.content}</span>
{#if isReplyToMessageDeleted}
<div class="inline-flex flex-row items-center gap-2 bg-gray-200 rounded-full px-3 py-1 w-fit text-black">
<span>🗑️</span><span class="italic opacity-60">Message deleted</span>
</div>
{:else}
<span>{replyToMessageEvent.content}</span>
{/if}
<button onclick={() => replyToMessageEvent = undefined} class="p-1 bg-white/50 hover:bg-white rounded-full mr-0">
<X size={12} class="text-blue-700" />
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(app)/chats/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ onDestroy(() => {
{/if}
{/each}
</div>
<MessageBar {group} bind:replyToMessageEvent={replyToMessageEvent} {handleNewMessage} />
<MessageBar {group} bind:replyToMessageEvent={replyToMessageEvent} {handleNewMessage} {messages} />
</main>
{/if}

Expand Down

0 comments on commit d20c9e8

Please sign in to comment.