From b170a532f6d118a4aa79d4c9942c4923b70275c2 Mon Sep 17 00:00:00 2001
From: ari melody <ari@arimelody.me>
Date: Sun, 13 Jul 2025 19:04:50 +0100
Subject: [PATCH] use `fqn` for local account instead of building manually

---
 src/lib/account.js               | 2 ++
 src/lib/ui/Navigation.svelte     | 2 +-
 src/routes/+layout.svelte        | 2 +-
 src/routes/callback/+page.svelte | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/account.js b/src/lib/account.js
index 7bfd696..15ee53c 100644
--- a/src/lib/account.js
+++ b/src/lib/account.js
@@ -31,6 +31,8 @@ export function parseAccount(data) {
     else
         account.host = get(server).host;
 
+    account.fqn = data.fqn || account.username + account.host;
+
     account.mention = "@" + account.username;
     if (account.host != get(server).host)
         account.mention += "@" + account.host;
diff --git a/src/lib/ui/Navigation.svelte b/src/lib/ui/Navigation.svelte
index e977153..d580d2d 100644
--- a/src/lib/ui/Navigation.svelte
+++ b/src/lib/ui/Navigation.svelte
@@ -175,7 +175,7 @@
             <div class="account-name" aria-hidden="true">
                 <a href={$account.url} class="nickname" title={$account.nickname}>{@html $account.rich_name}</a>
                 <span class="username" title={`@${$account.username}@${$account.host}`}>
-                    {`@${$account.username}@${$account.host}`}
+                    {$account.fqn}
                 </span>
             </div>
         </div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8abb605..03842da 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -28,7 +28,7 @@
         if (!data) return;
 
         account.set(parseAccount(data));
-        console.log(`Logged in as @${$account.username}@${$account.host}`);
+        console.log(`Logged in as ${$account.fqn}`);
 
         // spin up async task to fetch notifications
         const notif_data = await api.getNotifications(
diff --git a/src/routes/callback/+page.svelte b/src/routes/callback/+page.svelte
index 8b6985e..751e4a3 100644
--- a/src/routes/callback/+page.svelte
+++ b/src/routes/callback/+page.svelte
@@ -30,7 +30,7 @@
                 if (!data) return goto("/");
 
                 account.set(parseAccount(data));
-                console.log(`Logged in as @${get(account).username}@${get(account).host}`);
+                console.log(`Logged in as ${get(account).fqn}`);
 
                 // spin up async task to fetch notifications
                 return api.getNotifications(