From 6c11c67eb43d5532a3ba3425a7d1bf55d7b24232 Mon Sep 17 00:00:00 2001
From: ari melody <ari@arimelody.me>
Date: Mon, 1 Jul 2024 07:39:57 +0100
Subject: [PATCH] separated parsing from api.getUser(), logging folreqs

---
 src/lib/client/api.js            | 12 +-----------
 src/lib/client/client.js         |  7 ++++++-
 src/routes/+layout.svelte        |  3 ++-
 src/routes/callback/+page.svelte |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/lib/client/api.js b/src/lib/client/api.js
index c02517a..11d3238 100644
--- a/src/lib/client/api.js
+++ b/src/lib/client/api.js
@@ -313,15 +313,5 @@ export async function getUser(user_id) {
         headers: { "Authorization": "Bearer " + get(client).app.token }
     }).then(res => res.json());
 
-    const user = await parseUser(data);
-    if (user === null || user === undefined) {
-        if (data.id) {
-            console.warn("Failed to parse user data #" + data.id);
-        } else {
-            console.warn("Failed to parse user data:");
-            console.warn(data);
-        }
-        return false;
-    }
-    return user;
+    return data;
 }
diff --git a/src/lib/client/client.js b/src/lib/client/client.js
index 6e96f19..e540622 100644
--- a/src/lib/client/client.js
+++ b/src/lib/client/client.js
@@ -74,7 +74,7 @@ export class Client {
         return await api.revokeToken();
     }
 
-    async getUser() {
+    async getClientUser() {
         // already known
         if (this.user) return this.user;
 
@@ -90,6 +90,7 @@ export class Client {
         }
         const user = await api.parseUser(data);
         console.log(`Logged in as @${user.username}@${user.host}`);
+        console.log(`You have ${data.source.follow_request_count} follow request${data.source.follow_request_count === 1 ? '' : 's'}!`);
         return user;
     }
 
@@ -161,6 +162,10 @@ export class Client {
         return emoji;
     }
 
+    async getUser(user_id) {
+        return await api.getUser(user_id);
+    }
+
     save() {
         if (typeof localStorage === typeof undefined) return;
         localStorage.setItem(save_name, JSON.stringify({
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index cbdea97..ab5ba36 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -12,13 +12,14 @@
         let new_client = new Client();
         new_client.load();
 
-        return new_client.getUser().then(user => {
+        return new_client.getClientUser().then(user => {
             if (!user) {
                 client.set(new_client);
                 return resolve();
             }
             new_client.user = user;
             client.set(new_client);
+            client.user
             return resolve();
         });
     });
diff --git a/src/routes/callback/+page.svelte b/src/routes/callback/+page.svelte
index 5c68338..6e8109c 100644
--- a/src/routes/callback/+page.svelte
+++ b/src/routes/callback/+page.svelte
@@ -23,7 +23,7 @@
                 return c;
             });
 
-            get(client).getUser().then(user => {
+            get(client).getClientUser().then(user => {
                 if (user) client.update(client => {
                     client.user = user
                     return client;