fix

chibat · Feb 21, 2024 · ae584f1 · ae584f1
1 parent 498de54
commit ae584f1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/islands/PostView.tsx b/islands/PostView.tsx
@@ -196,7 +196,7 @@ export default function PostView(
                     referrerpolicy="no-referrer"
                   />
                   <a
-                    href={`/users/${post.user_id}`}
+                    href={`/users/${post.account ?? post.user_id}`}
                     class="ms-2 me-2 noDecoration"
                   >
                     {post.name}

diff --git a/routes/_middleware.ts b/routes/_middleware.ts
@@ -28,7 +28,9 @@ export async function handler(
     return new Response(
       `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">${
         users.map((user) =>
-          `<url><loc>${baseUrl}/users/${user.user_id}</loc><lastmod>${
+          `<url><loc>${baseUrl}/users/${
+            user.account ?? user.user_id
+          }</loc><lastmod>${
             new Date(user.updated_at).toISOString()
           }</lastmod></url>`
         ).join("") + posts.map((post) =>

diff --git a/server/database.types.ts b/server/database.types.ts
@@ -360,6 +360,7 @@ export type Database = {
       }
       user_view: {
         Row: {
+          account: string | null
           updated_at: string | null
           user_id: number | null
         }

diff --git a/server/db.ts b/server/db.ts
@@ -19,11 +19,13 @@ export type PostViewType = {
   source: string;
   updated_at: string;
   user_id: number;
+  account?: string | null;
 };
 
 export type UserViewType = {
   user_id: number;
   updated_at: string;
+  account?: string | null;
 };
 
 let supabase: SupabaseClient<Database>;
@@ -87,7 +89,7 @@ export async function selectUser(userKey: string) {
 
 export async function selectUsers() {
   const { data, error } = await supabase.from("user_view").select(
-    "user_id,updated_at",
+    "user_id,updated_at,account",
   ).returns<UserViewType[]>();
   if (error) {
     throw error;