From 590eedc0fbd2e1ce8430698615dcb354c4a7b869 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Fri, 28 Jul 2023 18:52:29 -0700 Subject: [PATCH] misc: minor tweaks --- src/lib/components/lemmy/comment/comments.ts | 49 +++++++++++++++++++- src/lib/components/markdown/Markdown.svelte | 8 ++-- src/routes/post/[instance]/[id]/+page.ts | 2 +- src/routes/search/+page.svelte | 1 + 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/lib/components/lemmy/comment/comments.ts b/src/lib/components/lemmy/comment/comments.ts index 59303643..a3f64275 100644 --- a/src/lib/components/lemmy/comment/comments.ts +++ b/src/lib/components/lemmy/comment/comments.ts @@ -24,7 +24,8 @@ function getDepthFromComment(comment?: Comment): number | undefined { export function buildCommentsTree( comments: CommentView[], - parentComment: boolean + parentComment: boolean, + baseDepth: number = 0 ): CommentNodeI[] { const map = new Map() const depthOffset = !parentComment @@ -37,7 +38,7 @@ export function buildCommentsTree( const node: CommentNodeI = { comment_view, children: [], - depth, + depth: depth + baseDepth, } map.set(comment_view.comment.id, { ...node }) } @@ -73,6 +74,50 @@ export function buildCommentsTree( return tree } +export function searchCommentTree( + tree: CommentNodeI[], + id: number +): CommentNodeI | undefined { + for (const node of tree) { + if (node.comment_view.comment.id === id) { + return node + } + + for (const child of node.children) { + const res = searchCommentTree([child], id) + + if (res) { + return res + } + } + } + return undefined +} + +export function insertCommentIntoTree( + tree: CommentNodeI[], + cv: CommentView, + parentComment: boolean +) { + // Building a fake node to be used for later + const node: CommentNodeI = { + comment_view: cv, + children: [], + depth: 0, + } + + const parentId = getCommentParentId(cv.comment) + if (parentId) { + const parent_comment = searchCommentTree(tree, parentId) + if (parent_comment) { + node.depth = parent_comment.depth + 1 + parent_comment.children.unshift(node) + } + } else if (!parentComment) { + tree.unshift(node) + } +} + export async function buildCommentsTreeAsync( comments: CommentView[], parentComment: boolean diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index e7b0293d..afcd539b 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -4,7 +4,7 @@ export let source: string = '' -
+
{@html md.render(source)}
@@ -52,11 +52,11 @@ } .markdown :global(li) { - @apply m-0 leading-[1.4] !important; + @apply m-0 leading-[1.5] !important; } .markdown :global(li > *) { - @apply m-0 leading-[1.4] !important; + @apply m-0 leading-[1.5] !important; } .markdown :global(blockquote) { @@ -64,6 +64,6 @@ } .markdown :global(p) { - @apply leading-[1.4]; + @apply leading-[1.5]; } diff --git a/src/routes/post/[instance]/[id]/+page.ts b/src/routes/post/[instance]/[id]/+page.ts index cf3ca1a5..88d49075 100644 --- a/src/routes/post/[instance]/[id]/+page.ts +++ b/src/routes/post/[instance]/[id]/+page.ts @@ -1,7 +1,7 @@ import { authData, getClient } from '$lib/lemmy.js' import { get } from 'svelte/store' -export async function load({ params }) { +export async function load({ params, url }) { const post = await getClient(params.instance.toLowerCase()).getPost({ id: Number(params.id), auth: get(authData)?.token, diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 4578c4bd..87cd1bc7 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -92,6 +92,7 @@ {/if} {/each}
+
{