diff --git a/src/app/components/ChannelMessage.svelte b/src/app/components/ChannelMessage.svelte index bd93e96..c07c773 100644 --- a/src/app/components/ChannelMessage.svelte +++ b/src/app/components/ChannelMessage.svelte @@ -10,7 +10,8 @@ import Button from "@lib/components/Button.svelte" import Content from "@app/components/Content.svelte" import ThunkStatus from "@app/components/ThunkStatus.svelte" - import Reactions from "@app/components/Reactions.svelte" + import ReplySummary from "@app/components/ReplySummary.svelte" + import ReactionSummary from "@app/components/ReactionSummary.svelte" import ProfileDetail from "@app/components/ProfileDetail.svelte" import ChannelThread from "@app/components/ChannelThread.svelte" import ChannelMessageEmojiButton from "@app/components/ChannelMessageEmojiButton.svelte" @@ -67,7 +68,7 @@ class="group relative flex w-full flex-col gap-1 p-2 text-left transition-colors hover:bg-base-300">
{#if showPubkey} -
- +
+ {#if !isThread} + + {/if} + +
+{/each} diff --git a/src/app/components/Reactions.svelte b/src/app/components/Reactions.svelte deleted file mode 100644 index 68abefc..0000000 --- a/src/app/components/Reactions.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - -{#if $reactions.length > 0 || $replies.length > 0} -
- {#if $replies.length > 0 && showReplies} -
- - {$replies.length} -
- {/if} - {#each groupBy( e => e.content, uniqBy(e => e.pubkey + e.content, $reactions), ).entries() as [content, events]} - {@const isOwn = events.some(e => e.pubkey === $pubkey)} - {@const onClick = () => onReactionClick(content, events)} - - {/each} -
-{/if} diff --git a/src/app/components/ReplySummary.svelte b/src/app/components/ReplySummary.svelte new file mode 100644 index 0000000..b0ceb19 --- /dev/null +++ b/src/app/components/ReplySummary.svelte @@ -0,0 +1,19 @@ + + +{#if $replies.length > 0} +
+ + {$replies.length} +
+{/if} diff --git a/src/app/components/ThreadActions.svelte b/src/app/components/ThreadActions.svelte index 17184d9..c4f5b25 100644 --- a/src/app/components/ThreadActions.svelte +++ b/src/app/components/ThreadActions.svelte @@ -1,18 +1,24 @@ -
-
- +
+
+
-
- - - - +
+ {#if showActivity} +
+ + {$replies.length} {$replies.length === 1 ? "reply" : "replies"} +
+ + {/if} + + +
diff --git a/src/app/components/ThreadItem.svelte b/src/app/components/ThreadItem.svelte index 49198e8..3522584 100644 --- a/src/app/components/ThreadItem.svelte +++ b/src/app/components/ThreadItem.svelte @@ -1,21 +1,15 @@ @@ -27,14 +21,6 @@
-
-
- - {$replies.length} {$replies.length === 1 ? "reply" : "replies"} -
-
- Active {formatTimestampRelative(lastActive)} -
-
+
diff --git a/src/app/components/ThreadMenu.svelte b/src/app/components/ThreadMenu.svelte index 266ab81..3ea37d1 100644 --- a/src/app/components/ThreadMenu.svelte +++ b/src/app/components/ThreadMenu.svelte @@ -7,11 +7,14 @@ import ThreadShare from "@app/components/ThreadShare.svelte" import {publishDelete} from "@app/commands" import {pushModal} from "@app/modal" + import {REPLY} from "@app/state" export let url export let event export let onClick + const isRoot = event.kind !== REPLY + const showInfo = () => { onClick() pushModal(EventInfo, {event}) @@ -40,12 +43,14 @@