src/lib/api.js

@@ -2,31 +2,6 @@ const errors = {
     AUTHENTICATION_FAILED: "AUTHENTICATION_FAILED",
 };
 
-/**
- * Parses a HTTP Link header
- * @param {string} header - the HTTP Link header string
- */
-function _parseLinkHeader(header) {
-    // remove whitespace and split
-    let links = header.replace(/\ /g, "").split(",");
-
-    return links.map(l => {
-        let parts = l.split(";");
-
-        // assuming 0th is URL, removing <>
-        let url = new URL(parts[0].slice(1, -1));
-
-        // get rel inbetween double-quotes
-        let rel = parts[1].match(/"(.*?)"/g)[0].slice(1, -1);
-
-        return {
-            url, rel
-        }
-    })
-}
-
-_parseLinkHeader(`<https://wetdry.world/api/v1/timelines/home?max_id=114857293229157171>; rel="next", <https://wetdry.world/api/v1/timelines/home?min_id=114857736990577458>; rel="prev"`)
-
 /**
  * GET /api/v1/instance
  * @param {string} host - The domain of the target server.
@@ -267,59 +242,21 @@ export async function rejectFollowRequest(host, token, account_id) {
  * @param {string} token - The application token.
  * @param {string} timeline - The name of the timeline to pull (default "home").
  * @param {string} max_id - If provided, only shows posts after this ID.
- * @param {boolean} local_only - If provided, only shows posts from the local instance
- * @param {boolean} remote_only - If provided, only shows posts from other instances
  */
-export async function getTimeline(host, token, timeline, max_id, local_only, remote_only) {
+export async function getTimeline(host, token, timeline, max_id) {
     let url = `https://${host}/api/v1/timelines/${timeline || "home"}`;
 
     let params = new URLSearchParams();
     if (max_id) params.append("max_id", max_id);
-    if (remote_only) params.append("remote", remote_only);
-    if (local_only) params.append("local", local_only);
     const params_string = params.toString();
     if (params_string) url += '?' + params_string;
     
     const data = await fetch(url, {
         method: 'GET',
         headers: { "Authorization": token ? `Bearer ${token}` : null }
-    })
+    }).then(res => res.json());
 
