From d8531773ea37858fef3adee5f917256c9c2cb492 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 10 Oct 2024 16:05:58 -0700
Subject: follow counts

---
 src/routes/(app)/[username]/(profile)/+layout.server.ts        |  6 ++----
 src/routes/(app)/[username]/(profile)/+layout.svelte           | 10 ++++------
 .../(app)/[username]/(profile)/followers/+page.server.js       |  8 ++++++++
 src/routes/(app)/[username]/(profile)/follows/+page.server.js  |  8 ++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 src/routes/(app)/[username]/(profile)/followers/+page.server.js
 create mode 100644 src/routes/(app)/[username]/(profile)/follows/+page.server.js

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.ts b/src/routes/(app)/[username]/(profile)/+layout.server.ts
index bf499fb1..9ad95fa6 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+layout.server.ts
@@ -5,10 +5,8 @@ export async function load({ depends, parent }) {
 
   let { subject, user } = await parent();
 
-  let count = get(`/${subject.pubkey}/count`).catch(() => 0);
-  let follows = get(`/${subject.pubkey}/follows`).catch(() => []);
-  let followers = get(`/${subject.pubkey}/followers`).catch(() => []);
+  let { follows, followers } = await get(`/${subject.pubkey}/count`);
   let followList = get(`/${user.pubkey}/follows?tagsonly=true`).catch(() => []);
 
-  return { count, follows, followers, followList };
+  return { follows, followers, followList };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index e12462a3..70ee7286 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -13,13 +13,13 @@
 
   let { encode, toWords } = bech32m;
 
-  let { events, user, subject, src, rates, text, count, follows, followList } =
+  let { events, user, subject, src, rates, text, follows, followers, followList } =
     data;
   let { currency, npub, username: n, display } = subject;
 
   $: refresh(data);
   let refresh = (data) => {
-    ({ events, user, subject, src, rates, text, follows, count, followList } =
+    ({ events, user, subject, src, rates, text, follows, followers, followList } =
       data);
     ({ currency, npub, username: n, display } = subject);
   };
@@ -131,8 +131,7 @@
       <div class="flex justify-center gap-2">
         <a href={`/${subject.pubkey}/follows`} data-sveltekit-preload-data="tap"
           ><b
-            >{#await follows}<span class="text-secondary">&mdash;</span
-              >{:then f}{si(f.length)}{/await}</b
+            >{si(follows)}</b
           >
           <span class="text-secondary">{$t("user.following")}</span></a
         >
@@ -140,8 +139,7 @@
           href={`/${subject.pubkey}/followers`}
           data-sveltekit-preload-data="tap"
           ><b
-            >{#await count}<span class="text-secondary">&mdash;</span
-              >{:then c}{si(c)}{/await}</b
+            >{si(followers)}</b
           >
           <span class="text-secondary">{$t("user.followers")}</span></a
         >
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.server.js b/src/routes/(app)/[username]/(profile)/followers/+page.server.js
new file mode 100644
index 00000000..c7d9d67b
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.server.js
@@ -0,0 +1,8 @@
+import { get } from "$lib/utils";
+
+export async function load({ depends, parent }) {
+  depends("app:user");
+  let { subject } = await parent();
+  let followers = get(`/${subject.pubkey}/followers`).catch(() => []);
+  return { followers };
+}
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.server.js b/src/routes/(app)/[username]/(profile)/follows/+page.server.js
new file mode 100644
index 00000000..2a98b316
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.server.js
@@ -0,0 +1,8 @@
+import { get } from "$lib/utils";
+
+export async function load({ depends, parent }) {
+  depends("app:user");
+  let { subject } = await parent();
+  let follows = get(`/${subject.pubkey}/follows`).catch(() => []);
+  return { follows };
+}
-- 
cgit v1.2.3