From 96a9f3971dfe0f47734aae4f7fa08bb15b8f5aed Mon Sep 17 00:00:00 2001
From: bloodwiing <bloodwiing+git@alchemix.dev>
Date: Fri, 17 May 2024 16:28:22 +0300
Subject: [PATCH] Refactor: Switch Glance to use new JSON API

---
 src/comp/page/posts/postlist.svelte    | 47 ++++++++++++++------------
 src/routes/(app)/posts/+page.server.js |  5 ---
 src/routes/(app)/posts/+page.svelte    |  5 ++-
 src/routes/api/post/+server.js         | 29 ++++++++++++++++
 4 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 src/routes/api/post/+server.js

diff --git a/src/comp/page/posts/postlist.svelte b/src/comp/page/posts/postlist.svelte
index 803efa7..b76eabe 100644
--- a/src/comp/page/posts/postlist.svelte
+++ b/src/comp/page/posts/postlist.svelte
@@ -2,9 +2,10 @@
   import { goto, replaceState } from '$app/navigation';
   import { page } from '$app/stores';
   import { getNamedId } from '$lib/util';
-  import { onMount } from 'svelte';
+  import { onMount, tick } from 'svelte';
   import Post from '../post/post.svelte';
   import PostCard from './postcard.svelte';
+  import { parsePost } from '$lib/serialize/parse';
 
   /**
    * @type {number}
@@ -29,7 +30,7 @@
   /**
    * @type {import('$types/base').Post | null}
    */
-  export let glancePost = null;
+  let glancePost = null;
 
   function getDefaultedUrl(/** @type {URL} */ url) {
     const u = new URL(url);
@@ -38,40 +39,44 @@
     return u;
   }
 
-  const newUrl = getDefaultedUrl($page.url)
+  /**
+   * @type {URL | undefined}
+   */
+  let newUrl = undefined;
 
-  onMount(() => {
+  onMount(async () => {
+    await tick();
+    newUrl = getDefaultedUrl($page.url);
     replaceState(newUrl, {});
   });
 
   /** @type {boolean[]} */
   $: hidden = Array(posts.length).fill(false);
 
-  function previewPost(/** @type {CustomEvent<>} */ e) {
+  async function previewPost(/** @type {CustomEvent<>} */ e) {
+    if (!newUrl) return;
+
     /** @type {import("$types/base").Post} */
-    const post = e.detail.post;
+    glancePost = e.detail.post;
 
     posts.forEach((p, index) => {
-      hidden[index] = p == post;
+      hidden[index] = p == glancePost;
     });
 
-    newUrl.searchParams.set('glance', String(post.id));
-    goto(newUrl, {
-      replaceState: true,
-      noScroll: true
-    });
+    const request = await fetch(`/api/post?id=${e.detail.post.id}&metrics=true`);
+    const response = await request.json();
+    glancePost = parsePost(response['post']);
+    console.log(glancePost);
   }
 
   function dismiss(/** @type {MouseEvent | TouchEvent} */ e) {
+    if (!newUrl) return;
+
+    glancePost = null;
+
     e.stopPropagation();
 
     hidden = Array(posts.length).fill(false);
-
-    newUrl.searchParams.delete('glance');
-    goto(newUrl, {
-      replaceState: true,
-      noScroll: true
-    });
   }
 
   function expand(/** @type {MouseEvent | TouchEvent} */ e) {
@@ -144,9 +149,9 @@
 </div>
 
 <button class="postPreview" data-visible={glancePost != null || null} on:click={dismiss}>
+  {#if glancePost}
   <button class="preview" on:click={expand}>
-    {#if glancePost}
-    <Post post={glancePost} commentTree={null} showMetrics={true}></Post>
-    {/if}
+    <Post post={glancePost} showMetrics={true}></Post>
   </button>
+  {/if}
 </button>
diff --git a/src/routes/(app)/posts/+page.server.js b/src/routes/(app)/posts/+page.server.js
index 93a582d..7a6c888 100644
--- a/src/routes/(app)/posts/+page.server.js
+++ b/src/routes/(app)/posts/+page.server.js
@@ -16,13 +16,8 @@ export async function load({ url }) {
     offset: pageSize * page,
   });
 
-  const glance = parseIntNull(url.searchParams.get('glance'));
-
-  const glancePost = glance ? await getPost(glance, { withMetrics: true }) : null;
-
   return {
     posts: result,
-    glancePost: glancePost,
     itemsCount: pageSize,
     pageIndex: page,
     totalResultCount: count,
diff --git a/src/routes/(app)/posts/+page.svelte b/src/routes/(app)/posts/+page.svelte
index 6e496b5..56bca75 100644
--- a/src/routes/(app)/posts/+page.svelte
+++ b/src/routes/(app)/posts/+page.svelte
@@ -1,12 +1,11 @@
 <script>
-    import { page } from "$app/stores";
+  import { page } from "$app/stores";
   import Card from "$comp/card.svelte";
   import Postlist from "$comp/page/posts/postlist.svelte";
 
   /**
    * @type {{
    *  posts: import("$types/base").Post[],
-   *  glancePost: import("$types/base").Post | null,
    *  itemsCount: number,
    *  pageIndex: number,
    *  totalResultCount: number,
@@ -33,5 +32,5 @@
     <img class="icon" src="waving-hand-sign.png" alt="wave">
     <span>Welcome to ECHO</span>
   </Card>
-  <Postlist posts={data.posts} glancePost={data.glancePost} itemsCount={data.itemsCount} pageIndex={data.pageIndex} totalResultCount={data.totalResultCount}></Postlist>
+  <Postlist posts={data.posts} itemsCount={data.itemsCount} pageIndex={data.pageIndex} totalResultCount={data.totalResultCount}></Postlist>
 </main>
diff --git a/src/routes/api/post/+server.js b/src/routes/api/post/+server.js
new file mode 100644
index 0000000..e57f573
--- /dev/null
+++ b/src/routes/api/post/+server.js
@@ -0,0 +1,29 @@
+import { jsonSerialize } from "$lib/serialize/base";
+import { getCommentsForPost } from "$lib/server/db/comment";
+import { getPost } from "$lib/server/db/post";
+import { getIdFromName, parseIntNull } from "$lib/util";
+import { error } from "@sveltejs/kit";
+
+/** @type {import("@sveltejs/kit").Action} */
+export async function GET({ url }) {
+  const post_id = parseIntNull(url.searchParams.get('id'));
+
+  if (post_id === null) {
+    error(404, `No Post of ID ${url.searchParams.get('id')}`);
+  }
+  
+  const getComments = !!url.searchParams.get('comments');
+  const showMetrics = !!url.searchParams.get('metrics');
+  
+  const post = await getPost(post_id, {
+    withMetrics: showMetrics,
+  });
+
+  const comments = getComments ? await getCommentsForPost(post_id) : null;
+
+  return new Response(jsonSerialize({
+    post: post,
+    comments: comments,
+    showMetrics: showMetrics,
+  }));
+}