From 0f315bec011a8ee69e03061ba741b9366829ed4e Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 9 Aug 2023 16:21:31 -0700 Subject: [PATCH] feat: add ability to mark single item as read --- package.json | 2 +- src/lib/components/input/Button.svelte | 5 +- .../components/lemmy/comment/Comment.svelte | 2 +- src/lib/components/lemmy/post/PostMeta.svelte | 133 ++++++++++-------- src/lib/components/ui/SectionTitle.svelte | 4 +- src/routes/inbox/InboxItem.svelte | 100 +++++++++---- 6 files changed, 153 insertions(+), 93 deletions(-) diff --git a/package.json b/package.json index 0da67f63..ddd1b8b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.6.0", + "version": "0.6.1", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/input/Button.svelte b/src/lib/components/input/Button.svelte index f752c23e..9a96e535 100644 --- a/src/lib/components/input/Button.svelte +++ b/src/lib/components/input/Button.svelte @@ -18,8 +18,9 @@ hover:bg-transparent hover:dark:bg-transparent active:bg-black/10 active:dark:bg-white/10`, - secondary: - 'border border-slate-200 dark:border-zinc-700 bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800 dark:text-zinc-400', + secondary: `border border-slate-200 dark:border-zinc-700 bg-transparent + hover:bg-slate-100 hover:dark:bg-zinc-800 dark:text-zinc-400 hover:text-inherit + hover:dark:text-inherit`, tertiary: 'border border-transparent bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800 dark:text-zinc-200', diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index 6204a845..96343c98 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -76,7 +76,7 @@
  • diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte index 6d6b71f6..cf511504 100644 --- a/src/lib/components/lemmy/post/PostMeta.svelte +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -12,82 +12,93 @@ LockClosed, Trash, } from 'svelte-hero-icons' + import { getInstance } from '$lib/lemmy.js' + import { userSettings } from '$lib/settings.js' export let community: Community | undefined = undefined export let user: Person | undefined = undefined export let published: Date + export let title: string | undefined = undefined + export let id: number | undefined = undefined // Score export let upvotes: number | undefined = undefined export let downvotes: number | undefined = undefined // Badges - export let nsfw: boolean - export let saved: boolean - export let featured: boolean - export let deleted: boolean + export let nsfw: boolean = false + export let saved: boolean = false + export let featured: boolean = false + export let deleted: boolean = false export let removed: boolean = false export let locked: boolean = false - - {#if community} - - {/if} -
    +
    + {#if community} - + {/if} - - {#if user} -
    - -
    +
    + {#if community} + {/if} - - {#if upvotes != undefined && downvotes != undefined} - • - - {Math.floor((upvotes / (upvotes + downvotes || 1)) * 100)}% - - {/if} - -
    + + {#if user} +
    + +
    + {/if} + + {#if upvotes != undefined && downvotes != undefined} + • + + {Math.floor((upvotes / (upvotes + downvotes || 1)) * 100)}% + + {/if} +
    +
    -
    - {#if nsfw} - NSFW - {/if} - {#if saved} - - - - {/if} - {#if locked} - - - - {/if} - {#if removed} - - - - {/if} - {#if deleted} - - - - {/if} - {#if featured} - - - - {/if} -
    - +
    + {#if nsfw} + NSFW + {/if} + {#if saved} + + + + {/if} + {#if locked} + + + + {/if} + {#if removed} + + + + {/if} + {#if deleted} + + + + {/if} + {#if featured} + + + + {/if} +
    + + {#if title && id} + + {title} + + {/if} +
    diff --git a/src/lib/components/ui/SectionTitle.svelte b/src/lib/components/ui/SectionTitle.svelte index 8169bc73..be4d5de8 100644 --- a/src/lib/components/ui/SectionTitle.svelte +++ b/src/lib/components/ui/SectionTitle.svelte @@ -1,3 +1,5 @@ - + diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 261ee710..29878b95 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -13,9 +13,11 @@ PersonMentionView, PrivateMessageView, } from 'lemmy-js-client' - import { ChatBubbleOvalLeft, Icon } from 'svelte-hero-icons' + import { ChatBubbleOvalLeft, Check, Icon } from 'svelte-hero-icons' import { page } from '$app/stores' import { toast } from '$lib/components/ui/toasts/toasts.js' + import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' + import SectionTitle from '$lib/components/ui/SectionTitle.svelte' export let item: CommentReplyView | PersonMentionView | PrivateMessageView export let read: boolean @@ -61,41 +63,85 @@ loading = false } + + async function markAsRead(isRead: boolean) { + if (!$profile?.jwt) return + + loading = true + + if ('person_mention' in item) { + await getClient().markPersonMentionAsRead({ + auth: $profile?.jwt, + person_mention_id: item.person_mention.id, + read: isRead, + }) + } else if ('comment_reply' in item) { + await getClient().markCommentReplyAsRead({ + auth: $profile?.jwt, + comment_reply_id: item.comment_reply.id, + read: isRead, + }) + } + + read = isRead + + loading = false + } - + {#if !isPrivateMessage(item)} -
    -
    - - {item.creator.display_name ?? item.creator.name} - - replied to you in - - {item.post.name} - -
    - - -
    -
    + +
    + Reply + {#if $profile?.user && item.post.creator_id != $profile.user.local_user_view.person.id} +
    +
    +
    + +
    +
    + {/if}
    +
    + + + +
    {:else}