diff --git a/src/lib/auth.ts b/src/lib/auth.ts index a9f9652b..1569ea4c 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -288,9 +288,10 @@ async function userFromJwt( if (!site) return if (!versionIsSupported(site.version, MINIMUM_VERSION)) { - throw new Error( - `This version of Photon only supports Lemmy instances with version ${MINIMUM_VERSION} or higher. This Lemmy instance is running: ${site.version}` - ) + toast({ + content: `This version of Photon only supports Lemmy instances with version ${MINIMUM_VERSION} or higher. This Lemmy instance is running: ${site.version}`, + type: 'error', + }) } const myUser = site.my_user diff --git a/src/lib/lemmy/postfeed.ts b/src/lib/lemmy/postfeed.ts index cbe1c025..516c5959 100644 --- a/src/lib/lemmy/postfeed.ts +++ b/src/lib/lemmy/postfeed.ts @@ -1,13 +1,18 @@ -import { browser } from "$app/environment" -import { instance } from "$lib/instance" -import { client } from "$lib/lemmy" -import type { GetPosts, GetPostsResponse, ListingType, SortType } from "lemmy-js-client" -import { get, writable } from "svelte/store" +import { browser } from '$app/environment' +import { instance } from '$lib/instance' +import { client } from '$lib/lemmy' +import type { + GetPosts, + GetPostsResponse, + ListingType, + SortType, +} from 'lemmy-js-client' +import { get, writable } from 'svelte/store' export const shouldReload = ( cache: PostFeed | undefined, url: URL, - instance: string, + instance: string ): boolean => cache?.instance != instance || cache?.url.toString() != url.toString() @@ -18,27 +23,28 @@ interface FetchPostFeed extends GetPosts { export async function postFeed(args: { id: PostFeedID - request: FetchPostFeed, + request: FetchPostFeed url: URL + fetch?: ( + input: RequestInfo | URL, + init?: RequestInit | undefined + ) => Promise }) { const feed = get(postFeeds)[args.id] const posts = shouldReload(feed, args.url, get(instance)) - ? await client().getPosts(args.request) + ? await client({ func: fetch }).getPosts(args.request) : feed.data.posts - if ( - shouldReload(feed, args.url, get(instance)) && - browser - ) + if (shouldReload(feed, args.url, get(instance)) && browser) postFeeds.updateFeed(args.id, { data: { ...args.request, posts: posts, cursor: { - next: posts.next_page + next: posts.next_page, }, - type_: args.request.type_ + type_: args.request.type_, }, url: args.url, lastSeen: 0, @@ -54,35 +60,38 @@ export function getPostFeed(feeds: Map, id: PostFeedID) { function createPostFeedsStore() { // @ts-ignore - const { subscribe, update, set } = writable>({}); + const { subscribe, update, set } = writable>({}) return { subscribe, - addFeed: (id: PostFeedID, feed: PostFeed) => update(feeds => ({ ...feeds, [id]: feed })), - updateFeed: (id: PostFeedID, feed: Partial) => update(feeds => { - return { - ...feeds, - [id]: { ...feeds[id], ...feed } as PostFeed - }; - }), - removeFeed: (id: PostFeedID) => update(feeds => { - const { [id]: _, ...rest } = feeds; - return rest as Record; - }), + addFeed: (id: PostFeedID, feed: PostFeed) => + update((feeds) => ({ ...feeds, [id]: feed })), + updateFeed: (id: PostFeedID, feed: Partial) => + update((feeds) => { + return { + ...feeds, + [id]: { ...feeds[id], ...feed } as PostFeed, + } + }), + removeFeed: (id: PostFeedID) => + update((feeds) => { + const { [id]: _, ...rest } = feeds + return rest as Record + }), clearAll: () => set({} as Record), - set - }; + set, + } } -export type PostFeedID = 'main' | 'community' | 'profile' +export type PostFeedID = 'main' | 'community' | 'profile' | 'votes' export interface PostFeed { data: GetPosts & { - posts: GetPostsResponse, + posts: GetPostsResponse cursor: { next?: string - }, - sort: SortType, + } + sort: SortType } url: URL lastSeen: number @@ -90,4 +99,4 @@ export interface PostFeed { id: PostFeedID } -export let postFeeds = createPostFeedsStore() \ No newline at end of file +export let postFeeds = createPostFeedsStore() diff --git a/src/routes/profile/voted/[type]/+page.svelte b/src/routes/profile/voted/[type]/+page.svelte new file mode 100644 index 00000000..faef4cab --- /dev/null +++ b/src/routes/profile/voted/[type]/+page.svelte @@ -0,0 +1,20 @@ + + +
+ {data.upvoted ? $t('routes.profile.upvoted') : $t('routes.profile.downvoted')} +
+ + diff --git a/src/routes/profile/voted/[type]/+page.ts b/src/routes/profile/voted/[type]/+page.ts new file mode 100644 index 00000000..fa70a838 --- /dev/null +++ b/src/routes/profile/voted/[type]/+page.ts @@ -0,0 +1,24 @@ +import { client } from '$lib/lemmy.js' +import { postFeed } from '$lib/lemmy/postfeed.js' +import { error } from '@sveltejs/kit' + +export async function load({ url, params, fetch }) { + if (params.type.toLowerCase() != 'up' && params.type.toLowerCase() != 'down') + error(404) + + const upvoted = params.type.toLowerCase() == 'up' + + return { + feed: await postFeed({ + id: 'votes', + request: { + sort: 'New', + liked_only: upvoted || undefined, + disliked_only: !upvoted || undefined, + }, + url: url, + fetch: fetch, + }), + upvoted: upvoted, + } +}