-    let links = _parseLinkHeader(data.headers.get("Link"));
+    return data;
-
-    return {
-        data: await data.json(),
-        prev: links.find(f=>f.rel=="prev"),
-        next: links.find(f=>f.rel=="next")
-    };
-}
-
-/**
- * GET /api/v1/favourites
- * @param {string} host - The domain of the target server.
- * @param {string} token - The application token.
- * @param {string} max_id - If provided, only shows posts after this ID.
- */
-export async function getFavourites(host, token, max_id) {
-    let url = `https://${host}/api/v1/favourites`;
-
-    let params = new URLSearchParams();
-    if (max_id) params.append("max_id", max_id);
-    const params_string = params.toString();
-    if (params_string) url += '?' + params_string;
-    
-    const data = await fetch(url, {
-        method: 'GET',
-        headers: { "Authorization": token ? `Bearer ${token}` : null }
-    })
-
-    let links = _parseLinkHeader(data.headers.get("Link"));
-
-    return {
-        data: await data.json(),
-        prev: links.find(f=>f.rel=="prev"),
-        next: links.find(f=>f.rel=="next")
-    };
 }
 
 /**
@@ -618,4 +555,4 @@ export async function getUserPinnedPosts(host, token, user_id) {
     }).then(res => res.json());
 
     return data;
-}
+}

src/lib/timeline.js

@@ -10,38 +10,21 @@ export const timeline = writable([]);
 const lang = Lang();
 
 let loading = false;
-let last_post = false;
 
-export async function getTimeline(timelineType = "home", clean, localOnly = false, remoteOnly = false) {
+export async function getTimeline(clean) {
     if (loading) return; // no spamming!!
     loading = true;
 
-    if(clean) {
+    let last_post = false;
-        timeline.set([]);
+    if (!clean && get(timeline).length > 0)
-        last_post = false;
+        last_post = get(timeline)[get(timeline).length - 1].id;
-    }
 
-    let timeline_data;
+    const timeline_data = await api.getTimeline(
-    switch(timelineType) {
+        get(server).host,
-        case "favourites":
+        get(app).token,
-            timeline_data = await api.getFavourites(
+        "home",
-                get(server).host,
+        last_post
-                get(app).token,
+    );
-                last_post
-            )
-            break;
-            
-        default:
-            timeline_data = await api.getTimeline(
-                get(server).host,
-                get(app).token,
-                timelineType,
-                last_post,
-                localOnly,
-                remoteOnly
-            );
-            break;
-    }
 
     if (!timeline_data) {
         console.error(lang.string('logs.timeline_fetch_failed'));
@@ -49,12 +32,10 @@ export async function getTimeline(timelineType = "home", clean, localOnly = fals
         return;
     }
 
-    if (!clean) {
+    if (clean) timeline.set([]);
-        last_post = timeline_data.next.url.searchParams.get("max_id")
-    } 
 
-    for (let i in timeline_data.data) {
+    for (let i in timeline_data) {
-        const post_data = timeline_data.data[i];
+        const post_data = timeline_data[i];
         const post = await parsePost(post_data, 1);
         if (!post) {
             if (post === null || post === undefined) {

src/lib/ui/Navigation.svelte

@@ -14,18 +14,18 @@
     import Logo from '$lib/../img/campfire-logo.svg';
     import Button from './Button.svelte';
 
-    import TimelineIcon from '@cf/icons/timeline.svg';
+    import TimelineIcon from '../../img/icons/timeline.svg';
-    import NotificationsIcon from '@cf/icons/notifications.svg';
+    import NotificationsIcon from '../../img/icons/notifications.svg';
-    import ExploreIcon from '@cf/icons/explore.svg';
+    import ExploreIcon from '../../img/icons/explore.svg';
-    import ListIcon from '@cf/icons/lists.svg';
+    import ListIcon from '../../img/icons/lists.svg';
-    import FavouritesIcon from '@cf/icons/like_fill.svg';
+    import FavouritesIcon from '../../img/icons/like_fill.svg';
-    import BookmarkIcon from '@cf/icons/bookmark.svg';
+    import BookmarkIcon from '../../img/icons/bookmark.svg';
-    import HashtagIcon from '@cf/icons/hashtag.svg';
+    import HashtagIcon from '../../img/icons/hashtag.svg';
-    import PostIcon from '@cf/icons/post.svg';
+    import PostIcon from '../../img/icons/post.svg';
-    import InfoIcon from '@cf/icons/info.svg';
+    import InfoIcon from '../../img/icons/info.svg';
-    import SettingsIcon from '@cf/icons/settings.svg';
+    import SettingsIcon from '../../img/icons/settings.svg';
-    import LogoutIcon from '@cf/icons/logout.svg';
+    import LogoutIcon from '../../img/icons/logout.svg';
-    import FollowersIcon from '@cf/icons/followers.svg';
+    import FollowersIcon from '../../img/icons/followers.svg';
 
     const VERSION = APP_VERSION;
     const lang = Lang();
@@ -124,10 +124,7 @@
         </Button>
 
         <div class="flex-row">
-            <Button centered 
+            <Button centered label="{lang.string('navigation.favourites')}" disabled>
-            label="{lang.string('navigation.favourites')}" 
-            href="/favourites"}
-            active={$page.url.pathname === "/favourites"}>
                 <svelte:fragment slot="icon">
                     <FavouritesIcon/>
                 </svelte:fragment>

src/lib/ui/Notification.svelte

@@ -2,10 +2,10 @@
     import { server } from '$lib/client/server';
     import { goto } from '$app/navigation';
 
-    import ReplyIcon from '@cf/icons/reply.svg';
+    import ReplyIcon from '$lib/../img/icons/reply.svg';
-    import RepostIcon from '@cf/icons/repost.svg';
+    import RepostIcon from '$lib/../img/icons/repost.svg';
-    import FavouriteIcon from '@cf/icons/like.svg';
+    import FavouriteIcon from '$lib/../img/icons/like.svg';
-    import ReactIcon from '@cf/icons/react.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';

src/lib/ui/post/ActionBar.svelte

@@ -10,13 +10,13 @@
 
     import ActionButton from './ActionButton.svelte';
 
-    import ReplyIcon from '@cf/icons/reply.svg';
+    import ReplyIcon from '../../../img/icons/reply.svg';
-    import RepostIcon from '@cf/icons/repost.svg';
+    import RepostIcon from '../../../img/icons/repost.svg';
-    import FavouriteIcon from '@cf/icons/like.svg';
+    import FavouriteIcon from '../../../img/icons/like.svg';
-    import FavouriteIconFill from '@cf/icons/like_fill.svg';
+    import FavouriteIconFill from '../../../img/icons/like_fill.svg';
-    import QuoteIcon from '@cf/icons/quote.svg';
+    import QuoteIcon from '../../../img/icons/quote.svg';
-    import MoreIcon from '@cf/icons/more.svg';
+    import MoreIcon from '../../../img/icons/more.svg';
-    import DeleteIcon from '@cf/icons/bin.svg';
+    import DeleteIcon from '../../../img/icons/bin.svg';
 
     export let post;
 

src/routes/+page.svelte

@@ -2,7 +2,6 @@
     import { page } from '$app/stores';
     import { account } from '$lib/stores/account.js';
     import { timeline, getTimeline } from '$lib/timeline.js';
-    import { app_name } from '$lib/config.js';
     import Lang from '$lib/lang';
 
     import LoginForm from '$lib/ui/LoginForm.svelte';
@@ -12,71 +11,23 @@
 
     const lang = Lang();
 
-    // TODO: refactor to enum when moving to TS
-    let timelineType = localStorage.getItem(app_name + '_selected_timeline') || "home";
-
-    $: {
-        // awful hack to update timeline fresh
-        // when timelineType is updated
-        //
-        // TODO: migrate to $effect when migrating to svelte 5
-        timelineType = timelineType
-
-        // set in localStorage
-        localStorage.setItem(app_name + '_selected_timeline', timelineType);
-     
-        // erase the timeline here so the ui reacts instantly
-        // mae: i could write an awesome undertale reference here
-        timeline.set([]);
-
-        getCurrentTimeline()
-    }
-
-    function getCurrentTimeline(clean = false) {
-        switch(timelineType) {
-            case "home":
-                getTimeline("home", clean);
-                break;
-
-            case "local":
-                getTimeline("public", clean, true)
-                break;
-
-            case "federated":
-                getTimeline("public", clean, false, true)
-                break;
-        }
-    }
-
     account.subscribe(account => {
-        if (account) getCurrentTimeline();
+        if (account) getTimeline();
     });
 
     document.addEventListener('scroll', () => {
         if ($account && $page.url.pathname !== "/") return;
         if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 2048) {
-            getCurrentTimeline();
+            getTimeline();
         }
     });
 </script>
 
 {#if $account}
-    <PageHeader title={lang.string(`timeline.${timelineType}`)}>
+    <PageHeader title={lang.string('timeline.home')}>
-        <Button centered 
+        <Button centered active>{lang.string('timeline.home')}</Button>
-        active={(timelineType == "home")} 
+        <Button centered disabled>{lang.string('timeline.local')}</Button>
-        on:click={() => timelineType = "home"}>
+        <Button centered disabled>{lang.string('timeline.federated')}</Button>
-            {lang.string('timeline.home')}
-        </Button>
-        <Button centered 
-        active={(timelineType == "local")} 
-        on:click={() => timelineType = "local"}>
-            {lang.string('timeline.local')}
-        </Button>
-                <Button centered 
-        active={(timelineType == "federated")} 
-        on:click={() => timelineType = "federated"}>
-            {lang.string('timeline.federated')}
-        </Button>
     </PageHeader>
 
     <div id="feed" role="feed">

src/routes/favourites/+page.svelte

@@ -1,36 +0,0 @@
-<script>
-    import { page } from '$app/stores';
-    import { account } from '@cf/store/account.js';
-    import { timeline, getTimeline } from '$lib/timeline.js';
-
-    import Button from '@cf/ui/Button.svelte';
-    import Post from '@cf/ui/post/Post.svelte';
-    import PageHeader from '@cf/ui/core/PageHeader.svelte';
-
-    import Lang from '$lib/lang';
-
-    const lang = Lang();
-    if (!$account) goto("/");
-
-    getTimeline("favourites", true);
-
-    document.addEventListener('scroll', () => {
-        if ($account && $page.url.pathname !== "/favourites") return;
-        if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 2048) {
-            getTimeline("favourites");
-        }
-    });
-</script>
-
-<PageHeader title={lang.string(`navigation.favourites`)}/>
-
-<div id="feed" role="feed">
-    {#if $timeline.length <= 0}
-        <div class="loading throb">
-            <span>{lang.string('timeline.fetching')}</span>
-        </div>
-    {/if}
-    {#each $timeline as post}
-        <Post post_data={post} />
-    {/each}
-</div>

src/routes/follow-requests/+page.svelte

@@ -7,8 +7,8 @@
     import Button from '../../lib/ui/Button.svelte';
     import * as api from '$lib/api'
 
-    import TickIcon from '@cf/icons/tick.svg'
+    import TickIcon from '../../img/icons/tick.svg'
-    import CrossIcon from '@cf/icons/cross.svg'
+    import CrossIcon from '../../img/icons/cross.svg'
     import { get } from 'svelte/store';
 
     const lang = Lang();