diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 663aade7..87c4f399 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -48,7 +48,8 @@
"setTheme": "Set theme",
"setThemeTo": "Set theme to {{default}}",
"contextual": "On this page"
- }
+ },
+ "notifications": "Notifications"
},
"account": {
"login": "Log In",
@@ -331,7 +332,8 @@
"unresolve": "Unresolve",
"resolvedBy": "Resolved by",
"markAll": "Mark page resolved",
- "markAllComplete": "Batch action completed."
+ "markAllComplete": "Batch action completed.",
+ "reports": "Reports"
},
"admin": {
"title": "Administration",
diff --git a/src/lib/lemmy/postfeed.svelte.ts b/src/lib/lemmy/postfeed.svelte.ts
index a3109e84..dc53180e 100644
--- a/src/lib/lemmy/postfeed.svelte.ts
+++ b/src/lib/lemmy/postfeed.svelte.ts
@@ -54,16 +54,16 @@ export async function postFeed(args: {
},
}
- return (
- postFeeds.value[args.id]?.data ?? {
- ...args.request,
- posts: posts,
- cursor: {
- next: posts.next_page,
- },
- type_: args.request.type_,
- }
- )
+ const defaultFeed = $state({
+ ...args.request,
+ posts: posts,
+ cursor: {
+ next: posts.next_page,
+ },
+ type_: args.request.type_,
+ })
+
+ return postFeeds.value[args.id]?.data ?? defaultFeed
}
export function getPostFeed(feeds: Map
, id: PostFeedID) {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 510fc564..65a3f188 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -15,8 +15,8 @@
let { data = $bindable() } = $props()
- let type = $state(data.feed.value.type_)
- let sort = $state(data.feed.value.sort)
+ let type = $state(data.feed.type_)
+ let sort = $state(data.feed.sort)
$effect(() => {
if (type) settings.defaultSort.feed = type
@@ -62,8 +62,8 @@
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
back={false}
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index c326a0d2..9c3a3c80 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -14,20 +14,18 @@ export async function load({ url, fetch }) {
(url.searchParams.get('type') as ListingType) || settings.defaultSort.feed
return {
- feed: new ReactiveState(
- await postFeed({
- id: 'main',
- request: {
- page_cursor: cursor,
- sort: sort,
- type_: listingType,
- limit: 20,
- show_hidden: settings.posts.showHidden,
- },
- url: url,
- fetch: fetch,
- }),
- ),
+ feed: await postFeed({
+ id: 'main',
+ request: {
+ page_cursor: cursor,
+ sort: sort,
+ type_: listingType,
+ limit: 20,
+ show_hidden: settings.posts.showHidden,
+ },
+ url: url,
+ fetch: fetch,
+ }),
contextual: {
actions: [
{
diff --git a/src/routes/profile/user/+page.ts b/src/routes/profile/user/+page.ts
index e7d12e46..729a287c 100644
--- a/src/routes/profile/user/+page.ts
+++ b/src/routes/profile/user/+page.ts
@@ -4,8 +4,8 @@ import type { SortType } from 'lemmy-js-client'
export async function load({ url, fetch, parent }) {
const page = Number(url.searchParams.get('page')) || 1
- const type: 'comments' | 'posts' =
- (url.searchParams.get('type') as 'comments' | 'posts') || 'posts'
+ const type: 'comments' | 'posts' | 'all' =
+ (url.searchParams.get('type') as 'comments' | 'posts' | 'all') || 'all'
const sort: SortType = (url.searchParams.get('sort') as SortType) || 'New'
const { my_user } = await parent()