feat: add mismatching instance page

This commit is contained in:
James Xylight committed 2025-06-06 11:10:06 -07:00
1 parent 2078d79ff8
commit 5b5b262d8d
6 files changed
+147 -80

No files matched your search

@@ -78,28 +78,6 @@
})
})
const fetchOnHome = async (jwt: string) => {
const id = toast({
content: $t('toast.fetchPostOnHome'),
loading: true,
})
try {
const res = await getClient().resolveObject({
q: data.post.value.post_view.post.ap_id,
})
if (res.post) {
removeToast(id)
goto(`/post/${instance.data}/${res.post.post.id}`, {}).then(() =>
removeToast(id),
)
}
} catch (err) {
removeToast(id)
}
}
let commentsPage = 1
let loading = $state(false)
@@ -117,10 +95,6 @@
data.thread.value.singleThread = false
commentsPage = 1
}
let remoteView = $derived(
page.params.instance?.toLowerCase() != instance.data?.toLowerCase(),
)
</script>
<svelte:head>
@@ -164,44 +138,6 @@
</svelte:head>
<article class="flex flex-col gap-2">
{#if remoteView}
<div
class="sticky top-0 bg-slate-50 dark:bg-zinc-950 z-20
border-b dark:border-zinc-800 border-slate-300
-mx-4 -mt-4 md:-mt-6 md:-mx-6 sticky-header px-4 py-2
flex items-center gap-2 mb-4 h-12
"
>
<Popover openOnHover>
{#snippet target()}
<Icon
src={InformationCircle}
size="24"
solid
class="bg-slate-200 dark:bg-zinc-700 p-0.5 rounded-full text-primary-900 dark:text-primary-100"
/>
{/snippet}
{$t('routes.post.instanceWarning')}
</Popover>
<span class="text-primary-900 dark:text-primary-100 font-bold">
{$t('routes.post.remoteView')}
</span>
{#if profile.data?.jwt}
<Button
class="ml-auto"
onclick={() => {
if (profile.data?.jwt) {
fetchOnHome(profile.data?.jwt)
}
}}
>
<Icon src={Home} mini size="16" />
{$t('routes.post.localView')}
</Button>
{/if}
</div>
{/if}
<header class="flex flex-col gap-2">
<div class="flex flex-row justify-between items-center gap-2 flex-wrap">
<PostMeta
@@ -1,15 +1,16 @@
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
import { getClient } from '$lib/lemmy.svelte.js'
import { client, getClient } from '$lib/lemmy.svelte.js'
import { awaitIfServer } from '$lib/promise.svelte.js'
import { SSR_ENABLED, settings } from '$lib/settings.svelte'
import type { GetComments } from 'lemmy-js-client'
import { ReactiveState } from '$lib/promise.svelte.js'
import { profile } from '$lib/auth.svelte.js'
import { redirect } from '@sveltejs/kit'
import { resolveRoute } from '$app/paths'
export async function load({ params, url, fetch }) {
const thread = url.searchParams.get('thread')
function buildContext(thread?: string) {
let parentId: number | undefined
let showContext: string | undefined = undefined
let showContext: string | undefined
let max_depth = 3
if (thread) {
@@ -21,18 +22,23 @@ export async function load({ params, url, fetch }) {
} else {
parentId = Number(split[1])
}
if (!Number.isInteger(parentId)) {
parentId = undefined
}
}
if (parentId) {
max_depth = 10
}
if (parentId) max_depth = 10
return { parentId, showContext, max_depth, focus: thread?.split('.').at(-1) }
}
export async function load({ params, url, fetch }) {
if (profile.data.instance != params.instance)
redirect(302, resolveRoute('/post/[instance]/[id]/confirm', params))
// TODO use Lemmy profile default settings
const sort = settings?.defaultSort?.comments ?? 'Hot'
const { parentId, showContext, max_depth, focus } = buildContext(
url.searchParams.get('thread') || undefined,
)
const commentParams: GetComments = {
post_id: Number(params.id),
type_: 'All',
@@ -44,8 +50,8 @@ export async function load({ params, url, fetch }) {
parent_id: parentId,
}
const comments = getClient(params.instance, fetch).getComments(commentParams)
const post = await getClient(params.instance.toLowerCase(), fetch).getPost({
const comments = client({ func: fetch }).getComments(commentParams)
const post = await client({ func: fetch }).getPost({
id: Number(params.id),
})
@@ -53,7 +59,7 @@ export async function load({ params, url, fetch }) {
thread: new ReactiveState({
showContext: showContext,
singleThread: parentId != undefined,
focus: thread?.split('.').at(-1),
focus,
}),
post: new ReactiveState(post),
commentSort: new ReactiveState(sort),
@@ -0,0 +1,107 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { resolveRoute } from '$app/paths'
import { page } from '$app/state'
import { profile, profileData } from '$lib/auth.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
import { client } from '$lib/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error'
import { t } from '$lib/translations'
import { toast } from 'mono-svelte'
import Button from 'mono-svelte/button/Button.svelte'
import Material from 'mono-svelte/materials/Material.svelte'
import { Plus } from 'svelte-hero-icons'
let loading = $state(false)
const fetched = $state.snapshot(profile.data.instance)
async function fetchOnHome() {
loading = true
try {
const res = await client().resolveObject({
q: `https://${page.params.instance}/post/${page.params.id}`,
})
if (res.post) {
goto(
resolveRoute(`/post/[instance]/[id]`, {
instance: profile.data.instance,
id: res.post.post.id.toString(),
}),
)
}
} catch (err) {
toast({ content: errorMessage(err), type: 'error' })
}
loading = false
}
</script>
<div class="w-full h-full flex flex-col justify-center mx-auto max-w-xl gap-6">
<header class="space-y-1">
<div class="font-mono bg-zinc-950 rounded-sm p-0.5 px-1 w-max">
{page.params.instance}/post/{page.params.id}
</div>
<Header>
{$t('routes.postRedirect.title')}
</Header>
<p>
{$t('routes.postRedirect.description', {
// @ts-ignore
homeInstance: fetched,
})}
</p>
</header>
<div class="flex flex-row items-center gap-2 flex-wrap">
{#if profile.data.jwt}
<Button
{loading}
disabled={loading}
size="md"
rounding="pill"
color="primary"
onclick={fetchOnHome}
>
{$t('routes.postRedirect.actions.fetch', {
// @ts-ignore
homeInstance: fetched,
})}
</Button>
{/if}
<Button size="md" rounding="pill" onclick={() => history.back()}>
{$t('routes.postRedirect.actions.back')}
</Button>
</div>
{#if profileData.profiles}
{@const filtered = profileData.profiles.filter(
(i) => i.instance == page.params.instance,
)}
<div class="space-y-1">
<div class="font-medium text-sm">
{$t('routes.postRedirect.actions.switch', {
// @ts-ignore
destInstance: page.params.instance,
})}
</div>
<Material
color="uniform"
padding="sm"
rounding="2xl"
class="dark:bg-zinc-950 max-h-96 overflow-auto"
>
{#each filtered as profile, index}
<ProfileButton prof={profile} {index} />
{/each}
<SidebarButton
href="/accounts/login/guest?redirect={page.url}"
icon={Plus}
class="rounded-lg"
>
{$t('account.addGuest')}
</SidebarButton>
</Material>
</div>
{/if}
</div>
@@ -0,0 +1,7 @@
import { profile } from '$lib/auth.svelte.js'
import { redirect } from '@sveltejs/kit'
export async function load({ params }) {
if (profile.data.instance == params.instance)
redirect(302, `/post/${params.instance}/${params.id}`)
}