From b9320d95292e5b95ad5b510dc8c9bd72feee50a0 Mon Sep 17 00:00:00 2001
From: bloodwiing <bloodwiing+git@alchemix.dev>
Date: Fri, 10 May 2024 10:53:48 +0300
Subject: [PATCH] New IDs

---
 src/comp/post.svelte                          |  3 +-
 src/lib/server/db/post.js                     |  6 ++--
 src/lib/util.js                               | 31 +++++++++++++++++++
 .../posts/{[id] => [name]}/+page.server.js    |  8 ++++-
 .../(app)/posts/{[id] => [name]}/+page.svelte | 22 ++++++++-----
 5 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 src/lib/util.js
 rename src/routes/(app)/posts/{[id] => [name]}/+page.server.js (66%)
 rename src/routes/(app)/posts/{[id] => [name]}/+page.svelte (55%)

diff --git a/src/comp/post.svelte b/src/comp/post.svelte
index eaed877..992846b 100644
--- a/src/comp/post.svelte
+++ b/src/comp/post.svelte
@@ -1,4 +1,5 @@
 <script>
+    import { getNamedId } from '$lib/util';
     import Rating from './rating.svelte';
 
   /**
@@ -8,7 +9,7 @@
 </script>
 
 <div>
-  <a href="/posts/{post.id}">{post.name}</a>
+  <a href="/posts/{getNamedId(post.id, post.name)}">{post.name}</a>
   <p>{post.author?.name}</p>
   <p>{post.category.name}</p>
   <Rating rating={post.rating}></Rating>
diff --git a/src/lib/server/db/post.js b/src/lib/server/db/post.js
index 81ad5c2..0444950 100644
--- a/src/lib/server/db/post.js
+++ b/src/lib/server/db/post.js
@@ -1,5 +1,5 @@
-import { getCategoriesCached, getCategoriesCachedByRef, getCategoryCached } from './category';
-import { getUser, getUsersCached, getUsersCachedByRef } from './user';
+import { getCategoriesCachedByRef, getCategoryCached } from './category';
+import { getUser, getUsersCachedByRef } from './user';
 
 /**
  * @typedef {import('$types/base').Post} Post
@@ -40,7 +40,7 @@ export async function getPosts(sql, category = undefined, limit = 10, offset = 0
     filter = sql``;
   } else {
     filter = sql`WHERE category_id = ${ category.id }`;
-  } 
+  }
 
   const query = sql`
     SELECT id, author_id, name, category_id, latest_content, created_date, likes, dislikes
diff --git a/src/lib/util.js b/src/lib/util.js
new file mode 100644
index 0000000..6b5c2a7
--- /dev/null
+++ b/src/lib/util.js
@@ -0,0 +1,31 @@
+import { goto } from "$app/navigation";
+
+/**
+ * @param {string | undefined} name 
+ * @returns {number | null}
+ */
+export function getIdFromName(name) {
+  const parts = (name || "").split("-", 2);
+  const parsed = parseInt(parts[0]);
+
+  return Number.isNaN(parsed) ? null : parsed;
+}
+
+/**
+ * @param {number} id 
+ * @param {string} name 
+ * @returns {string}
+ */
+export function getNamedId(id, name) {
+  const convertedName = name.replace(/[^\w\d]/g, '-').toLowerCase();
+  return `${id}-${convertedName}`;
+}
+
+/**
+ * @param {number} id 
+ * @param {string} name 
+ */
+export function gotoNamedId(id, name) {
+  const page = getNamedId(id, name);
+  goto(page, { replaceState: true });
+}
diff --git a/src/routes/(app)/posts/[id]/+page.server.js b/src/routes/(app)/posts/[name]/+page.server.js
similarity index 66%
rename from src/routes/(app)/posts/[id]/+page.server.js
rename to src/routes/(app)/posts/[name]/+page.server.js
index 7be79e2..0ee47a7 100644
--- a/src/routes/(app)/posts/[id]/+page.server.js
+++ b/src/routes/(app)/posts/[name]/+page.server.js
@@ -1,9 +1,15 @@
 import { getCommentsForPost } from "$lib/server/db/comment";
 import { getPost } from "$lib/server/db/post";
+import { getIdFromName } from "$lib/util";
+import { error } from "@sveltejs/kit";
 
 /** @type {import("@sveltejs/kit").ServerLoad} */
 export async function load({ params, locals }) {
-  const post_id = Number(params.id);
+  const post_id = getIdFromName(params.name);
+
+  if (post_id === null) {
+    error(404, `No Post of ID ${params.name}`);
+  }
   
   const post = await getPost(locals.sql, post_id);
 
diff --git a/src/routes/(app)/posts/[id]/+page.svelte b/src/routes/(app)/posts/[name]/+page.svelte
similarity index 55%
rename from src/routes/(app)/posts/[id]/+page.svelte
rename to src/routes/(app)/posts/[name]/+page.svelte
index 9e6a6be..9d67e71 100644
--- a/src/routes/(app)/posts/[id]/+page.svelte
+++ b/src/routes/(app)/posts/[name]/+page.svelte
@@ -1,6 +1,8 @@
 <script>
     import Comment from "$comp/comment.svelte";
     import { buildCommentTree } from "$lib/client/nodetree";
+    import { getNamedId, gotoNamedId } from "$lib/util";
+    import { onMount } from "svelte";
 
   /**
    * @type {{
@@ -10,18 +12,22 @@
    */
   export let data;
 
-  console.log(data);
+  $: post = data.post;
 
-  /**
-   * @type {import('$types/base').CommentTreeNode[]}
-   */
-  let commentTree;
   $: commentTree = buildCommentTree(data.comments);
+
+  onMount(() => {
+    gotoNamedId(post.id, post.name);
+  })
 </script>
 
-<h1>{data.post.name}</h1>
-<a href="#">{data.post.author?.name}</a>
-<p>{data.post.content}</p>
+<h1>{post.name}</h1>
+{#if post.author}
+<a href="/users/{getNamedId(post.author.id, post.author.name)}">{post.author.name}</a>
+{:else}
+<p>Deleted</p>
+{/if}
+<p>{post.content}</p>
 <div>
   {#each commentTree as reply}
     <Comment commentNode={reply}></Comment>