@@ -120,7 +128,7 @@
{#if postRes.post.body && !postRes.post.nsfw}
{postRes.post.body}
diff --git a/src/lib/components/lemmy/PostActions.svelte b/src/lib/components/lemmy/PostActions.svelte
index 3436899e..87877a5f 100644
--- a/src/lib/components/lemmy/PostActions.svelte
+++ b/src/lib/components/lemmy/PostActions.svelte
@@ -59,7 +59,7 @@
}
-
+
diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte
index a1995e66..d2026b24 100644
--- a/src/lib/components/ui/Navbar.svelte
+++ b/src/lib/components/ui/Navbar.svelte
@@ -5,13 +5,13 @@
import Logo from '$lib/components/ui/Logo.svelte'
import Menu from '$lib/components/ui/menu/Menu.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 {
ArrowLeftOnRectangle,
ArrowRightOnRectangle,
- Beaker,
Bookmark,
+ Cog6Tooth,
GlobeAlt,
Icon,
Inbox,
@@ -37,11 +37,7 @@
class="text-xs opacity-50
transition-opacity"
>
- {#if $authData?.instance}
- {$authData.instance}
- {:else}
- {DEFAULT_INSTANCE_URL}
- {/if}
+ {$instance}
@@ -124,13 +120,13 @@
>
Log out
-
-
-
v{__VERSION__}
-
-
- Experiments
-
{/if}
+
+
+
v{__VERSION__}
+
+
+ Settings
+
diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts
index 7c8a03c6..314d24d2 100644
--- a/src/lib/lemmy.ts
+++ b/src/lib/lemmy.ts
@@ -8,32 +8,33 @@ import {
import { get, writable } from 'svelte/store'
import { PUBLIC_PROXY_URL } from '$env/static/public'
import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js'
+import { userSettings } from '$lib/settings.js'
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 function buildBaseUrl(instance?: string) {
- if (!instance) {
- instance = get(authData)?.instance ?? DEFAULT_INSTANCE_URL
+export function buildBaseUrl(instanceURL?: string) {
+ if (!instanceURL) {
+ instanceURL = get(instance)!
}
- return `${PUBLIC_PROXY_URL}/cors/${instance}`
+ return `${PUBLIC_PROXY_URL}/cors/${instanceURL}`
}
-export function getClient(instance?: string): LemmyHttp {
- if (!instance) {
- instance = get(authData)?.instance ?? DEFAULT_INSTANCE_URL
+export function getClient(instanceURL?: string): LemmyHttp {
+ if (!instanceURL) {
+ instanceURL = get(instance)
}
return new LemmyHttp(
get(corsSupported)
- ? `https://${instance}`
- : `${PUBLIC_PROXY_URL}/cors/${instance}`
+ ? `https://${instanceURL}`
+ : `${PUBLIC_PROXY_URL}/cors/${instanceURL}`
)
}
-export const getInstance = () => get(authData)?.instance ?? DEFAULT_INSTANCE_URL
+export const getInstance = () => get(instance)
export interface AuthData {
token: string
@@ -73,7 +74,11 @@ if (typeof localStorage != 'undefined') {
}
authData.subscribe(async (data) => {
+ instance.set(
+ data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
+ )
if (!data?.token) return
+
try {
const site = await getClient().getSite({
auth: data.token,
@@ -92,3 +97,15 @@ authData.subscribe(async (data) => {
authData.set(undefined)
}
})
+
+export async function validateInstance(instance: string): Promise
{
+ if (instance == '') return false
+
+ try {
+ await getClient(instance).getSite({})
+
+ return true
+ } catch (err) {
+ return false
+ }
+}
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index bec6d2e1..0985f679 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -1,8 +1,10 @@
+import { DEFAULT_INSTANCE_URL } from '$lib/lemmy.js'
import { writable } from 'svelte/store'
interface Settings {
newComments: boolean
expandableImages: boolean
+ instance?: string
}
const defaultSettings: Settings = {
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 36379dad..2e3da9e7 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -7,18 +7,7 @@
-
{$page.status}
-
- Failed to fetch page. Most major lemmy instances are having quite a lot of
- issues right now, this might be on their end.
-
-
- This could be a CORS issue. The instance you're using must update to Lemmy
- 1.18.1 to fix CORS.
-
-
- {JSON.stringify($page.error)}
-
+
{$page.status}
Retry