From 6aa6462bf9ca2370ce73fdc5316f5c39bdc6dc9d Mon Sep 17 00:00:00 2001 From: Tim Disney Date: Mon, 23 Feb 2026 17:15:25 -0800 Subject: [PATCH] clean up feeds view --- src/lib/components/NavigationDropdown.svelte | 8 +------- src/lib/components/Sidebar.svelte | 7 ++----- src/lib/stores/feedView.svelte.ts | 4 ++-- src/routes/+layout.svelte | 4 ++-- src/routes/+page.svelte | 11 +++-------- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/lib/components/NavigationDropdown.svelte b/src/lib/components/NavigationDropdown.svelte index fc315b8..28b6a32 100644 --- a/src/lib/components/NavigationDropdown.svelte +++ b/src/lib/components/NavigationDropdown.svelte @@ -149,7 +149,7 @@ section: 'Feeds', icon: 'rss', onSectionClick: () => { - goto('/?feeds=true'); + sidebarStore.toggleSection('feeds'); close(); }, items: filteredFeeds, @@ -177,13 +177,11 @@ const feed = url.searchParams.get('feed'); const saved = url.searchParams.get('saved'); const shared = url.searchParams.get('shared'); - const feeds = url.searchParams.get('feeds'); const view = url.searchParams.get('view'); if (view) return { type: 'icon', name: 'filter' }; if (saved) return { type: 'icon', name: 'bookmark' }; if (shared) return { type: 'icon', name: 'share' }; - if (feeds) return { type: 'icon', name: 'rss' }; if (feed) { const sub = subscriptions.find((s) => s.id === parseInt(feed)); @@ -209,13 +207,11 @@ const feed = url.searchParams.get('feed'); const saved = url.searchParams.get('saved'); const shared = url.searchParams.get('shared'); - const feeds = url.searchParams.get('feeds'); const view = url.searchParams.get('view'); if (view) return { type: 'filteredView', id: parseInt(view) }; if (feed) return { type: 'feed', id: parseInt(feed) }; if (saved) return { type: 'saved' }; if (shared) return { type: 'shared' }; - if (feeds) return { type: 'feeds' }; return { type: 'all' }; }); @@ -225,7 +221,6 @@ if (item.id === 'all' && filter.type === 'all') return true; if (item.id === 'saved' && filter.type === 'saved') return true; if (item.id === 'shared' && filter.type === 'shared') return true; - if (item.id === 'feeds' && filter.type === 'feeds') return true; } if (item.type === 'feed' && filter.type === 'feed' && filter.id === item.id) return true; if (item.type === 'filteredView' && filter.type === 'filteredView' && filter.id === item.id) @@ -292,7 +287,6 @@ if (item.type === 'view') { if (item.id === 'saved') url = '/?saved=true'; else if (item.id === 'shared') url = '/?shared=true'; - else if (item.id === 'feeds') url = '/?feeds=true'; } else if (item.type === 'feed') { url = `/?feed=${item.id}`; } else if (item.type === 'filteredView') { diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte index 0f78691..ab298ae 100644 --- a/src/lib/components/Sidebar.svelte +++ b/src/lib/components/Sidebar.svelte @@ -148,12 +148,10 @@ const feed = $page.url.searchParams.get('feed'); const starred = $page.url.searchParams.get('saved'); const shared = $page.url.searchParams.get('shared'); - const feeds = $page.url.searchParams.get('feeds'); if (view) return { type: 'view' as const, id: parseInt(view) }; if (feed) return { type: 'feed' as const, id: parseInt(feed) }; if (starred) return { type: 'saved' as const }; if (shared) return { type: 'shared' as const }; - if (feeds) return { type: 'feeds' as const }; return { type: 'all' as const }; }); @@ -234,7 +232,6 @@ else if (type === 'feed' && id) params.set('feed', String(id)); else if (type === 'saved') params.set('saved', 'true'); else if (type === 'shared') params.set('shared', 'true'); - else if (type === 'feeds') params.set('feeds', 'true'); const query = params.toString(); goto(query ? `/?${query}` : '/'); @@ -393,9 +390,9 @@ icon="rss" isExpanded={sidebarStore.expandedSections.feeds} showOnlyUnread={sidebarStore.showOnlyUnread.feeds} - isActive={currentFilter().type === 'feeds'} + isActive={false} onToggle={() => sidebarStore.toggleSection('feeds')} - onLabelClick={() => selectFilter('feeds')} + onLabelClick={() => sidebarStore.toggleSection('feeds')} onUnreadToggle={() => sidebarStore.toggleShowOnlyUnread('feeds')} onAdd={() => sidebarStore.openAddFeedModal()} > diff --git a/src/lib/stores/feedView.svelte.ts b/src/lib/stores/feedView.svelte.ts index e72a164..c2fb3d7 100644 --- a/src/lib/stores/feedView.svelte.ts +++ b/src/lib/stores/feedView.svelte.ts @@ -139,7 +139,7 @@ function createFeedViewStore() { let sharedFilter = $state(null); let sharerFilter = $state(null); let followingFilter = $state(null); - let feedsFilter = $state(null); + let feedsFilter = $state(null); // deprecated, kept for setFilters compat let contentTypeFilter = $state<'shares' | 'documents' | null>(null); let viewFilter = $state(null); @@ -227,7 +227,7 @@ function createFeedViewStore() { } return 'articles'; } - if (savedFilter || feedsFilter) return 'articles'; + if (savedFilter) return 'articles'; return 'combined'; }); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e4f9b3c..36ca718 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -78,9 +78,9 @@ keyboardStore.register({ key: '4', - description: 'Feeds', + description: 'Toggle Feeds section', category: 'Views', - action: () => goto('/?feeds=true'), + action: () => sidebarStore.toggleSection('feeds'), condition: () => auth.isAuthenticated, }); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e477244..a2433f3 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -54,7 +54,7 @@ shared: url.searchParams.get('shared'), sharer: url.searchParams.get('sharer'), following: url.searchParams.get('following'), - feeds: url.searchParams.get('feeds'), + feeds: null, contentType, view: url.searchParams.get('view'), }; @@ -130,7 +130,6 @@ } return baseName; } - if (feedViewStore.feedsFilter) return 'Feeds'; return 'All'; }); @@ -139,7 +138,7 @@ if (feedViewStore.feedFilter) { return unreadCounts.feedCounts.get(parseInt(feedViewStore.feedFilter)) || 0; } - if (feedViewStore.savedFilter || feedViewStore.sharedFilter || feedViewStore.feedsFilter) { + if (feedViewStore.savedFilter || feedViewStore.sharedFilter) { return 0; } if (feedViewStore.sharerFilter) { @@ -391,7 +390,6 @@ feedViewStore.sharedFilter, feedViewStore.sharerFilter, feedViewStore.followingFilter, - feedViewStore.feedsFilter, feedViewStore.contentTypeFilter, feedViewStore.viewFilter, ]; @@ -433,8 +431,7 @@ !feedViewStore.savedFilter && !feedViewStore.sharedFilter && !feedViewStore.sharerFilter && - !feedViewStore.followingFilter && - !feedViewStore.feedsFilter} + !feedViewStore.followingFilter} /> {#if (appManager.isHydrating || appManager.isRefreshing) && feedViewStore.currentItems.length === 0} @@ -477,8 +474,6 @@ {:else} {/if} - {:else if feedViewStore.feedsFilter} - {:else if feedViewStore.showOnlyUnread} {:else}