CHANGELOGS.md

@@ -1,10 +0,0 @@
-# Campfire v0.3.0
-- Added notifications view
-- Many more background tweaks, fixes, and optimisations
-
-# Campfire v0.2.0
-- Complete UI overhaul (thanks mae!)
-- Added light and dark themes
-- Added ability to like and boost posts
-- Added ability to view threads in context
-- Many background tweaks, fixes, and optimisations

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "campfire-client",
-    "version": "0.3.0",
+    "version": "0.2.0_rev3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "campfire-client",
-            "version": "0.3.0",
+            "version": "0.2.0_rev3",
             "license": "GPL-3.0",
             "devDependencies": {
                 "@poppanator/sveltekit-svg": "^4.2.1",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "campfire-client",
-    "version": "0.3.0",
+    "version": "0.2.0",
     "description": "social media for the galaxy-wide-web! 🌌",
     "private": true,
     "type": "module",

src/app.html

@@ -12,14 +12,14 @@
         <meta property="og:type" content="website">
         <meta property="og:title" content="Campfire">
         <meta property="og:description" content="Social media for the galaxy-wide-web!">
-        <meta property="og:image" content="https://campfire.bliss.town/icon/campfire-icon.png">
+        <meta property="og:image" content="https://campfire.bliss.town/favicon.png">
 
         <meta name="twitter:card" content="summary_large_image">
         <meta property="twitter:domain" content="campfire.bliss.town">
         <meta property="twitter:url" content="https://campfire.bliss.town">
         <meta name="twitter:title" content="Campfire">
         <meta name="twitter:description" content="Social media for the galaxy-wide-web!">
-        <meta name="twitter:image" content="https://campfire.bliss.town/icon/campfire-icon.png">
+        <meta name="twitter:image" content="https://campfire.bliss.town/favicon.png">
 
         %sveltekit.head%
     </head>

src/img/icons/quote.svg

@@ -1,4 +1,3 @@
 <svg viewBox="0 0 128 128" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M41.25 102C36.8317 102 33.25 98.4183 33.25 94V81H30.75C23.018 81 16.75 74.732 16.75 67V40C16.75 32.268 23.018 26 30.75 26H49.5C57.232 26 63.5 32.268 63.5 40V73C63.5 75.6212 62.7488 78.5715 61.9055 81.062C60.9986 83.7402 59.7131 86.6735 58.1334 89.4379C56.5813 92.154 54.5609 95.032 52.0686 97.3339C49.6611 99.5574 45.9736 102 41.25 102ZM41.25 73V94C44.1431 94 46.9245 91.6565 49.25 88.4761C50.8958 86.2252 52.3132 83.5551 53.3802 81C54.7139 77.806 55.5 74.7916 55.5 73V40C55.5 36.6863 52.8137 34 49.5 34H30.75C27.4363 34 24.75 36.6863 24.75 40V67C24.75 70.3137 27.4363 73 30.75 73H41.25ZM40.5032 86.1254C40.5032 86.1249 40.512 86.1202 40.5295 86.1129C40.5119 86.1223 40.5032 86.126 40.5032 86.1254Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.5 94V79H31C24.373 79 19 73.627 19 67V40C19 33.373 24.373 28 31 28H49.75C56.377 28 61.75 33.373 61.75 40V73C61.75 75.07 61.162 77.76 60.261 80.421C59.396 82.977 58.159 85.8 56.647 88.446C55.093 91.166 53.166 93.828 50.962 95.865C48.479 98.157 45.232 100 41.5 100C38.186 100 35.5 97.314 35.5 94ZM41.5 94C43.654 94 45.458 92.78 46.891 91.457C48.664 89.819 50.187 87.657 51.437 85.469C52.751 83.17 53.826 80.717 54.578 78.496C55.247 76.52 55.75 74.537 55.75 73V40C55.75 36.686 53.064 34 49.75 34H31C27.686 34 25 36.686 25 40V67C25 70.314 27.686 73 31 73H38.5C40.157 73 41.5 74.343 41.5 76V94ZM82.25 94V79H77.75C71.123 79 65.75 73.627 65.75 67V40C65.75 33.373 71.123 28 77.75 28H96.5C103.127 28 108.5 33.373 108.5 40V73C108.5 75.07 107.912 77.76 107.011 80.421C106.146 82.977 104.909 85.8 103.397 88.446C101.843 91.166 99.916 93.828 97.712 95.865C95.229 98.157 91.982 100 88.25 100C84.936 100 82.25 97.314 82.25 94ZM88.25 94C90.404 94 92.208 92.78 93.641 91.457C95.414 89.819 96.937 87.657 98.187 85.469C99.501 83.17 100.576 80.717 101.328 78.496C101.997 76.52 102.5 74.537 102.5 73V40C102.5 36.686 99.814 34 96.5 34H77.75C74.436 34 71.75 36.686 71.75 40V67C71.75 70.314 74.436 73 77.75 73H85.25C86.907 73 88.25 74.343 88.25 76V94Z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M88 102C83.5817 102 80 98.4183 80 94V81H77.5C69.768 81 63.5 74.732 63.5 67V40C63.5 32.268 69.768 26 77.5 26H96.25C103.982 26 110.25 32.268 110.25 40V73C110.25 75.6212 109.499 78.5715 108.655 81.062C107.749 83.7402 106.463 86.6735 104.883 89.4379C103.331 92.154 101.311 95.032 98.8186 97.3339C96.4111 99.5574 92.7236 102 88 102ZM88 73V94C90.8931 94 93.6745 91.6565 96 88.4761C97.6458 86.2252 99.0632 83.5551 100.13 81C101.464 77.806 102.25 74.7916 102.25 73V40C102.25 36.6863 99.5637 34 96.25 34H77.5C74.1863 34 71.5 36.6863 71.5 40V67C71.5 70.3137 74.1863 73 77.5 73H88ZM87.2532 86.1254C87.2532 86.1249 87.262 86.1202 87.2795 86.1129C87.2619 86.1223 87.2532 86.126 87.2532 86.1254Z"/>
 </svg>

src/lib/client/api.js

@@ -1,9 +1,8 @@
-import { client } from '$lib/client/client.js';
+import { Client } from '../client/client.js';
-import { user } from '$lib/stores/user.js';
 import { capabilities } from '../client/instance.js';
-import Post from '$lib/post.js';
+import Post from '../post.js';
-import User from '$lib/user/user.js';
+import User from '../user/user.js';
-import Emoji from '$lib/emoji.js';
+import Emoji from '../emoji.js';
 import { get } from 'svelte/store';
 
 export async function createApp(host) {
@@ -32,23 +31,25 @@ export async function createApp(host) {
 }
 
 export function getOAuthUrl() {
-    return `https://${get(client).instance.host}/oauth/authorize` +
+    let client = get(Client.get());
-        `?client_id=${get(client).app.id}` +
+    return `https://${client.instance.host}/oauth/authorize` +
+        `?client_id=${client.app.id}` +
         "&scope=read+write+push" +
         `&redirect_uri=${location.origin}/callback` +
         "&response_type=code";
 }
 
 export async function getToken(code) {
+    let client = get(Client.get());
     let form = new FormData();
-    form.append("client_id", get(client).app.id);
+    form.append("client_id", client.app.id);
-    form.append("client_secret", get(client).app.secret);
+    form.append("client_secret", client.app.secret);
     form.append("redirect_uri", `${location.origin}/callback`);
     form.append("grant_type", "authorization_code");
     form.append("code", code);
     form.append("scope", "read write push");
 
-    const res = await fetch(`https://${get(client).instance.host}/oauth/token`, {
+    const res = await fetch(`https://${client.instance.host}/oauth/token`, {
         method: "POST",
         body: form,
     })
@@ -64,12 +65,13 @@ export async function getToken(code) {
 }
 
 export async function revokeToken() {
+    let client = get(Client.get());
     let form = new FormData();
-    form.append("client_id", get(client).app.id);
+    form.append("client_id", client.app.id);
-    form.append("client_secret", get(client).app.secret);
+    form.append("client_secret", client.app.secret);
-    form.append("token", get(client).app.token);
+    form.append("token", client.app.token);
 
-    const res = await fetch(`https://${get(client).instance.host}/oauth/revoke`, {
+    const res = await fetch(`https://${client.instance.host}/oauth/revoke`, {
         method: "POST",
         body: form,
     })
@@ -83,52 +85,34 @@ export async function revokeToken() {
 }
 
 export async function verifyCredentials() {
-    let url = `https://${get(client).instance.host}/api/v1/accounts/verify_credentials`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/accounts/verify_credentials`;
     const data = await fetch(url, {
         method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
-    }).then(res => res.json());
-
-    return data;
-}
-
-export async function getNotifications(since_id, limit, types) {
-    if (!get(user)) return false;
-
-    let url = `https://${get(client).instance.host}/api/v1/notifications`;
-
-    let params = new URLSearchParams();
-    if (since_id) params.append("since_id", since_id);
-    if (limit) params.append("limit", limit);
-    if (types) params.append("types", types.join(','));
-    const params_string = params.toString();
-    if (params_string) url += '?' + params_string;
-
-    const data = await fetch(url, {
-        method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
     }).then(res => res.json());
 
     return data;
 }
 
 export async function getTimeline(last_post_id) {
-    if (!get(user)) return false;
+    let client = get(Client.get());
-    let url = `https://${get(client).instance.host}/api/v1/timelines/home`;
+    let url = `https://${client.instance.host}/api/v1/timelines/home`;
     if (last_post_id) url += "?max_id=" + last_post_id;
     const data = await fetch(url, {
         method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => res.json());
 
     return data;
 }
 
 export async function getPost(post_id, ancestor_count) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}`;
     const data = await fetch(url, {
         method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -136,10 +120,11 @@ export async function getPost(post_id, ancestor_count) {
 }
 
 export async function getPostContext(post_id) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/context`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/context`;
     const data = await fetch(url, {
         method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -147,10 +132,11 @@ export async function getPostContext(post_id) {
 }
 
 export async function boostPost(post_id) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/reblog`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/reblog`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -158,10 +144,11 @@ export async function boostPost(post_id) {
 }
 
 export async function unboostPost(post_id) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/unreblog`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/unreblog`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -169,10 +156,11 @@ export async function unboostPost(post_id) {
 }
 
 export async function favouritePost(post_id) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/favourite`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/favourite`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -180,10 +168,11 @@ export async function favouritePost(post_id) {
 }
 
 export async function unfavouritePost(post_id) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/unfavourite`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/unfavourite`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -196,10 +185,11 @@ export async function reactPost(post_id, shortcode) {
     // to the default like emote.
     // identical api calls on chuckya instances do not display
     // this behaviour.
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/react/${encodeURIComponent(shortcode)}`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/react/${encodeURIComponent(shortcode)}`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
@@ -207,24 +197,26 @@ export async function reactPost(post_id, shortcode) {
 }
 
 export async function unreactPost(post_id, shortcode) {
-    let url = `https://${get(client).instance.host}/api/v1/statuses/${post_id}/unreact/${encodeURIComponent(shortcode)}`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/statuses/${post_id}/unreact/${encodeURIComponent(shortcode)}`;
     const data = await fetch(url, {
         method: 'POST',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => { return res.ok ? res.json() : false });
 
     if (data === false) return false;
     return data;
 }
 
-export async function parsePost(data, ancestor_count) {
+export async function parsePost(data, ancestor_count, with_context) {
+    let client = get(Client.get());
     let post = new Post();
 
     post.text = data.content;
-    post.html = data.content;
 
     post.reply = null;
-    if ((data.in_reply_to_id || data.reply) &&
+    if (!with_context && // ancestor replies are handled in full later
+        (data.in_reply_to_id || data.reply) &&
         ancestor_count !== 0
     ) {
         const reply_data = data.reply || await getPost(data.in_reply_to_id, ancestor_count - 1);
@@ -233,9 +225,29 @@ export async function parsePost(data, ancestor_count) {
         if (!reply_data) return false;
         post.reply = await parsePost(reply_data, ancestor_count - 1, false);
     }
-
     post.boost = data.reblog ? await parsePost(data.reblog, 1, false) : null;
 
+    post.replies = [];
+    if (with_context) {
+        const replies_data = await getPostContext(data.id);
+        if (replies_data) {
+            // posts this is replying to
+            if (replies_data.ancestors) {
+                let head = post;
+                while (replies_data.ancestors.length > 0) {
+                    head.reply = await parsePost(replies_data.ancestors.pop(), 0, false);
+                    head = head.reply;
+                }
+            }
+            // posts in reply to this
+            if (replies_data.descendants) {
+                for (let i in replies_data.descendants) {
+                    post.replies.push(await parsePost(replies_data.descendants[i], 0, false));
+                }
+            }
+        }
+    }
+
     post.id = data.id;
     post.created_at = new Date(data.created_at);
     post.user = await parseUser(data.account);
@@ -263,7 +275,7 @@ export async function parsePost(data, ancestor_count) {
         });
     }
 
-    if (data.reactions && get(client).instance.capabilities.includes(capabilities.REACTIONS)) {
+    if (data.reactions && client.instance.capabilities.includes(capabilities.REACTIONS)) {
         post.reactions = parseReactions(data.reactions);
     }
     return post;
@@ -274,14 +286,15 @@ export async function parseUser(data) {
         console.error("Attempted to parse user data but no data was provided");
         return null;
     }
-    let user = await get(client).getCacheUser(data.id);
+    let client = get(Client.get());
+    let user = await client.getCacheUser(data.id);
 
     if (user) return user;
     // cache miss!
 
     user = new User();
     user.id = data.id;
-    user.nickname = data.display_name.trim();
+    user.nickname = data.display_name;
     user.username = data.username;
     user.avatar_url = data.avatar;
     user.url = data.url;
@@ -289,7 +302,7 @@ export async function parseUser(data) {
     if (data.acct.includes('@'))
         user.host = data.acct.split('@')[1];
     else
-        user.host = get(client).instance.host;
+        user.host = client.instance.host;
 
     user.emojis = [];
     data.emojis.forEach(emoji_data => {
@@ -299,11 +312,12 @@ export async function parseUser(data) {
         user.emojis.push(parseEmoji(emoji_data));
     });
 
-    get(client).putCacheUser(user);
+    client.putCacheUser(user);
     return user;
 }
 
 export function parseReactions(data) {
+    let client = get(Client.get());
     let reactions = [];
     data.forEach(reaction_data => {
         let reaction = {
@@ -324,16 +338,27 @@ export function parseEmoji(data) {
         data.host,
         data.url,
     );
-    get(client).putCacheEmoji(emoji);
+    get(Client.get()).putCacheEmoji(emoji);
     return emoji;
 }
 
 export async function getUser(user_id) {
-    let url = `https://${get(client).instance.host}/api/v1/accounts/${user_id}`;
+    let client = get(Client.get());
+    let url = `https://${client.instance.host}/api/v1/accounts/${user_id}`;
     const data = await fetch(url, {
         method: 'GET',
-        headers: { "Authorization": "Bearer " + get(client).app.token }
+        headers: { "Authorization": "Bearer " + client.app.token }
     }).then(res => res.json());
 
-    return data;
+    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;
 }

src/lib/client/client.js

@@ -1,10 +1,8 @@
 import { Instance, server_types } from './instance.js';
 import * as api from './api.js';
 import { get, writable } from 'svelte/store';
-import { last_read_notif_id } from '$lib/notifications.js';
-import { user, logged_in } from '$lib/stores/user.js';
 
-export const client = writable(false);
+let client = writable(false);
 
 const save_name = "campfire";
 
@@ -24,6 +22,15 @@ export class Client {
         };
     }
 
+    static get() {
+        let current = get(client);
+        if (current && current.app) return client;
+        let new_client = new Client();
+        new_client.load();
+        client.set(new_client);
+        return client;
+    }
+
     async init(host) {
         if (host.startsWith("https://")) host = host.substring(8);
         const url = `https://${host}/api/v1/instance`;
@@ -69,34 +76,30 @@ export class Client {
             console.error("Failed to obtain access token");
             return false;
         }
-        return token;
+        this.app.token = token;
+        client.set(this);
     }
 
     async revokeToken() {
         return await api.revokeToken();
     }
 
-    async getClientUser() {
+    async verifyCredentials() {
-        // already known
         if (this.user) return this.user;
-
-        // cannot provide- not logged in
         if (!this.app || !this.app.token) {
+            this.user = false;
             return false;
         }
-
-        // logged in- attempt to retrieve using token
         const data = await api.verifyCredentials();
         if (!data) {
+            this.user = false;
             return false;
         }
-        const user = await api.parseUser(data);
+        await client.update(async c => {
-        console.log(`Logged in as @${user.username}@${user.host}`);
+            c.user = await api.parseUser(data);
-        return user;
+            console.log(`Logged in as @${c.user.username}@${c.user.host}`);
-    }
+        });
-
+        return this.user;
-    async getNotifications(since_id, limit, types) {
-        return await api.getNotifications(since_id, limit, types);
     }
 
     async getTimeline(last_post_id) {
@@ -107,10 +110,6 @@ export class Client {
         return await api.getPost(post_id, parent_replies, child_replies);
     }
 
-    async getPostContext(post_id) {
-        return await api.getPostContext(post_id);
-    }
-
     async boostPost(post_id) {
         return await api.boostPost(post_id);
     }
@@ -167,10 +166,6 @@ 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({
@@ -179,7 +174,6 @@ export class Client {
                 host: this.instance.host,
                 version: this.instance.version,
             },
-            last_read_notif_id: get(last_read_notif_id),
             app: this.app,
         }));
     }
@@ -194,7 +188,6 @@ export class Client {
             return false;
         }
         this.instance = new Instance(saved.instance.host, saved.instance.version);
-        last_read_notif_id.set(saved.last_read_notif_id || 0);
         this.app = saved.app;
         client.set(this);
         return true;
@@ -206,8 +199,7 @@ export class Client {
             console.warn("Failed to log out correctly; ditching the old tokens anyways.");
         }
         localStorage.removeItem(save_name);
-        logged_in.set(false);
+        client.set(false);
-        client.set(new Client());
         console.log("Logged out successfully.");
     }
 }

src/lib/emoji.js

@@ -1,4 +1,4 @@
-import { client } from './client/client.js';
+import { Client } from './client/client.js';
 import { get } from 'svelte/store';
 
 export const EMOJI_REGEX = /:[\w\-.]{0,32}@[\w\-.]{0,32}:/g;
@@ -33,7 +33,7 @@ export function parseText(text, host) {
     let length = text.substring(index + 1).search(':');
     if (length <= 0) return text;
     let emoji_name = text.substring(index + 1, index + length + 1);
-    let emoji = get(client).getEmoji(emoji_name + '@' + host);
+    let emoji = get(Client.get()).getEmoji(emoji_name + '@' + host);
 
     if (emoji) {
         return text.substring(0, index) + emoji.html +
@@ -46,7 +46,7 @@ export function parseText(text, host) {
 export function parseOne(emoji_id) {
     if (emoji_id == '❤') return '❤️'; // stupid heart unicode
     if (EMOJI_REGEX.exec(':' + emoji_id + ':')) return emoji_id;
-    let cached_emoji = get(client).getEmoji(emoji_id);
+    let cached_emoji = get(Client.get()).getEmoji(emoji_id);
     if (!cached_emoji) return emoji_id;
     return cached_emoji.html;
 }

src/lib/notifications.js

@@ -1,40 +0,0 @@
-import { client } from '$lib/client/client.js';
-import * as api from '$lib/client/api.js';
-import { get, writable } from 'svelte/store';
-
-export let notifications = writable([]);
-export let unread_notif_count = writable(0);
-export let last_read_notif_id = writable(0);
-
-let loading;
-export async function getNotifications() {
-    if (loading) return; // no spamming!!
-    loading = true;
-
-    api.getNotifications().then(async data => {
-        if (!data || data.length <= 0) return;
-        notifications.set([]);
-        for (let i in data) {
-            let notif = data[i];
-            notif.accounts = [ await api.parseUser(notif.account) ];
-            if (get(notifications).length > 0) {
-                let prev = get(notifications)[get(notifications).length - 1];
-                if (notif.type === prev.type) {
-                    if (prev.status && notif.status && prev.status.id === notif.status.id) {
-                        notifications.update(notifications => {
-                            notifications[notifications.length - 1].accounts.push(notif.accounts[0]);
-                            return notifications;
-                        });
-                        continue;
-                    }
-                }
-            }
-            notif.status = notif.status ? await api.parsePost(notif.status, 0, false) : null;
-            notifications.update(notifications => [...notifications, notif]);
-        }
-        last_read_notif_id.set(data[0].id);
-        unread_notif_count.set(0);
-        get(client).save();
-        loading = false;
-    });
-}

src/lib/stores/user.js

@@ -1,22 +0,0 @@
-import { client } from '$lib/client/client.js';
-import * as api from '$lib/client/api.js';
-import { get, writable } from 'svelte/store';
-
-export let user = writable(0);
-export let logged_in = writable(false);
-
-export async function getUser() {
-    // already known
-    if (get(user)) return get(user);
-
-    // cannot provide- not logged in
-    if (!get(client).app || !get(client).app.token) return false;
-
-    // logged in- attempt to retrieve using token
-    const data = await api.verifyCredentials();
-    if (!data) return false;
-
-    user.set(await api.parseUser(data));
-    console.log(`Logged in as @${get(user).username}@${get(user).host}`);
-    return get(user);
-}

src/lib/timeline.js

@@ -1,8 +1,8 @@
-import { client } from '$lib/client/client.js';
+import { Client } from '$lib/client/client.js';
 import { get, writable } from 'svelte/store';
 import { parsePost } from '$lib/client/api.js';
 
-export let timeline = writable([]);
+export let posts = writable([]);
 
 let loading = false;
 
@@ -10,9 +10,11 @@ export async function getTimeline(clean) {
     if (loading) return; // no spamming!!
     loading = true;
 
+    let client = get(Client.get());
+
     let timeline_data;
-    if (clean || get(timeline).length === 0) timeline_data = await get(client).getTimeline()
+    if (clean || get(posts).length === 0) timeline_data = await client.getTimeline()
-    else timeline_data = await get(client).getTimeline(get(timeline)[get(timeline).length - 1].id);
+    else timeline_data = await client.getTimeline(get(posts)[get(posts).length - 1].id);
 
     if (!timeline_data) {
         console.error(`Failed to retrieve timeline.`);
@@ -20,7 +22,7 @@ export async function getTimeline(clean) {
         return;
     }
 
-    if (clean) timeline.set([]);
+    if (clean) posts.set([]);
 
     for (let i in timeline_data) {
         const post_data = timeline_data[i];
@@ -36,7 +38,7 @@ export async function getTimeline(clean) {
             }
             continue;
         }
-        timeline.update(current => [...current, post]);
+        posts.update(current => [...current, post]);
     }
     loading = false;
 }

src/lib/ui/Button.svelte

@@ -1,8 +1,6 @@
 <script>
     import { play_sound } from '../sound.js';
     import { createEventDispatcher } from 'svelte';
-    import { afterUpdate } from 'svelte';
-
     const dispatch = createEventDispatcher();
 
     export let active = false;
@@ -14,24 +12,20 @@
     export let href = false;
 
     let classes = [];
-
-    function click() {
-        if (disabled) return;
-        if (href) {
-            location = href;
-            return;
-        }
-        play_sound(sound);
-        dispatch('click');
-    }
-
-    afterUpdate(() => {
-        classes = [];
     if (active) classes = ["active"];
     if (filled) classes = ["filled"];
     if (disabled) classes = ["disabled"];
     if (centered) classes.push("centered");
-    });
+
+    function click() {
+        if (href) {
+            location = href;
+            return;
+        }
+        if (disabled) return;
+        play_sound(sound);
+        dispatch('click');
+    }
 </script>
 
 <button

src/lib/ui/Feed.svelte

@@ -1,27 +1,27 @@
 <script>
     import Button from './Button.svelte';
     import Post from './post/Post.svelte';
-    import { getTimeline } from '$lib/timeline.js';
+    import Error from './Error.svelte';
+    import { Client } from '$lib/client/client.js';
+    import { parsePost } from '$lib/client/api.js';
+    import { get } from 'svelte/store';
+    import { posts, getTimeline } from '$lib/timeline.js';
 
-    export let posts = [];
+    getTimeline();
+    document.addEventListener("scroll", event => {
+        if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 2048) {
+            getTimeline();
+        }
+    });
 </script>
 
-<header>
-    <h1>Home</h1>
-    <nav>
-        <Button centered active>Home</Button>
-        <Button centered disabled>Local</Button>
-        <Button centered disabled>Federated</Button>
-    </nav>
-</header>
-
 <div id="feed" role="feed">
     {#if posts.length <= 0}
         <div class="loading throb">
             <span>getting the feed...</span>
         </div>
     {/if}
-    {#each posts as post}
+    {#each $posts as post}
         <Post post_data={post} />
     {/each}
 </div>
@@ -29,7 +29,6 @@
 <style>
     header {
         width: 100%;
-        height: 64px;
         margin: 16px 0 8px 0;
         display: flex;
         flex-direction: row;

src/lib/ui/LoginForm.svelte

@@ -1,162 +0,0 @@
-<script>
-    import { client } from '$lib/client/client.js';
-    import { get } from 'svelte/store';
-
-    import Logo from '$lib/../img/campfire-logo.svg';
-
-    let instance_url_error = false;
-    let logging_in = false;
-
-    function log_in(event) {
-        event.preventDefault();
-        instance_url_error = false;
-
-        logging_in = true;
-        const host = event.target.host.value;
-
-        if (!host || host === "") {
-            instance_url_error = "Please enter an instance domain.";
-            logging_in = false;
-            return;
-        }
-
-        console.log(client);
-
-        get(client).init(host).then(res => {
-            logging_in = false;
-            if (!res) return;
-            if (res.constructor === String) {
-                instance_url_error = res;
-                return;
-            };
-            let oauth_url = get(client).getOAuthUrl();
-            location = oauth_url;
-        });
-    }
-</script>
-
-<form on:submit={log_in} id="login-form">
-    <div class="app-logo">
-        <Logo />
-    </div>
-    <p>Welcome, fediverse user!</p>
-    <p>Please enter your instance domain to log in.</p>
-    <div class="input-wrapper">
-        <input type="text" id="host" aria-label="instance domain" class={logging_in ? "throb" : ""}>
-        {#if instance_url_error}
-            <p class="error">{instance_url_error}</p>
-        {/if}
-    </div>
-    <br>
-    <button type="submit" id="login" class={logging_in ? "disabled" : ""}>Log in</button>
-    <p><small>
-        Please note this is
-        <strong><em>extremely experimental software</em></strong>;
-        things are likely to break!
-        <br>
-        If that's all cool with you, welcome aboard!
-    </small></p>
-
-    <p class="form-footer">made with ❤ by <a href="https://bliss.town">bliss town</a>, 2024</p>
-</form>
-
-<style>
-    form#login-form {
-        height: 100vh;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        text-align: center;
-    }
-
-    .input-wrapper {
-        width: 360px;
-        margin: 0 auto;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-    }
-
-    input[type=text] {
-        width: 100%;
-        padding: 12px;
-        display: block;
-        border-radius: 8px;
-        border: 1px solid var(--accent);
-        background-color: var(--bg-800);
-
-        font-family: inherit;
-        font-weight: bold;
-        font-size: inherit;
-        color: var(--text);
-
-        transition: box-shadow .2s;
-    }
-
-    input[type=text]::placeholder {
-        opacity: .8;
-    }
-
-    input[type=text]:focus {
-        outline: none;
-        box-shadow: 0 0 16px color-mix(in srgb, transparent, var(--accent) 25%);
-    }
-
-    .error {
-        margin: 6px;
-        font-style: italic;
-        font-size: .9em;
-        color: red;
-        opacity: .7;
-    }
-
-    button#login {
-        margin: 8px auto;
-        padding: 12px 24px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-
-        font-family: inherit;
-        font-size: 1rem;
-        font-weight: 600;
-        text-align: left;
-
-        border-radius: 8px;
-        border-width: 2px;
-        border-style: solid;
-
-        background-color: var(--bg-700);
-        color: var(--text);
-        border-color: transparent;
-
-        transition-property: border-color, background-color, color;
-        transition-timing-function: ease-out;
-        transition-duration: .1s;
-
-        cursor: pointer;
-        text-align: center;
-        justify-content: center;
-    }
-
-    button#login:hover {
-        background-color: color-mix(in srgb, var(--bg-700), var(--accent) 10%);
-        border-color: color-mix(in srgb, var(--bg-700), var(--accent) 20%);
-    }
-
-    button#login:active {
-        background-color: color-mix(in srgb, var(--bg-700), var(--bg-800) 50%);
-        border-color: color-mix(in srgb, var(--bg-700), var(--bg-800) 10%);
-    }
-
-    button#login.disabled {
-        opacity: .5;
-        cursor: initial;
-    }
-
-    .form-footer {
-        opacity: .7;
-    }
-</style>

src/lib/ui/Navigation.svelte

@@ -2,16 +2,11 @@
     import Logo from '$lib/../img/campfire-logo.svg';
     import Button from './Button.svelte';
     import Feed from './Feed.svelte';
-    import { client } from '$lib/client/client.js';
+    import { Client } from '$lib/client/client.js';
-    import { user } from '$lib/stores/user.js';
     import { play_sound } from '$lib/sound.js';
     import { getTimeline } from '$lib/timeline.js';
-    import { getNotifications } from '$lib/notifications.js';
     import { goto } from '$app/navigation';
-    import { page } from '$app/stores';
     import { get } from 'svelte/store';
-    import { logged_in } from '$lib/stores/user.js';
-    import { unread_notif_count, last_read_notif_id } from '$lib/notifications.js';
 
     import TimelineIcon from '../../img/icons/timeline.svg';
     import NotificationsIcon from '../../img/icons/notifications.svg';
@@ -27,69 +22,60 @@
 
     const VERSION = APP_VERSION;
     
-    function handle_btn(name) {
+    let client = false;
-        if (!get(logged_in)) return;
+    Client.get().subscribe(c => {
-        let route;
+        client = c;
-        switch (name) {
+    });
-            case "timeline":
+
-                route = "/";
+    let notification_count = 0;
+    if (notification_count > 99) notification_count = "99+";
+
+    function goTimeline() {
+        if (location.pathname === "/") {
             getTimeline(true);
-                break;
-            case "notifications":
-                route = "/notifications";
-                getNotifications();
-                break;
-            case "explore":
-            case "lists":
-            case "favourites":
-            case "bookmarks":
-            case "hashtags":
-            default:
-                return;
-        }
-        if (!route) return;
             window.scrollTo({
                 top: 0,
                 behavior: "smooth"
             });
-        goto(route);
+            return;
+        }
+        goto("/");
     }
 
     async function log_out() {
         if (!confirm("This will log you out. Are you sure?")) return;
-        await get(client).logout();
+        await get(Client.get()).logout();
         goto("/");
     }
 </script>
 
 <div id="navigation">
+    {#if client.instance && client.instance.icon_url && client.instance.banner_url}
+        <header class="instance-header" style="background-image: url({client.instance.banner_url})">
+            <img src={client.instance.icon_url} class="instance-icon" height="92px" aria-hidden="true">
+        </header>
+    {:else}
         <header class="instance-header">
             <div class="app-logo">
                 <Logo />
             </div>
         </header>
+    {/if}
 
-    {#if $logged_in}
     <div id="nav-items">
-        <Button label="Timeline"
+        <Button label="Timeline" on:click={() => goTimeline()} active={client.user}>
-                on:click={() => handle_btn("timeline")}
-                active={$page.url.pathname === "/"}>
             <svelte:fragment slot="icon">
                 <TimelineIcon/>
             </svelte:fragment>
             Timeline
         </Button>
-        <Button label="Notifications"
+        <Button label="Notifications" disabled>
-                on:click={() => handle_btn("notifications")}
-                active={$page.url.pathname === "/notifications"}>
             <svelte:fragment slot="icon">
                 <NotificationsIcon/>
             </svelte:fragment>
             Notifications
-            {#if $unread_notif_count}
+            {#if notification_count}
-                <span class="notification-count">
+            <span class="notification-count">{notification_count}</span>
-                    {$unread_notif_count <= 99 ? $unread_notif_count : "99+"}
-                </span>
             {/if}
         </Button>
         <Button label="Explore" disabled>
@@ -131,6 +117,7 @@
             </Button>
     </div>
 
+    {#if (client.user)}
     <div id="account-items">
         <div class="flex-row">
             <Button centered label="Profile information" disabled>
@@ -151,11 +138,11 @@
         </div>
 
         <div id="account-button">
-            <img src={$user.avatar_url} class="account-avatar" height="64px" alt="" aria-hidden="true" on:click={() => play_sound()}>
+            <img src={client.user.avatar_url} class="account-avatar" height="64px" alt="" aria-hidden="true" on:click={() => play_sound()}>
             <div class="account-name" aria-hidden="true">
-                <a href={$user.url} class="nickname" title={$user.nickname}>{$user.nickname}</a>
+                <span class="nickname" title={client.user.nickname}>{client.user.nickname}</span>
-                <span class="username" title={`@${$user.username}@${$user.host}`}>
+                <span class="username" title={`@${client.user.username}@${client.user.host}`}>
-                    {`@${$user.username}@${$user.host}`}
+                    {`@${client.user.username}@${client.user.host}`}
                 </span>
             </div>
         </div>
@@ -225,7 +212,6 @@
         transform: translate(22px, -16px);
         min-width: 12px;
         height: 28px;
-        margin-left: auto;
         padding: 0 8px;
         display: flex;
         justify-content: center;
@@ -337,7 +323,6 @@
         overflow: hidden;
         white-space: nowrap;
         font-size: .8em;
-        color: inherit;
     }
 
     .username {

src/lib/ui/Notification.svelte

@@ -1,227 +0,0 @@
-<script>
-    import * as api from '$lib/client/api.js';
-
-    import ReplyIcon from '$lib/../img/icons/reply.svg';
-    import RepostIcon from '$lib/../img/icons/repost.svg';
-    import FavouriteIcon from '$lib/../img/icons/like.svg';
-    import ReactIcon from '$lib/../img/icons/react.svg';
-    import QuoteIcon from '$lib/../img/icons/quote.svg';
-    import ReactionBar from '$lib/ui/post/ReactionBar.svelte';
-    import ActionBar from '$lib/ui/post/ActionBar.svelte';
-
-    let mention = (accounts) => {
-        let res = `<a href=${account.url}>${account.rich_name}</a>`;
-        if (accounts.length > 1) res += ` and <strong>${accounts.length - 1}</strong> others`;
-        return res;
-    };
-
-    export let data;
-    let activity_text = function (type) {
-        switch (type) {
-            case "mention":
-                return `%1 mentioned you.`;
-            case "reblog":
-                return `%1 boosted your post.`;
-            case "follow":
-                return `%1 followed you.`;
-            case "follow_request":
-                return `%1 requested to follow you.`;
-            case "favourite":
-                return `%1 favourited your post.`;
-            case "poll":
-                return `%1's poll as ended.`;
-            case "update":
-                return `%1 updated their post.`;
-            default:
-                return `%1 poked you!`;
-        }
-    }(data.type);
-
-    let account = data.accounts[0];
-    $: accounts_short = data.accounts.slice(0, 3).reverse();
-    
-    let aria_label = function () {
-        if (accounts.length == 1)
-            return activity_text.replace("%1", account.username) + ' ' + new Date(data.created_at);
-        else
-            return activity_text.replace("%1", `${account.username} and ${accounts.length - 1} others`) + ' ' + new Date(data.created_at);
-    }
-</script>
-
-<a class="notification" href={data.status ? `/post/${data.status.id}` : null} aria-label={aria_label}>
-    <header aria-hidden>
-        <span class="notif-icon">
-            {#if data.type === "favourite"}
-                <FavouriteIcon />
-            {:else if data.type === "reblog"}
-                <RepostIcon />
-            {:else if data.type === "react"}
-                <ReactIcon />
-            {:else if data.type === "mention"}
-                <ReplyIcon />
-            {:else}
-                <ReactIcon />
-            {/if}
-        </span>
-        <span class="notif-avatars">
-            {#if data.accounts.length == 1}
-                <a href={data.accounts[0].url} class="notif-avatar">
-                    <img src={data.accounts[0].avatar_url} alt="" width="28" height="28" />
-                </a>
-            {:else}
-                {#each accounts_short as account}
-                    <img src={account.avatar_url} alt="" width="28" height="28" />
-                {/each}
-            {/if}
-        </span>
-        <span class="notif-activity">{@html activity_text.replace("%1", mention(data.accounts))}</span>
-    </header>
-    {#if data.status}
-        <div class="notif-content">
-            {@html data.status.html}
-        </div>
-        {#if data.type === "mention"}
-            {#if data.status.reactions}
-                <ReactionBar post={data.status} />
-            {/if}
-            <ActionBar post={data.status} />
-        {/if}
-    {/if}
-</a>
-
-<style>
-    .notification {
-        display: block;
-        margin-bottom: 8px;
-        padding: 16px;
-        border-radius: 8px;
-        background: var(--bg-800);
-        text-decoration: inherit;
-        color: inherit;
-        transition: background-color .1s;
-    }
-
-    .notification:hover {
-        background-color: color-mix(in srgb, var(--bg-800), black 5%);
-    }
-
-    header {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        gap: 8px;
-    }
-
-    header .notif-icon {
-        width: 28px;
-        height: 28px;
-        display: inline-flex;
-    }
-
-    header .notif-avatars {
-        display: inline-flex;
-        flex-direction: row-reverse;
-    }
-
-    header .notif-avatar {
-        line-height: 0;
-    }
-    header .notif-avatars img {
-        border-radius: 4px;
-    }
-    header .notif-avatars img:not(:first-child) {
-        box-shadow: 4px 0 8px -2px rgba(0,0,0,.33);
-    }
-    header .notif-avatars img:not(:last-child) {
-        margin-left: -8px;
-    }
-
-    header .notif-activity {
-        width: 100%;
-    }
-
-    header :global(a) {
-        font-weight: bold;
-        color: var(--text);
-    }
-
-    header :global(.emoji) {
-        margin: -.2em 0;
-    }
-
-    .notif-content {
-        margin: 16px 0 4px 0;
-        font-size: 14px;
-        line-height: 1.45em;
-    }
-
-    .notif-content :global(p) {
-        margin: 0;
-    }
-
-    .notif-content :global(.emoji) {
-        position: relative;
-        top: 6px;
-        margin-top: -10px;
-        height: 24px!important;
-    }
-
-    .notif-content :global(blockquote) {
-        margin: .4em 0;
-        padding: .1em 0 .1em 1em;
-        border-left: 4px solid #8888;
-    }
-
-    .notif-content :global(blockquote span) {
-        opacity: .5;
-    }
-
-    .notif-content :global(code) {
-        font-size: 1.2em;
-    }
-
-    .notif-content :global(pre:has(code)) {
-        margin: 8px 0;
-        padding: 8px;
-        display: block;
-        overflow-x: scroll;
-        border-radius: 8px;
-        background-color: #080808;
-        color: var(--accent);
-    }
-
-    .notif-content :global(pre code) {
-        margin: 0;
-    }
-
-    .notif-content :global(a) {
-        color: var(--accent);
-    }
-
-    .notif-content :global(a.mention) {
-        color: inherit;
-        font-weight: 600;
-        padding: 3px 6px;
-        background: var(--bg-700);
-        border-radius: 6px;
-        text-decoration: none;
-    }
-
-    .notif-content :global(a.mention:hover) {
-        text-decoration: underline;
-    }
-
-    .notif-content :global(a.hashtag) {
-        background-color: transparent;
-        padding: 0;
-        font-style: italic;
-    }
-
-    .notif-content :global(.mention-avatar) {
-        position: relative;
-        top: 4px;
-        height: 20px;
-        margin-right: 4px;
-        border-radius: 4px;
-    }
-</style>

src/lib/ui/post/ActionBar.svelte

@@ -1,5 +1,5 @@
 <script>
-    import { client } from '../../client/client.js';
+    import { Client } from '../../client/client.js';
     import * as api from '../../client/api.js';
     import { get } from 'svelte/store';
 
@@ -16,11 +16,12 @@
     export let post;
 
     async function toggleBoost() {
+        let client = get(Client.get());
         let data;
         if (post.boosted)
-            data = await get(client).unboostPost(post.id);
+            data = await client.unboostPost(post.id);
         else
-            data = await get(client).boostPost(post.id);
+            data = await client.boostPost(post.id);
         if (!data) {
             console.error(`Failed to boost post ${post.id}`);
             return;
@@ -30,11 +31,12 @@
     }
 
     async function toggleFavourite() {
+        let client = get(Client.get());
         let data;
         if (post.favourited)
-            data = await get(client).unfavouritePost(post.id);
+            data = await client.unfavouritePost(post.id);
         else
-            data = await get(client).favouritePost(post.id);
+            data = await client.favouritePost(post.id);
         if (!data) {
             console.error(`Failed to favourite post ${post.id}`);
             return;
@@ -46,12 +48,13 @@
 
     async function toggleReaction(reaction) {
         if (reaction.name.includes('@')) return;
+        let client = get(Client.get());
 
         let data;
         if (reaction.me)
-            data = await get(client).unreactPost(post.id, reaction.name);
+            data = await client.unreactPost(post.id, reaction.name);
         else
-            data = await get(client).reactPost(post.id, reaction.name);
+            data = await client.reactPost(post.id, reaction.name);
         if (!data) {
             console.error(`Failed to favourite post ${post.id}`);
             return;

src/lib/ui/post/Body.svelte

@@ -29,7 +29,7 @@
             <div class="post-media-container" data-count={post.files.length}>
                 {#each post.files as file}
                     <div class="post-media {file.type}" on:click|stopPropagation on:mouseup|stopPropagation>
-                        {#if ["image", "gifv", "gif"].includes(file.type)}
+                        {#if file.type === "image"}
                             <a href={file.url} target="_blank">
                                 <img src={file.url} alt={file.description} title={file.description} height="200" loading="lazy" decoding="async">
                             </a>
@@ -84,8 +84,7 @@
     }
 
     .post-text {
-        font-size: .9em;
+        line-height: 1.2em;
-        line-height: 1.45em;
         word-wrap: break-word;
     }
 

src/lib/ui/post/BoostContext.svelte

@@ -10,10 +10,7 @@
 <div class="post-context">
     <span class="post-context-icon">🔁</span>
     <span class="post-context-action">
-        <a href={post.user.url} target="_blank"><span class="name">
+        <a href={post.user.url} target="_blank">{@html parseEmojis(post.user.rich_name)}</a> boosted this post.
-                {@html parseEmojis(post.user.rich_name)}</span>
-        </a>
-        boosted this post.
     </span>
     <span class="post-context-time">
         <time title="{time_string}">{short_time(post.created_at)}</time>
@@ -51,12 +48,6 @@
         text-decoration: underline;
     }
 
-    .post-context .name :global(.emoji) {
-        position: relative;
-        top: .2em;
-        height: 1.2em;
-    }
-
     .post-context-time {
         margin-left: auto;
     }

src/lib/ui/post/Post.svelte

@@ -32,15 +32,10 @@
 
     let mouse_pos = { top: 0, left: 0 };
 
-    function gotoPost(event) {
+    function gotoPost() {
         if (focused) return;
-        if (event) {
+        if (event && event.key && event.key !== "Enter") return;
-            if (event.type == "mouseup" && (
+        console.log(`/post/${post.id}`);
-                event.button !== 0 ||
-                event.shiftKey ||
-                event.ctrlKey)) return;
-            if (event.key && event.key !== "Enter") return;
-        }
         goto(`/post/${post.id}`);
     }
 
@@ -56,9 +51,7 @@
 
 <div class="post-container">
     {#if post.reply}
-        {#await post.reply then reply}
+        <ReplyContext post={post.reply} />
-            <ReplyContext post={reply} />
-        {/await}
     {/if}
     {#if is_boost && !post_context.text}
         <BoostContext post={post_context} />
@@ -67,15 +60,13 @@
             class={"post" + (focused ? " focused" : "")}
             aria-label={aria_label}
             bind:this={el}
-            on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY}}
+            on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY; console.log(mouse_pos)}}
-            on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost(e)}}
+            on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost()}}
             on:keydown={gotoPost}>
         <PostHeader post={post} />
         <Body post={post} />
         <footer class="post-footer">
-            {#if post.reactions}
             <ReactionBar post={post} />
-            {/if}
             <ActionBar post={post} />
         </footer>
     </article>

src/lib/ui/post/PostHeader.svelte

@@ -8,16 +8,16 @@
     let time_string = post.created_at.toLocaleString();
 </script>
 
-<div class={"post-header-container" + (reply ? " reply" : "")}>
+<div class={"post-header-container" + (reply ? " reply" : "")} on:mouseup|stopPropagation>
-    <a href={post.user.url} target="_blank" class="post-avatar-container" on:mouseup|stopPropagation>
+    <a href={post.user.url} target="_blank" class="post-avatar-container">
         <img src={post.user.avatar_url} type={post.user.avatar_type} alt="" width="48" height="48" class="post-avatar" loading="lazy" decoding="async">
     </a>
     <header class="post-header">
-        <div class="post-user-info" on:mouseup|stopPropagation>
+        <div class="post-user-info">
             <a href={post.user.url} target="_blank" class="name">{@html post.user.rich_name}</a>
             <span class="username">{post.user.mention}</span>
         </div>
-        <div class="post-info" on:mouseup|stopPropagation>
+        <div class="post-info">
             <a href={post.url} target="_blank" class="created-at">
                 <time title={time_string}>{short_time(post.created_at)}</time>
                 {#if post.visibility !== "public"}
@@ -82,8 +82,8 @@
 
     .post-user-info .name :global(.emoji) {
         position: relative;
-        top: .2em;
+        top: 4px;
-        height: 1.2em;
+        height: 20px;
     }
 
     .post-user-info .username {

src/lib/ui/post/ReactionBar.svelte

@@ -34,11 +34,10 @@
 <style>
     .post-reactions {
         width: fit-content;
-        min-height: 32px;
+        height: 32px;
         margin-top: 8px;
         display: flex;
         flex-direction: row;
-        flex-wrap: wrap;
         gap: 2px;
     }
 </style>

src/lib/ui/post/ReplyContext.svelte

@@ -1,6 +1,8 @@
 <script>
     import { parseText as parseEmojis, parseOne as parseEmoji } from '../../emoji.js';
     import { shorthand as short_time } from '../../time.js';
+    import { get } from 'svelte/store';
+    import { Client } from '../../client/client.js';
     import * as api from '../../client/api.js';
     import { goto } from '$app/navigation';
 
@@ -16,30 +18,22 @@
 
     let mouse_pos = { top: 0, left: 0 };
 
-    function gotoPost(event) {
+    function gotoPost() {
-        if (event) {
+        if (event && event.key && event.key !== "Enter") return;
-
+        console.log(`/post/${post.id}`);
-            if (event.type == "mouseup" && (
-                event.button !== 0 ||
-                event.shiftKey ||
-                event.ctrlKey)) return;
-            if (event.key && event.key !== "Enter") return;
-        }
         goto(`/post/${post.id}`);
     }
 </script>
 
 {#if post.reply}
-    {#await post.reply then reply}
+    <svelte:self post={post.reply} />
-        <svelte:self post={reply} />
-    {/await}
 {/if}
 
 <article
         class="post-reply"
         aria-label={aria_label}
-        on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY}}
+        on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY; console.log(mouse_pos)}}
-        on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost(e)}}
+        on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost()}}
         on:keydown={gotoPost}>
     <div class="line"></div>
         
@@ -49,9 +43,7 @@
         <Body post={post} />
 
         <footer class="post-footer">
-            {#if post.reactions}
             <ReactionBar post={post} />
-            {/if}
             <ActionBar post={post} />
         </footer>
     </div>

src/lib/user/user.js

@@ -1,4 +1,4 @@
-import { client } from '../client/client.js';
+import { Client } from '../client/client.js';
 import { parseText as parseEmojis } from '../emoji.js';
 import { get } from 'svelte/store';
 
@@ -17,7 +17,7 @@ export default class User {
 
     get mention() {
         let res = "@" + this.username;
-        if (this.host != get(client).instance.host)
+        if (this.host != get(Client.get()).instance.host)
             res += "@" + this.host;
         return res;
     }

src/routes/+layout.svelte

@@ -2,38 +2,10 @@
     import '$lib/app.css';
     import Navigation from '$lib/ui/Navigation.svelte';
     import Widgets from '$lib/ui/Widgets.svelte';
-    import { client, Client } from '$lib/client/client.js';
+    import { Client } from '$lib/client/client.js';
-    import { user, getUser } from '$lib/stores/user.js';
     import { get } from 'svelte/store';
-    import { logged_in } from '$lib/stores/user.js';
-    import { unread_notif_count, last_read_notif_id } from '$lib/notifications.js';
 
-    let ready = new Promise(resolve => {
+    let client = get(Client.get());
-        if (get(client)) {
-            if (get(user)) logged_in.set(true);
-            return resolve();
-        }
-        let new_client = new Client();
-        new_client.load();
-        client.set(new_client);
-
-        return getUser().then(new_user => {
-            if (!new_user) return resolve();
-
-            logged_in.set(true);
-            user.set(new_user);
-
-            // spin up async task to fetch notifications
-            get(client).getNotifications(
-                get(last_read_notif_id)
-            ).then(notif_data => {
-                if (!notif_data) return;
-                unread_notif_count.set(notif_data.length);
-            });
-
-            return resolve();
-        });
-    });
 </script>
 
 <div id="app">
@@ -43,7 +15,7 @@
     </header>
 
     <main>
-        {#await ready}
+        {#await client.verifyCredentials()}
             <div class="loading throb">
                 <span>just a moment...</span>
             </div>
@@ -57,15 +29,3 @@
     </div>
 
 </div>
-
-<style>
-    .loading {
-        width: 100%;
-        height: 100vh;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 2em;
-        font-weight: bold;
-    }
-</style>

src/routes/+page.js

@@ -1,2 +1,15 @@
+import Feed from '$lib/ui/Feed.svelte';
+import { Client } from '$lib/client/client.js';
+import Button from '$lib/ui/Button.svelte';
+import { get } from 'svelte/store';
+
 export const prerender = true;
 export const ssr = false;
+
+export async function load() {
+    let client = get(Client.get());
+    await client.verifyCredentials();
+    return { 
+        client: client
+    };
+}

src/routes/+page.svelte

@@ -1,32 +1,92 @@
 <script>
-    import { page } from '$app/stores';
+    import Logo from '$lib/../img/campfire-logo.svg';
-    import { get } from 'svelte/store';
-    import { logged_in } from '$lib/stores/user.js';
-    import { timeline, getTimeline } from '$lib/timeline.js';
-
-    import LoginForm from '$lib/ui/LoginForm.svelte';
     import Feed from '$lib/ui/Feed.svelte';
+    import { Client } from '$lib/client/client.js';
     import User from '$lib/user/user.js';
     import Button from '$lib/ui/Button.svelte';
+    import { get } from 'svelte/store';
 
-    logged_in.subscribe(logged_in => {
+    export let data;
-        if (logged_in) getTimeline();
+
-    });
+    let client = data.client;
-    document.addEventListener("scroll", event => {
+    let logged_in = client.user && client.user.constructor === User;
-        if (get(logged_in) && get(page).url.pathname !== "/") return;
+    let instance_url_error = false;
-        if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 2048) {
+    let logging_in = false;
-            getTimeline();
+
+    function log_in(event) {
+        event.preventDefault();
+        instance_url_error = false;
+
+        logging_in = true;
+        const host = event.target.host.value;
+
+        if (!host || host === "") {
+            instance_url_error = "Please enter an instance domain.";
+            logging_in = false;
+            return;
         }
+
+        client.init(host).then(res => {
+            logging_in = false;
+            if (!res) return;
+            if (res.constructor === String) {
+                instance_url_error = res;
+                return;
+            };
+            let oauth_url = client.getOAuthUrl();
+            location = oauth_url;
         });
+    }
 </script>
 
-{#if $logged_in}
+{#if logged_in}
-    <Feed posts={$timeline} />
+    <header>
+        <h1>Home</h1>
+        <nav>
+            <Button centered active>Home</Button>
+            <Button centered disabled>Local</Button>
+            <Button centered disabled>Federated</Button>
+        </nav>
+    </header>
+
+    <Feed />
 {:else}
-    <LoginForm />
+    <form on:submit={log_in} id="login-form">
+        <div class="app-logo">
+            <Logo />
+        </div>
+        <p>Welcome, fediverse user!</p>
+        <p>Please enter your instance domain to log in.</p>
+        <div class="input-wrapper">
+            <input type="text" id="host" aria-label="instance domain" class={logging_in ? "throb" : ""}>
+                         {#if instance_url_error}
+                             <p class="error">{instance_url_error}</p>
+                         {/if}
+        </div>
+        <br>
+        <button type="submit" id="login" class={logging_in ? "disabled" : ""}>Log in</button>
+        <p><small>
+                              Please note this is
+                              <strong><em>extremely experimental software</em></strong>;
+                              things are likely to break!
+                              <br>
+                              If that's all cool with you, welcome aboard!
+        </small></p>
+
+        <p class="form-footer">made with ❤ by <a href="https://bliss.town">bliss town</a>, 2024</p>
+    </form>
 {/if}
 
 <style>
+    form#login-form {
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        text-align: center;
+    }
+
     a {
         color: var(--accent);
         text-decoration: none;
@@ -36,6 +96,106 @@
         text-decoration: underline;
     }
 
+    .input-wrapper {
+        width: 360px;
+        margin: 0 auto;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+
+    input[type=text] {
+        width: 100%;
+        padding: 12px;
+        display: block;
+        border-radius: 8px;
+        border: 1px solid var(--accent);
+        background-color: var(--bg-800);
+
+        font-family: inherit;
+        font-weight: bold;
+        font-size: inherit;
+        color: var(--text);
+
+        transition: box-shadow .2s;
+    }
+
+    input[type=text]::placeholder {
+        opacity: .8;
+    }
+
+    input[type=text]:focus {
+        outline: none;
+        box-shadow: 0 0 16px color-mix(in srgb, transparent, var(--accent) 25%);
+    }
+
+    .error {
+        margin: 6px;
+        font-style: italic;
+        font-size: .9em;
+        color: red;
+        opacity: .7;
+    }
+
+    button#login {
+        margin: 8px auto;
+        padding: 12px 24px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+
+        font-family: inherit;
+        font-size: 1rem;
+        font-weight: 600;
+        text-align: left;
+
+        border-radius: 8px;
+        border-width: 2px;
+        border-style: solid;
+
+        background-color: var(--bg-700);
+        color: var(--text);
+        border-color: transparent;
+
+        transition-property: border-color, background-color, color;
+        transition-timing-function: ease-out;
+        transition-duration: .1s;
+
+        cursor: pointer;
+        text-align: center;
+        justify-content: center;
+    }
+
+    button#login:hover {
+        background-color: color-mix(in srgb, var(--bg-700), var(--accent) 10%);
+        border-color: color-mix(in srgb, var(--bg-700), var(--accent) 20%);
+    }
+
+    button#login:active {
+        background-color: color-mix(in srgb, var(--bg-700), var(--bg-800) 50%);
+        border-color: color-mix(in srgb, var(--bg-700), var(--bg-800) 10%);
+    }
+
+    button#login.disabled {
+        opacity: .5;
+        cursor: initial;
+    }
+
+    .form-footer {
+        opacity: .7;
+    }
+
+    .loading {
+        width: 100%;
+        height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 2em;
+        font-weight: bold;
+    }
+
     header {
         width: 100%;
         margin: 16px 0 8px 0;

src/routes/callback/+page.js

@@ -1,5 +1,20 @@
-export async function load({ url }) {
+import { Client } from '$lib/client/client.js';
-    return {
+import { goto } from '$app/navigation';
-        code: url.searchParams.get("code") || false
+import { error } from '@sveltejs/kit';
-    };
+import { get } from 'svelte/store';
+
+export const ssr = false;
+
+export async function load({ params, url }) {
+    const client = get(Client.get());
+    let auth_code = url.searchParams.get("code");
+    if (auth_code) {
+        client.getToken(auth_code).then(() => {
+            client.save();
+            goto("/");
+        });
+    }
+    error(400, {
+        message: "Bad request"
+    });
 }

src/routes/callback/+page.svelte

@@ -1,45 +0,0 @@
-<script>
-    import { client } from '$lib/client/client.js';
-    import { goto } from '$app/navigation';
-    import { error } from '@sveltejs/kit';
-    import { get } from 'svelte/store';
-    import { last_read_notif_id } from '$lib/notifications.js';
-    import { logged_in, user, getUser } from '$lib/stores/user.js';
-
-    export let data;
-
-    let auth_code = data.code;
-
-    if (!auth_code) {
-        error(400, { message: "Bad request" });
-    } else {
-        get(client).getToken(auth_code).then(token => {
-            if (!token) {
-                error(400, { message: "Invalid auth code provided" });
-                return;
-            }
-
-            client.update(c => {
-                c.app.token = token;
-                c.save();
-                return c;
-            });
-
-            getUser().then(new_user => {
-                if (!new_user) return;
-
-                logged_in.set(true);
-                user.set(new_user);
-
-                return get(client).getNotifications(
-                    get(last_read_notif_id)
-                ).then(notif_data => {
-                    if (notif_data.constructor === Array && notif_data.length > 0)
-                        last_read_notif_id.set(notif_data[0].id);
-                    get(client).save();
-                    goto("/");
-                });
-            });
-        });
-    }
-</script>

src/routes/notifications/+page.svelte

@@ -1,59 +0,0 @@
-<script>
-    import { notifications, getNotifications } from '$lib/notifications.js';
-    import { logged_in } from '$lib/stores/user.js';
-    import { goto } from '$app/navigation';
-    import { get } from 'svelte/store';
-    import Notification from '$lib/ui/Notification.svelte';
-
-    if (!get(logged_in)) goto("/");
-
-    getNotifications();
-    /*
-    document.addEventListener("scroll", event => {
-        if (get(logged_in) && get(page).url.pathname !== "/") return;
-        if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 2048) {
-            getNotifications();
-        }
-    });
-    */
-</script>
-
-<header>
-    <h1>Notifications</h1>
-</header>
-
-<div class="notifications">
-    {#if $notifications.length === 0}
-        <div class="loading throb">
-            <span>fetching notifications...</span>
-        </div>
-    {:else}
-        {#each $notifications as notif}
-            <Notification data={notif} />
-        {/each}
-    {/if}
-</div>
-
-<style>
-    header {
-        width: 100%;
-        height: 64px;
-        margin: 16px 0 8px 0;
-        display: flex;
-        flex-direction: row;
-    }
-
-    h1 {
-        font-size: 1.5em;
-    }
-
-    .loading {
-        width: 100%;
-        height: 80vh;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 2em;
-        font-weight: bold;
-    }
-</style>

src/routes/post/[id]/+page.js

@@ -1,5 +1,39 @@
+import Post from '$lib/ui/post/Post.svelte';
+import { Client } from '$lib/client/client.js';
+import { parsePost } from '$lib/client/api.js';
+import { get } from 'svelte/store';
+import { goto } from '$app/navigation';
+
+export const ssr = false;
+
 export async function load({ params }) {
+    let client = get(Client.get());
+
+    if (!client.instance || !client.user) {
+        goto("/");
+    }
+
+    const post_id = params.id;
+
+    const post_data = await client.getPost(post_id);
+    if (!post_data) {
+        console.error(`Failed to retrieve post ${post_id}.`);
+        return null;
+    }
+
+    const post = await parsePost(post_data, 10, true);
+    let posts = [post];
+    for (let i in post.replies) {
+        const reply = post.replies[i];
+        // if (i > 1 && reply.reply_id === post.replies[i - 1].id) {
+        //     let reply_head = posts.pop();
+        //     reply.reply = reply_head;
+        // }
+        posts.push(reply);
+        // console.log(reply);
+    }
+
     return {
-        post_id: params.id
+        posts: posts
     };
 }

src/routes/post/[id]/+page.svelte

@@ -1,117 +1,52 @@
 <script>
-    import { client } from '$lib/client/client.js';
+    import '$lib/app.css';
-    import * as api from '$lib/client/api.js';
-    import { get } from 'svelte/store';
-    import { goto, afterNavigate } from '$app/navigation';
-    import { base } from '$app/paths'
-
     import Post from '$lib/ui/post/Post.svelte';
     import Button from '$lib/ui/Button.svelte';
 
     export let data;
-    let error = false;
+    $: main_post = data.posts[0];
-
+    $: replies = data.posts.slice(1);
-    if (!get(client).instance || !get(client).user) {
-        goto("/");
-    }
-
-    let previous_page = base;
-
-    afterNavigate(({from}) => {
-        previous_page = from?.url.pathname || previous_page
-    })
-
-    $: post = (async resolve => {
-        const post_data = await get(client).getPost(data.post_id, 0, false);
-        if (!post_data) {
-            error = `Failed to retrieve post <code>${data.post_id}</code>.`;
-            console.error(`Failed to retrieve post ${data.post_id}.`);
-            return;
-        }
-        let post = await api.parsePost(post_data, 0, false);
-
-        const post_context = await get(client).getPostContext(data.post_id);
-
-        if (!post_context || !post_context.ancestors || !post_context.descendants)
-            return post;
-
-        // handle ancestors (above post)
-        let thread_top = post;
-        while (post_context.ancestors.length > 0) {
-            thread_top.reply = await api.parsePost(post_context.ancestors.pop(), 0, false);
-            thread_top = thread_top.reply;
-        }
-
-        // handle descendants (below post)
-        post.replies = [];
-        for (let i in post_context.descendants) {
-            post.replies.push(
-                api.parsePost(post_context.descendants[i], 0, false)
-            );
-        }
-
-        return post;
-    })();
 </script>
 
-{#if !error}
 <header>
-    {#await post then post}
+    <h1>Home</h1>
     <nav>
-            <Button centered on:click={() => {goto(previous_page)}}>Back</Button>
+        <Button centered active>Home</Button>
+        <Button centered disabled>Local</Button>
+        <Button centered disabled>Federated</Button>
     </nav>
-        <img src={post.user.avatar_url} type={post.user.avatar_type} alt="" width="40" height="40" class="header-avatar" loading="lazy" decoding="async">
-        <h1>
-            Post by {@html post.user.rich_name}
-        </h1>
-    {/await}
 </header>
 
 <div id="feed" role="feed">
-    {#await post}
+    {#if data.posts.length <= 0}
-        <div class="loading throb">
+        <div class="throb">
-            <span>loading post...</span>
+            <span>just a moment...</span>
         </div>
-    {:then post}
+    {:else}
-        <Post post_data={post} focused />
+        {#key data}
+        <Post post_data={main_post} focused />
         <br>
-        {#each post.replies as reply}
+        {#each replies as post}
-            {#await reply then reply}
+            <Post post_data={post} />
-                <Post post_data={reply} />
-            {/await}
         {/each}
-    {/await}
+        {/key}
+    {/if}
 </div>
-{:else}
-    <p>{@html error}</p>
-{/if}
 
 <style>
     header {
         width: 100%;
-        height: 64px;
         margin: 16px 0 8px 0;
         display: flex;
         flex-direction: row;
     }
 
-    header .header-avatar {
-        width: 40px;
-        height: 40px;
-        margin: auto 0;
-        border-radius: 4px;
-    }
-
     header h1 {
-        margin: auto auto auto 8px;
         font-size: 1.5em;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
     }
 
     header nav {
-        margin-right: 8px;
+        margin-left: auto;
         display: flex;
         flex-direction: row;
         gap: 8px;
@@ -121,7 +56,7 @@
         margin-bottom: 20vh;
     }
 
-    .loading {
+    .throb {
         width: 100%;
         height: 80vh;
         display: flex;