feat: Allow changing instance URL when not logged in
This commit is contained in:
1 parent
f127b5f645
commit
fed5cc2263
11 files changed
+130
-73
No files matched your search
@@ -69,6 +69,14 @@
|
|||||||
>
|
>
|
||||||
{postRes.post.name}
|
{postRes.post.name}
|
||||||
</a>
|
</a>
|
||||||
|
{#if postRes.post.url && !postRes.post.thumbnail_url}
|
||||||
|
<a
|
||||||
|
href={postRes.post.url}
|
||||||
|
class="max-w-[40ch] overflow-ellipsis whitespace-nowrap text-sky-400 hover:underline text-xs"
|
||||||
|
>
|
||||||
|
{postRes.post.url}
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
{#if isImage(postRes.post.url)}
|
{#if isImage(postRes.post.url)}
|
||||||
<div class="self-start" class:blur-3xl={postRes.post.nsfw}>
|
<div class="self-start" class:blur-3xl={postRes.post.nsfw}>
|
||||||
<picture
|
<picture
|
||||||
@@ -109,7 +117,7 @@
|
|||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
class="w-full px-4 py-2 overflow-hidden
|
class="w-full px-4 py-2 overflow-hidden
|
||||||
whitespace-nowrap text-ellipsis text-sm group-hover:underline bg-slate-100 dark:bg-zinc-800 border dark:border-transparent
|
whitespace-nowrap text-ellipsis text-sm group-hover:underline bg-slate-100 border
|
||||||
absolute bottom-0 rounded-b-md flex flex-row gap-1 items-center"
|
absolute bottom-0 rounded-b-md flex flex-row gap-1 items-center"
|
||||||
>
|
>
|
||||||
<Icon src={Link} width={16} mini />
|
<Icon src={Link} width={16} mini />
|
||||||
@@ -120,7 +128,7 @@
|
|||||||
{#if postRes.post.body && !postRes.post.nsfw}
|
{#if postRes.post.body && !postRes.post.nsfw}
|
||||||
<p
|
<p
|
||||||
class="text-sm max-h-[74px] line-clamp-3 bg-slate-100 dark:bg-zinc-800
|
class="text-sm max-h-[74px] line-clamp-3 bg-slate-100 dark:bg-zinc-800
|
||||||
border border-slate-200 dark:border-zinc-700 rounded-md p-2 mt-2"
|
border border-slate-200 dark:border-zinc-700 rounded-md p-2"
|
||||||
>
|
>
|
||||||
{postRes.post.body}
|
{postRes.post.body}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-row gap-2 items-center pt-2">
|
<div class="flex flex-row gap-2 items-center">
|
||||||
<PostVote post={post.post} vote={post.my_vote} score={post.counts.score} />
|
<PostVote post={post.post} vote={post.my_vote} score={post.counts.score} />
|
||||||
|
|
||||||
<Link color={Color.border} href="/post/{getInstance()}/{post.post.id}">
|
<Link color={Color.border} href="/post/{getInstance()}/{post.post.id}">
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
import Logo from '$lib/components/ui/Logo.svelte'
|
import Logo from '$lib/components/ui/Logo.svelte'
|
||||||
import Menu from '$lib/components/ui/menu/Menu.svelte'
|
import Menu from '$lib/components/ui/menu/Menu.svelte'
|
||||||
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
|
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
|
||||||
import { DEFAULT_INSTANCE_URL, authData, user } from '$lib/lemmy.js'
|
import { authData, getInstance, instance, user } from '$lib/lemmy.js'
|
||||||
import { Color } from '$lib/ui/colors.js'
|
import { Color } from '$lib/ui/colors.js'
|
||||||
import {
|
import {
|
||||||
ArrowLeftOnRectangle,
|
ArrowLeftOnRectangle,
|
||||||
ArrowRightOnRectangle,
|
ArrowRightOnRectangle,
|
||||||
Beaker,
|
|
||||||
Bookmark,
|
Bookmark,
|
||||||
|
Cog6Tooth,
|
||||||
GlobeAlt,
|
GlobeAlt,
|
||||||
Icon,
|
Icon,
|
||||||
Inbox,
|
Inbox,
|
||||||
@@ -37,11 +37,7 @@
|
|||||||
class="text-xs opacity-50
|
class="text-xs opacity-50
|
||||||
transition-opacity"
|
transition-opacity"
|
||||||
>
|
>
|
||||||
{#if $authData?.instance}
|
{$instance}
|
||||||
{$authData.instance}
|
|
||||||
{:else}
|
|
||||||
{DEFAULT_INSTANCE_URL}
|
|
||||||
{/if}
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
@@ -124,13 +120,13 @@
|
|||||||
>
|
>
|
||||||
<Icon src={ArrowRightOnRectangle} mini width={16} />Log out
|
<Icon src={ArrowRightOnRectangle} mini width={16} />Log out
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
|
{/if}
|
||||||
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
|
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
|
||||||
<!-- svelte-ignore missing-declaration -->
|
<!-- svelte-ignore missing-declaration -->
|
||||||
<li class="text-xs px-4 py-1 my-1 opacity-80">v{__VERSION__}</li>
|
<li class="text-xs px-4 py-1 my-1 opacity-80">v{__VERSION__}</li>
|
||||||
<MenuButton link href="/experiments">
|
<MenuButton link href="/settings">
|
||||||
<Icon src={Beaker} mini width={16} />
|
<Icon src={Cog6Tooth} mini width={16} />
|
||||||
Experiments
|
Settings
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
{/if}
|
|
||||||
</Menu>
|
</Menu>
|
||||||
</nav>
|
</nav>
|
||||||
+28
-11
@@ -8,32 +8,33 @@ import {
|
|||||||
import { get, writable } from 'svelte/store'
|
import { get, writable } from 'svelte/store'
|
||||||
import { PUBLIC_PROXY_URL } from '$env/static/public'
|
import { PUBLIC_PROXY_URL } from '$env/static/public'
|
||||||
import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js'
|
import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js'
|
||||||
|
import { userSettings } from '$lib/settings.js'
|
||||||
|
|
||||||
export const DEFAULT_INSTANCE_URL = 'lemmy.world'
|
export const DEFAULT_INSTANCE_URL = 'lemmy.world'
|
||||||
export let instance_url = writable(DEFAULT_INSTANCE_URL)
|
export let instance = writable(DEFAULT_INSTANCE_URL)
|
||||||
export let corsSupported = writable(true)
|
export let corsSupported = writable(true)
|
||||||
|
|
||||||
export function buildBaseUrl(instance?: string) {
|
export function buildBaseUrl(instanceURL?: string) {
|
||||||
if (!instance) {
|
if (!instanceURL) {
|
||||||
instance = get(authData)?.instance ?? DEFAULT_INSTANCE_URL
|
instanceURL = get(instance)!
|
||||||
}
|
}
|
||||||
|
|
||||||
return `${PUBLIC_PROXY_URL}/cors/${instance}`
|
return `${PUBLIC_PROXY_URL}/cors/${instanceURL}`
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getClient(instance?: string): LemmyHttp {
|
export function getClient(instanceURL?: string): LemmyHttp {
|
||||||
if (!instance) {
|
if (!instanceURL) {
|
||||||
instance = get(authData)?.instance ?? DEFAULT_INSTANCE_URL
|
instanceURL = get(instance)
|
||||||
}
|
}
|
||||||
|
|
||||||
return new LemmyHttp(
|
return new LemmyHttp(
|
||||||
get(corsSupported)
|
get(corsSupported)
|
||||||
? `https://${instance}`
|
? `https://${instanceURL}`
|
||||||
: `${PUBLIC_PROXY_URL}/cors/${instance}`
|
: `${PUBLIC_PROXY_URL}/cors/${instanceURL}`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getInstance = () => get(authData)?.instance ?? DEFAULT_INSTANCE_URL
|
export const getInstance = () => get(instance)
|
||||||
|
|
||||||
export interface AuthData {
|
export interface AuthData {
|
||||||
token: string
|
token: string
|
||||||
@@ -73,7 +74,11 @@ if (typeof localStorage != 'undefined') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
authData.subscribe(async (data) => {
|
authData.subscribe(async (data) => {
|
||||||
|
instance.set(
|
||||||
|
data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
|
||||||
|
)
|
||||||
if (!data?.token) return
|
if (!data?.token) return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const site = await getClient().getSite({
|
const site = await getClient().getSite({
|
||||||
auth: data.token,
|
auth: data.token,
|
||||||
@@ -92,3 +97,15 @@ authData.subscribe(async (data) => {
|
|||||||
authData.set(undefined)
|
authData.set(undefined)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export async function validateInstance(instance: string): Promise<boolean> {
|
||||||
|
if (instance == '') return false
|
||||||
|
|
||||||
|
try {
|
||||||
|
await getClient(instance).getSite({})
|
||||||
|
|
||||||
|
return true
|
||||||
|
} catch (err) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
|
import { DEFAULT_INSTANCE_URL } from '$lib/lemmy.js'
|
||||||
import { writable } from 'svelte/store'
|
import { writable } from 'svelte/store'
|
||||||
|
|
||||||
interface Settings {
|
interface Settings {
|
||||||
newComments: boolean
|
newComments: boolean
|
||||||
expandableImages: boolean
|
expandableImages: boolean
|
||||||
|
instance?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultSettings: Settings = {
|
const defaultSettings: Settings = {
|
||||||
|
|||||||
@@ -7,18 +7,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
||||||
<h1 class="font-black text-3xl">{$page.status}</h1>
|
<h1 class="font-black text-5xl">{$page.status}</h1>
|
||||||
<p class="mx-4 md:mx-8">
|
|
||||||
Failed to fetch page. Most major lemmy instances are having quite a lot of
|
|
||||||
issues right now, this might be on their end.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
This could be a CORS issue. The instance you're using must update to Lemmy
|
|
||||||
1.18.1 to fix CORS.
|
|
||||||
</p>
|
|
||||||
<code class="bg-slate-100 dark:bg-zinc-800 px-2 py-1 rounded-md">
|
|
||||||
{JSON.stringify($page.error)}
|
|
||||||
</code>
|
|
||||||
<Link href={$page.url.toString()}>Retry</Link>
|
<Link href={$page.url.toString()}>Retry</Link>
|
||||||
<Button
|
<Button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
import Card from '$lib/components/ui/Card.svelte'
|
import Card from '$lib/components/ui/Card.svelte'
|
||||||
import Loading from '$lib/components/ui/loader/Loading.svelte'
|
import Loading from '$lib/components/ui/loader/Loading.svelte'
|
||||||
import { ToastType, addToast } from '$lib/components/ui/toasts/toasts.js'
|
import { ToastType, addToast } from '$lib/components/ui/toasts/toasts.js'
|
||||||
import { authData, buildBaseUrl, getClient } from '$lib/lemmy.js'
|
import { authData, buildBaseUrl, getClient, getInstance } from '$lib/lemmy.js'
|
||||||
import { Color } from '$lib/ui/colors.js'
|
import { Color } from '$lib/ui/colors.js'
|
||||||
import type { Community } from 'lemmy-js-client'
|
import type { Community } from 'lemmy-js-client'
|
||||||
import { list } from 'postcss'
|
import { list } from 'postcss'
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
formData.append('images[]', image)
|
formData.append('images[]', image)
|
||||||
|
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`${buildBaseUrl($authData.instance)}/pictrs/image?${new URLSearchParams({
|
`${buildBaseUrl(getInstance())}/pictrs/image?${new URLSearchParams({
|
||||||
auth: $authData.token,
|
auth: $authData.token,
|
||||||
})}`,
|
})}`,
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
<script>
|
|
||||||
import Switch from '$lib/components/input/Switch.svelte'
|
|
||||||
import Card from '$lib/components/ui/Card.svelte'
|
|
||||||
import { userSettings } from '$lib/settings'
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svelte:head>
|
|
||||||
<title>Experiments</title>
|
|
||||||
</svelte:head>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-4">
|
|
||||||
<h1 class="text-3xl font-bold">Experiments</h1>
|
|
||||||
<Card class="flex flex-col gap-2 p-4 text-sm">
|
|
||||||
<h1 class="text-lg font-bold">New comment design</h1>
|
|
||||||
<span>Makes comment actions look slightly different.</span>
|
|
||||||
<Switch bind:enabled={$userSettings.newComments} />
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
@@ -8,7 +8,12 @@
|
|||||||
addToast,
|
addToast,
|
||||||
toast,
|
toast,
|
||||||
} from '$lib/components/ui/toasts/toasts.js'
|
} from '$lib/components/ui/toasts/toasts.js'
|
||||||
import { DEFAULT_INSTANCE_URL, authData, getClient } from '$lib/lemmy.js'
|
import {
|
||||||
|
DEFAULT_INSTANCE_URL,
|
||||||
|
authData,
|
||||||
|
getClient,
|
||||||
|
validateInstance,
|
||||||
|
} from '$lib/lemmy.js'
|
||||||
import { Color } from '$lib/ui/colors.js'
|
import { Color } from '$lib/ui/colors.js'
|
||||||
|
|
||||||
let data = {
|
let data = {
|
||||||
@@ -19,22 +24,10 @@
|
|||||||
loading: false,
|
loading: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
async function validateURL(instance: string): Promise<boolean> {
|
|
||||||
if (instance == '') return false
|
|
||||||
|
|
||||||
try {
|
|
||||||
await getClient(instance).getSite({})
|
|
||||||
} catch (err) {
|
|
||||||
throw new Error('Failed to contact that instance. Is it down?')
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
async function logIn() {
|
async function logIn() {
|
||||||
data.loading = true
|
data.loading = true
|
||||||
try {
|
try {
|
||||||
if (!(await validateURL(data.instance))) {
|
if (!(await validateInstance(data.instance))) {
|
||||||
throw new Error('Failed to contact that instance. Is it down?')
|
throw new Error('Failed to contact that instance. Is it down?')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { DEFAULT_INSTANCE_URL, authData } from '$lib/lemmy.js'
|
import { instance } from '$lib/lemmy.js'
|
||||||
import { error, redirect } from '@sveltejs/kit'
|
import { error, redirect } from '@sveltejs/kit'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@ export function load({ params, url }) {
|
|||||||
if (Number(params.instance)) {
|
if (Number(params.instance)) {
|
||||||
const split = url.pathname.split('/')
|
const split = url.pathname.split('/')
|
||||||
|
|
||||||
split.splice(2, 0, `${get(authData)?.instance ?? DEFAULT_INSTANCE_URL}`)
|
split.splice(2, 0, `${get(instance)}`)
|
||||||
|
|
||||||
const newUrl = new URL(url)
|
const newUrl = new URL(url)
|
||||||
newUrl.pathname = split.join('/')
|
newUrl.pathname = split.join('/')
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import Switch from '$lib/components/input/Switch.svelte'
|
||||||
|
import TextInput from '$lib/components/input/TextInput.svelte'
|
||||||
|
import Card from '$lib/components/ui/Card.svelte'
|
||||||
|
import { userSettings } from '$lib/settings'
|
||||||
|
import { authData, instance, user, validateInstance } from '$lib/lemmy.js'
|
||||||
|
import { Color } from '$lib/ui/colors.js'
|
||||||
|
import Button from '$lib/components/input/Button.svelte'
|
||||||
|
import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js'
|
||||||
|
|
||||||
|
let data = {
|
||||||
|
newInstance: $instance,
|
||||||
|
loading: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
async function changeInstance() {
|
||||||
|
data.loading = true
|
||||||
|
try {
|
||||||
|
authData.set(undefined)
|
||||||
|
user.set(undefined)
|
||||||
|
if (typeof localStorage != 'undefined') {
|
||||||
|
localStorage.removeItem('user')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(await validateInstance(data.newInstance))) {
|
||||||
|
throw new Error('Failed to contact that instance URL')
|
||||||
|
}
|
||||||
|
|
||||||
|
instance.set(data.newInstance)
|
||||||
|
|
||||||
|
$userSettings.instance = data.newInstance
|
||||||
|
} catch (error) {
|
||||||
|
toast({
|
||||||
|
content: error as any,
|
||||||
|
type: ToastType.error,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
data.loading = false
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svelte:head>
|
||||||
|
<title>Settings</title>
|
||||||
|
</svelte:head>
|
||||||
|
|
||||||
|
<div class="flex flex-col gap-4">
|
||||||
|
<h1 class="text-3xl font-bold">Settings</h1>
|
||||||
|
<Card class="flex flex-col gap-3 p-6 text-sm">
|
||||||
|
<h1 class="font-bold">Instance</h1>
|
||||||
|
<p>Changing this will log you out.</p>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<TextInput
|
||||||
|
bind:value={data.newInstance}
|
||||||
|
pattern={'(?!-)[A-Za-z0-9-]+([-.]{1}[a-z0-9]+)*.[A-Za-z]{2,6}'}
|
||||||
|
class="flex-1"
|
||||||
|
/>
|
||||||
|
<div class="w-24">
|
||||||
|
<Button
|
||||||
|
color={Color.accent}
|
||||||
|
large
|
||||||
|
loading={data.loading}
|
||||||
|
disabled={data.loading}
|
||||||
|
on:click={changeInstance}
|
||||||
|
>
|
||||||
|
Change
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
Reference in new issue
Block a user