diff --git a/src/lib/components/lemmy/Post.svelte b/src/lib/components/lemmy/Post.svelte
index 36a4244e..8613f088 100644
--- a/src/lib/components/lemmy/Post.svelte
+++ b/src/lib/components/lemmy/Post.svelte
@@ -9,18 +9,12 @@
} from 'svelte-hero-icons'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
- import { isImage, isVideo } from '$lib/ui/image.js'
+ import { isImage } from '$lib/ui/image.js'
import PostVote from '$lib/components/lemmy/PostVote.svelte'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import UserLink from '$lib/components/user/UserLink.svelte'
import Card from '$lib/components/ui/Card.svelte'
- import {
- DEFAULT_INSTANCE_URL,
- authData,
- getClient,
- getInstance,
- user,
- } from '$lib/lemmy.js'
+ import { authData, getClient, getInstance, user } from '$lib/lemmy.js'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import Button from '$lib/components/input/Button.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
@@ -32,20 +26,14 @@
let postRes: PostView
export { postRes as post }
- let deleting = false
-
async function deletePost() {
if (!$authData) return
- deleting = true
-
await getClient().deletePost({
auth: $authData.token,
deleted: true,
post_id: postRes.post.id,
})
-
- deleting = false
}
@@ -58,7 +46,7 @@
/>
-
+
•
@@ -100,7 +88,7 @@
{#if postRes.post.body}
{postRes.post.body}
diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte
index 67818e08..49b47ba5 100644
--- a/src/lib/components/lemmy/comment/Comment.svelte
+++ b/src/lib/components/lemmy/comment/Comment.svelte
@@ -83,7 +83,7 @@
class="py-2 {$page.url.hash == `#${node.comment_view.comment.id}`
? 'bg-slate-200 dark:bg-zinc-800'
: ''} {node.depth == 0
- ? 'border-b border-slate-200 dark:border-white/10'
+ ? 'border-b border-slate-200 dark:border-zinc-800'
: ''}"
id="#{node.comment_view.comment.id.toString()}"
>
@@ -103,8 +103,8 @@
{#if open}
diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte
index df5951bc..e8c5f641 100644
--- a/src/lib/components/lemmy/comment/Comments.svelte
+++ b/src/lib/components/lemmy/comment/Comments.svelte
@@ -37,8 +37,7 @@
const newComments = await getClient().getComments({
auth: $authData?.token,
- max_depth: 3,
- limit: 10,
+ max_depth: 5,
parent_id: parent.comment_view.comment.id,
})
diff --git a/src/lib/components/ui/Avatar.svelte b/src/lib/components/ui/Avatar.svelte
index ff6eb1d9..d785adf9 100644
--- a/src/lib/components/ui/Avatar.svelte
+++ b/src/lib/components/ui/Avatar.svelte
@@ -11,5 +11,5 @@
{alt}
{width}
loading="lazy"
- class="rounded-full aspect-square object-cover"
+ class="rounded-full aspect-square object-cover overflow-hidden"
/>
diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte
index 3642812a..7b72d080 100644
--- a/src/lib/components/ui/Navbar.svelte
+++ b/src/lib/components/ui/Navbar.svelte
@@ -116,9 +116,8 @@
{
localStorage.removeItem('user')
- goto('/', {
- invalidateAll: true,
- })
+ user.set(undefined)
+ authData.set(undefined)
}}
color={Color.dangerSecondary}
>
diff --git a/src/lib/components/ui/menu/Menu.svelte b/src/lib/components/ui/menu/Menu.svelte
index 010f93a1..98c1d687 100644
--- a/src/lib/components/ui/menu/Menu.svelte
+++ b/src/lib/components/ui/menu/Menu.svelte
@@ -20,10 +20,10 @@
{
- let path = event.composedPath()
+ if (open) {
+ let path = event.composedPath()
- if (!path.includes(element)) {
- if (open) {
+ if (!path.includes(element)) {
open = false
}
}
diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts
index 9c250f5b..43fa8b1c 100644
--- a/src/lib/lemmy.ts
+++ b/src/lib/lemmy.ts
@@ -38,18 +38,20 @@ export interface UserData {
}
export const authData = writable()
-export const user = writable()
+export const user = writable<
+ (GetPersonDetailsResponse & UserData) | undefined
+>()
setInterval(async () => {
// check for unread messages
- if (!get(authData)) return
+ if (!get(authData) || !get(user)) return
const response = await getClient().getUnreadCount({
auth: get(authData)!.token,
})
const u = get(user)
- u.unreads = response.mentions + response.private_messages + response.replies
+ u!.unreads = response.mentions + response.private_messages + response.replies
user.set(u)
}, 60 * 1000)
diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte
index 45bafb17..93f454a1 100644
--- a/src/routes/inbox/+page.svelte
+++ b/src/routes/inbox/+page.svelte
@@ -34,11 +34,16 @@
}
async function markAllAsRead() {
+ if (!$user) {
+ goto('/login')
+ return
+ }
+
const response = await getClient().markAllAsRead({
auth: $authData!.token,
})
- $user.unreads = 0
+ $user!.unreads = 0
goto($page.url, {
invalidateAll: true,