From aab14c11fdbfc3f8ad3a399352e58ff5db7867ff Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 29 Dec 2022 10:30:02 -0800
Subject: move follower endpoints

---
 src/routes/(app)/[username]/(profile)/+layout.server.js    | 14 ++++++++++++++
 src/routes/(app)/[username]/(profile)/+layout.svelte       |  6 +++---
 src/routes/(app)/[username]/(profile)/+page.svelte         |  4 ++--
 .../(app)/[username]/(profile)/followers/+page.server.js   | 10 ----------
 .../(app)/[username]/(profile)/followers/+page.svelte      |  5 ++++-
 .../(app)/[username]/(profile)/follows/+page.server.js     | 11 -----------
 src/routes/(app)/[username]/(profile)/follows/+page.svelte |  2 +-
 7 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 src/routes/(app)/[username]/(profile)/+layout.server.js
 delete mode 100644 src/routes/(app)/[username]/(profile)/followers/+page.server.js
 delete mode 100644 src/routes/(app)/[username]/(profile)/follows/+page.server.js

(limited to 'src/routes')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.js b/src/routes/(app)/[username]/(profile)/+layout.server.js
new file mode 100644
index 00000000..0c996dc3
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/+layout.server.js
@@ -0,0 +1,14 @@
+import { get } from '$lib/utils';
+
+export async function load({ parent }) {
+	let { subject, user } = await parent();
+
+	subject.follows = await get(`/${subject.pubkey}/follows`);
+	subject.followers = await get(`/${subject.pubkey}/followers`);
+
+  if (user) {
+    user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`);
+  } 
+
+  return { subject, user }
+}
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index a99828b6..1bbbd5f7 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -32,13 +32,13 @@
 			tags: user.follows
 		};
 
-		user.follows = user.follows;
-
 		await sign({ event, user });
 		await send(event);
+
+    user.follows = user.follows;
 	};
 
-	$: following = user?.follows.find((t) => t.includes(subject.pubkey));
+  $: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
 </script>
 
 <div class="container mx-auto w-full px-4 mb-4 flex flex-wrap md:flex-nowrap">
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 1126f335..3d4d1fb6 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -3,7 +3,7 @@
 	import { t } from '$lib/translations';
 
 	export let data;
-	let { events, user } = data;
+	let { events, subject, user } = data;
 </script>
 
-<Feed {events} {user} />
+<Feed {events} user={subject.username === user.username && user} />
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.server.js b/src/routes/(app)/[username]/(profile)/followers/+page.server.js
deleted file mode 100644
index a05d324d..00000000
--- a/src/routes/(app)/[username]/(profile)/followers/+page.server.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { get } from '$lib/utils';
-
-export async function load({ params, parent, url }) {
-	let { subject } = await parent();
-	let { pubkey } = subject;
-
-	let followers = await get(`/${pubkey}/followers`);
-
-	return { followers };
-}
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
index d1e06ea8..185c37f6 100644
--- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
@@ -4,7 +4,10 @@
 	import VirtualScroll from 'svelte-virtual-scroll-list';
 
 	export let data;
-	let { followers } = data;
+	let {
+		subject: { followers }
+	} = data;
+
 	let w;
 </script>
 
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.server.js b/src/routes/(app)/[username]/(profile)/follows/+page.server.js
deleted file mode 100644
index 60b95636..00000000
--- a/src/routes/(app)/[username]/(profile)/follows/+page.server.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { get } from '$lib/utils';
-
-export async function load({ params, parent, url }) {
-	let { subject } = await parent();
-	let { pubkey } = subject;
-
-	let follows = await get(`/${pubkey}/follows`);
-
-	console.log('GOT', follows);
-	return { follows };
-}
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
index 96b30475..5f484d55 100644
--- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
@@ -4,7 +4,7 @@
 	import VirtualScroll from 'svelte-virtual-scroll-list';
 
 	export let data;
-	let { follows } = data;
+  let { subject: { follows } } = data;
 	let w;
 </script>
 
-- 
cgit v1.2.3