diff --git a/package.json b/package.json index dd11f7cc..14682e6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.5.0", + "version": "0.5.1", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/lemmy/post/PostForm.svelte b/src/lib/components/lemmy/post/PostForm.svelte index 5c0475e7..7bdea11d 100644 --- a/src/lib/components/lemmy/post/PostForm.svelte +++ b/src/lib/components/lemmy/post/PostForm.svelte @@ -19,6 +19,13 @@ */ export let editingPost: Post | undefined = undefined + export let passedCommunity: + | { + id: number + name: string + } + | undefined = undefined + let data: { community: number | null title: string @@ -65,14 +72,19 @@ data.title = editingPost.name } - const list = await getClient().listCommunities({ - auth: $profile?.jwt, - type_: 'Subscribed', - sort: 'Active', - limit: 40, - }) + if (passedCommunity) { + data.community = passedCommunity.id + communitySearch = passedCommunity.name + } else { + const list = await getClient().listCommunities({ + auth: $profile?.jwt, + type_: 'Subscribed', + sort: 'Active', + limit: 40, + }) - communities = list.communities.map((c) => c.community) + communities = list.communities.map((c) => c.community) + } }) async function submit() { diff --git a/src/lib/session.ts b/src/lib/session.ts new file mode 100644 index 00000000..f38abd49 --- /dev/null +++ b/src/lib/session.ts @@ -0,0 +1,25 @@ +interface SessionStorage { + lastSeenCommunity: // prettier-ignore + { + id: number + name: string + } | undefined + postData: {} +} + +export const setSessionStorage = ( + key: keyof SessionStorage, + value: SessionStorage[typeof key] +) => { + if (value == undefined) { + sessionStorage.removeItem(key) + } else { + sessionStorage.setItem(key, JSON.stringify(value)) + } +} + +export const getSessionStorage = ( + key: keyof SessionStorage +): SessionStorage[typeof key] => { + return JSON.parse(sessionStorage.getItem(key)!) +} diff --git a/src/lib/util.ts b/src/lib/util.ts index 125db820..a9fd81bb 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -17,3 +17,6 @@ export const searchParam = ( invalidateAll: true, }) } + +export const fullCommunityName = (name: string, actorId: string) => + `${name}@${new URL(actorId).hostname}` diff --git a/src/routes/c/[name]/+page.svelte b/src/routes/c/[name]/+page.svelte index bcd1ede2..1d7cd0a1 100644 --- a/src/routes/c/[name]/+page.svelte +++ b/src/routes/c/[name]/+page.svelte @@ -14,11 +14,23 @@ import Pageination from '$lib/components/ui/Pageination.svelte' import Avatar from '$lib/components/ui/Avatar.svelte' import Sort from '$lib/components/lemmy/Sort.svelte' - import { searchParam } from '$lib/util.js' + import { fullCommunityName, searchParam } from '$lib/util.js' + import { onDestroy, onMount } from 'svelte' + import { setSessionStorage } from '$lib/session.js' export let data let sidebar: boolean = false + + onMount(() => { + setSessionStorage('lastSeenCommunity', { + id: data.community.community.id, + name: fullCommunityName( + data.community.community.name, + data.community.community.actor_id + ), + }) + }) diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index c775566b..d0ce59d7 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -4,12 +4,17 @@ import Card from '$lib/components/ui/Card.svelte' import { profile } from '$lib/auth.js' import { onMount } from 'svelte' + import { getSessionStorage } from '$lib/session.js' onMount(() => { if (!$profile?.jwt) { goto('/login') } }) + + let community = getSessionStorage('lastSeenCommunity') as + | { id: number; name: string } + | undefined @@ -17,5 +22,8 @@ - goto(`/post/${e.detail.post.id}`)} /> + goto(`/post/${e.detail.post.id}`)} + />