From 1a0881f9ce341eb921bbbf1f5d406c7b03a1f40b Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 6 Jul 2023 11:11:25 -0700 Subject: [PATCH] feat: Add notification for unreads --- .../components/community/CommunityCard.svelte | 13 +- src/lib/components/lemmy/Post.svelte | 25 ++- .../components/lemmy/comment/Comment.svelte | 12 +- src/lib/components/markdown/Markdown.svelte | 2 + src/lib/components/markdown/MarkdownHr.svelte | 1 + src/lib/components/ui/Card.svelte | 2 +- src/lib/components/ui/Navbar.svelte | 166 ++++++++++-------- src/lib/components/ui/StickyCard.svelte | 4 +- src/lib/lemmy.ts | 22 ++- src/routes/create/post/+page.svelte | 4 +- src/routes/inbox/+page.svelte | 45 ++++- src/routes/inbox/InboxItem.svelte | 10 +- src/routes/post/[instance]/[id]/+page.svelte | 14 +- 13 files changed, 215 insertions(+), 105 deletions(-) create mode 100644 src/lib/components/markdown/MarkdownHr.svelte diff --git a/src/lib/components/community/CommunityCard.svelte b/src/lib/components/community/CommunityCard.svelte index 3db06614..b307aa8b 100644 --- a/src/lib/components/community/CommunityCard.svelte +++ b/src/lib/components/community/CommunityCard.svelte @@ -43,8 +43,15 @@ -

- {community_view.community.name} -

+
+

+ {community_view.community.title} +

+ + !{community_view.community.name}@{new URL( + community_view.community.actor_id + ).hostname} + +
diff --git a/src/lib/components/lemmy/Post.svelte b/src/lib/components/lemmy/Post.svelte index c791c57d..66974f31 100644 --- a/src/lib/components/lemmy/Post.svelte +++ b/src/lib/components/lemmy/Post.svelte @@ -25,6 +25,7 @@ import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' import { Color } from '$lib/ui/colors.js' import { page } from '$app/stores' + import Avatar from '$lib/components/ui/Avatar.svelte' let postRes: PostView export { postRes as post } @@ -49,16 +50,22 @@
- - - - + +
+ + + + • + + +
- - - + - + {postRes.post.name} {#if postRes.post.url} @@ -115,7 +122,7 @@ - + diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index e3e9fc4b..44d150b1 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -120,14 +120,16 @@ class="flex flex-col gap-1 whitespace-pre-wrap max-w-full" > -
+
-
+
@@ -136,7 +138,9 @@ diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index 1ba70607..a2872e6c 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -1,5 +1,6 @@
diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index 5cbee4f5..7ce46c81 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -26,84 +26,100 @@ diff --git a/src/lib/components/ui/StickyCard.svelte b/src/lib/components/ui/StickyCard.svelte index 6707a7de..a19c0f55 100644 --- a/src/lib/components/ui/StickyCard.svelte +++ b/src/lib/components/ui/StickyCard.svelte @@ -1,7 +1,7 @@ diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 4cee8ca8..723b335f 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -31,8 +31,26 @@ export interface AuthData { instance: string } +export interface UserData { + unreads: number +} + export const authData = writable() -export const user = writable() +export const user = writable() + +setInterval(async () => { + // check for unread messages + if (!get(authData)) return + + const response = await getClient().getUnreadCount({ + auth: get(authData)!.token, + }) + + const u = get(user) + u.unreads = response.mentions + response.private_messages + response.replies + + user.set(u) +}, 60 * 1000) if (typeof localStorage != 'undefined') { if (localStorage.getItem('user')) { @@ -52,7 +70,7 @@ authData.subscribe(async (data) => { username: `${data?.username}@${data?.instance}`, }) - user.set(person) + user.set({ ...person, unreads: 0 }) if (typeof localStorage != 'undefined') { localStorage.setItem('user', JSON.stringify(data)) diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index b054da6b..0a030088 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -92,6 +92,8 @@ 'My cat just invented a time machine, what do I do?', 'Unpopular opinion: world peace and global happiness would be beneficial to humanity', 'LPT: The smaller weights are easier to lift than the bigger weights in a gym', + 'javascript bad', + 'ELI5: What is 4 + 8?', ] const placeholder = @@ -123,7 +125,7 @@ Create post - +

Create Post

diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte index c0f08063..4a74d894 100644 --- a/src/routes/inbox/+page.svelte +++ b/src/routes/inbox/+page.svelte @@ -1,14 +1,53 @@ Inbox -

Inbox

+
+

Inbox

+ +
{#if !data.data || (data.data?.length ?? 0) == 0}

@@ -16,7 +55,7 @@

{:else} {#each data.data as item} - + {/each} {/if}
diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 1b3788ca..3d2a4a07 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -2,15 +2,21 @@ import Link from '$lib/components/input/Link.svelte' import Comment from '$lib/components/lemmy/comment/Comment.svelte' import Card from '$lib/components/ui/Card.svelte' - import type { CommentReplyView, PersonMentionView } from 'lemmy-js-client' + import type { + CommentReplyView, + PersonMentionView, + PrivateMessageView, + } from 'lemmy-js-client' export let item: CommentReplyView | PersonMentionView + export let read: boolean
{item.creator.display_name ?? item.creator.name} diff --git a/src/routes/post/[instance]/[id]/+page.svelte b/src/routes/post/[instance]/[id]/+page.svelte index 58586da0..1d5e9b72 100644 --- a/src/routes/post/[instance]/[id]/+page.svelte +++ b/src/routes/post/[instance]/[id]/+page.svelte @@ -3,13 +3,11 @@ import type { Comment, CommentView } from 'lemmy-js-client' import type { CommentNodeI } from '$lib/components/lemmy/comment/comments.js' import Comments from '$lib/components/lemmy/comment/Comments.svelte' - import SvelteMarkdown from 'svelte-markdown' import CommunityLink from '$lib/components/community/CommunityLink.svelte' import { isImage, isVideo } from '$lib/ui/image.js' - import { user } from '$lib/lemmy.js' + import { authData, getClient, user } from '$lib/lemmy.js' import CommentForm from '$lib/components/lemmy/comment/CommentForm.svelte' import PostVote from '$lib/components/lemmy/PostVote.svelte' - import { page } from '$app/stores' import { onMount } from 'svelte' import UserLink from '$lib/components/user/UserLink.svelte' import Markdown from '$lib/components/markdown/Markdown.svelte' @@ -19,6 +17,16 @@ const postData = data.post.post_view const post = postData.post + onMount(async () => { + if (!postData.read && $authData) { + getClient().markPostAsRead({ + auth: $authData.token, + read: true, + post_id: post.id, + }) + } + }) + function getCommentParentId(comment?: Comment): number | undefined { const split = comment?.path.split('.') // remove the 0