-
-
-
-
-
-
-
- {score}
-
-
-
+ >
+
+
+
+
+
+
+ {score}
+
+
+
{#if replying}
diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte
index 75813c4d..f54ca89f 100644
--- a/src/lib/components/lemmy/comment/Comments.svelte
+++ b/src/lib/components/lemmy/comment/Comments.svelte
@@ -1,9 +1,11 @@
diff --git a/src/lib/components/lemmy/comment/comments.ts b/src/lib/components/lemmy/comment/comments.ts
index f93b5434..3a99e2c8 100644
--- a/src/lib/components/lemmy/comment/comments.ts
+++ b/src/lib/components/lemmy/comment/comments.ts
@@ -1,7 +1,73 @@
-import type { CommentView } from 'lemmy-js-client'
+import type { Comment, CommentView } from 'lemmy-js-client'
export interface CommentNodeI {
comment_view: CommentView
children: Array
depth: number
}
+
+function getCommentParentId(comment?: Comment): number | undefined {
+ const split = comment?.path.split('.')
+ // remove the 0
+ split?.shift()
+
+ return split && split.length > 1
+ ? Number(split.at(split.length - 2))
+ : undefined
+}
+
+function getDepthFromComment(comment?: Comment): number | undefined {
+ const len = comment?.path.split('.').length
+ return len ? len - 2 : undefined
+}
+
+export function buildCommentsTree(
+ comments: CommentView[],
+ parentComment: boolean
+): CommentNodeI[] {
+ const map = new Map()
+ const depthOffset = !parentComment
+ ? 0
+ : getDepthFromComment(comments[0].comment) ?? 0
+
+ for (const comment_view of comments) {
+ const depthI = getDepthFromComment(comment_view.comment) ?? 0
+ const depth = depthI ? depthI - depthOffset : 0
+ const node: CommentNodeI = {
+ comment_view,
+ children: [],
+ depth,
+ }
+ map.set(comment_view.comment.id, { ...node })
+ }
+
+ const tree: CommentNodeI[] = []
+
+ // if its a parent comment fetch, then push the first comment to the top node.
+ if (parentComment) {
+ const cNode = map.get(comments[0].comment.id)
+ if (cNode) {
+ tree.push(cNode)
+ }
+ }
+
+ for (const comment_view of comments) {
+ const child = map.get(comment_view.comment.id)
+ if (child) {
+ const parent_id = getCommentParentId(comment_view.comment)
+ if (parent_id) {
+ const parent = map.get(parent_id)
+ // Necessary because blocked comment might not exist
+ if (parent) {
+ parent.children.push(child)
+ }
+ } else {
+ if (!parentComment) {
+ tree.push(child)
+ }
+ }
+ }
+ }
+
+ return tree
+}
diff --git a/src/routes/post/[instance]/[id]/+page.svelte b/src/routes/post/[instance]/[id]/+page.svelte
index 2f9285b7..a1b27961 100644
--- a/src/routes/post/[instance]/[id]/+page.svelte
+++ b/src/routes/post/[instance]/[id]/+page.svelte
@@ -1,7 +1,10 @@
@@ -204,6 +146,37 @@
nodes={buildCommentsTree(comments.comments, false)}
isParent={true}
/>
+ {#if moreComments}
+
+ {/if}
{:catch}
Failed to load comments.
diff --git a/src/routes/post/[instance]/[id]/+page.ts b/src/routes/post/[instance]/[id]/+page.ts
index f25315fd..931686ea 100644
--- a/src/routes/post/[instance]/[id]/+page.ts
+++ b/src/routes/post/[instance]/[id]/+page.ts
@@ -11,9 +11,9 @@ export async function load({ params }) {
comments: getClient(params.instance).getComments({
post_id: Number(params.id),
type_: 'All',
- limit: 250,
+ limit: 25,
page: 1,
- max_depth: 6,
+ max_depth: 3,
saved_only: false,
sort: 'Hot',
auth: get(authData)?.token,