From f3d07766891780c67d476f08a36fefc1571047df Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 9 Feb 2024 23:09:02 -0800
Subject: fix message link

---
 .../(app)/[username]/(profile)/+layout.svelte      |  2 +-
 .../(app)/[username]/messages/+page.server.js      | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 0572eb42..19c40546 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -191,7 +191,7 @@
 
       {#if user && user.username !== subject.username && subject.pubkey}
         <div class="w-full flex">
-          <a href={`/${subject.username}/messages`} class="mx-auto">
+            <a href={`/${user.username}/messages/${subject.username}`} class="mx-auto">
             <button
               class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
             >
diff --git a/src/routes/(app)/[username]/messages/+page.server.js b/src/routes/(app)/[username]/messages/+page.server.js
index eeb883ee..33d9ccaa 100644
--- a/src/routes/(app)/[username]/messages/+page.server.js
+++ b/src/routes/(app)/[username]/messages/+page.server.js
@@ -1,21 +1,21 @@
 import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, params, parent, url }) {
-  let { user, subject } = await parent();
-  let { pubkey } = subject;
+  let { user } = await parent();
+  if (user.username !== params.username) redirect(307, `/${params.username}`);
   let { since = 0 } = params;
 
   let messages = [],
     notes = [];
 
-  if (pubkey) {
-    if (user) {
-      try {
-        messages = await get(`/${user.pubkey}/${since}/messages`);
-        messages = messages.sort((a, b) => b.created_at - a.created_at);
-      } catch (e) {
-        console.log(`failed to fetch nostr messages`, e);
-      }
+  if (user?.pubkey) {
+    let { pubkey } = user;
+    try {
+      messages = await get(`/${pubkey}/${since}/messages`);
+      messages = messages.sort((a, b) => b.created_at - a.created_at);
+    } catch (e) {
+      console.log(`failed to fetch nostr messages`, e);
     }
 
     try {
@@ -29,5 +29,5 @@ export async function load({ cookies, params, parent, url }) {
     });
   }
 
-  return { messages, notes }
+  return { messages, notes };
 }
-- 
cgit v1.2.3