From 065721964152f1022e755c33d24353beaa07abd1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 28 Dec 2022 15:05:00 -0800
Subject: get follows and followers working

---
 src/routes/(app)/[username]/(profile)/+layout.svelte         | 2 +-
 src/routes/(app)/[username]/(profile)/followers/+page.svelte | 4 ++--
 src/routes/(app)/[username]/(profile)/follows/+page.svelte   | 4 ++--
 src/routes/(app)/[username]/+layout.server.js                | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 3fc01721..a99828b6 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -56,7 +56,7 @@
 		</div>
 
 		<div class="flex flex-wrap gap-2 w-full">
-			{#if user && user.username !== subject.username}
+			{#if user && user.username !== subject.username && subject.pubkey}
 				{#if following}
 					<div class="w-full flex">
 						<button
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
index a718ff15..d1e06ea8 100644
--- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
@@ -13,9 +13,9 @@
 <div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
 	{#if browser}
 		{#if followers.length}
-			<VirtualScroll data={followers} key="username" let:data pageMode={true}>
+			<VirtualScroll data={followers} key="pubkey" let:data pageMode={true}>
 				<a href={`/${data.username}`}>
-					<div class="flex border-b py-4 text-sm lg:text-lg text-secondary" :key={data.username}>
+					<div class="flex border-b py-4 text-sm lg:text-lg text-secondary" :key={data.pubkey}>
 						<div class="mb-auto mr-2">
 							<div class="md:hidden">
 								<Avatar size={12} user={data} disabled={true} />
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
index 87e34501..96b30475 100644
--- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
@@ -13,9 +13,9 @@
 <div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
 	{#if browser}
 		{#if follows.length}
-			<VirtualScroll data={follows} key="username" let:data pageMode={true}>
+			<VirtualScroll data={follows} key="pubkey" let:data pageMode={true}>
 				<a href={`/${data.username}`}>
-					<div class="flex border-b py-4 text-sm lg:text-lg text-secondary" :key={data.username}>
+					<div class="flex border-b py-4 text-sm lg:text-lg text-secondary" :key={data.pubkey}>
 						<div class="mb-auto mr-2">
 							<div class="md:hidden">
 								<Avatar size={12} user={data} disabled={true} />
diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index 5e41fd4e..d1b203d7 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -7,8 +7,7 @@ export let load = async ({ depends, params: { username } }) => {
 	try {
 		return { subject: await get(`/users/${username}`) };
 	} catch (e) {
-		if (username.length === 64)
-			return { subject: { username: username.substr(0, 6), pubkey: username, anon: true } };
+		console.log(e);
 		throw error(500, 'Unable to retrieve user account data');
 	}
 };
-- 
cgit v1.2.3