Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/lib/components/NavigationDropdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
section: 'Feeds',
icon: 'rss',
onSectionClick: () => {
goto('/?feeds=true');
sidebarStore.toggleSection('feeds');
close();
},
items: filteredFeeds,
Expand Down Expand Up @@ -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));
Expand All @@ -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' };
});

Expand 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)
Expand Down Expand Up @@ -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') {
Expand Down
7 changes: 2 additions & 5 deletions src/lib/components/Sidebar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
});

Expand Down Expand Up @@ -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}` : '/');
Expand Down Expand Up @@ -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()}
>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/stores/feedView.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function createFeedViewStore() {
let sharedFilter = $state<string | null>(null);
let sharerFilter = $state<string | null>(null);
let followingFilter = $state<string | null>(null);
let feedsFilter = $state<string | null>(null);
let feedsFilter = $state<string | null>(null); // deprecated, kept for setFilters compat
let contentTypeFilter = $state<'shares' | 'documents' | null>(null);
let viewFilter = $state<string | null>(null);

Expand Down Expand Up @@ -227,7 +227,7 @@ function createFeedViewStore() {
}
return 'articles';
}
if (savedFilter || feedsFilter) return 'articles';
if (savedFilter) return 'articles';
return 'combined';
});

Expand Down
4 changes: 2 additions & 2 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});

Expand Down
11 changes: 3 additions & 8 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
};
Expand Down Expand Up @@ -130,7 +130,6 @@
}
return baseName;
}
if (feedViewStore.feedsFilter) return 'Feeds';
return 'All';
});

Expand 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) {
Expand Down Expand Up @@ -391,7 +390,6 @@
feedViewStore.sharedFilter,
feedViewStore.sharerFilter,
feedViewStore.followingFilter,
feedViewStore.feedsFilter,
feedViewStore.contentTypeFilter,
feedViewStore.viewFilter,
];
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -477,8 +474,6 @@
{:else}
<EmptyState title="No articles" description="This feed has no articles" />
{/if}
{:else if feedViewStore.feedsFilter}
<EmptyState title="No unread articles" description="You're all caught up on your feeds" />
{:else if feedViewStore.showOnlyUnread}
<EmptyState title="No unread articles" description="You're all caught up!" />
{:else}
Expand Down