;
+ let relaysReady = !browser;
const client = createRxNostr();
- client.setRelays(settings.defaultRelays);
setContext('nostr-client', client);
+ $: if (browser) {
+ if ($darkMode) {
+ document.documentElement.setAttribute('data-darkmode', 'true');
+ applyDarkMode();
+ } else {
+ document.documentElement.removeAttribute('data-darkmode');
+ removeDarkMode();
+ }
+ }
+
+ const BOOTSTRAP_RELAYS = [
+ 'wss://indexer.coracle.social',
+ 'wss://relay.damus.io',
+ 'wss://directory.yabu.me',
+ 'wss://purplepag.es',
+ 'wss://nos.lol'
+ ];
+
+ async function applyRelaySource(source: typeof $relaySource) {
+ if (!browser) return;
+ relaysReady = false;
+
+ let resolved: string[] | null = null;
+
+ if (source === 'default') {
+ resolved = settings.defaultRelays;
+ } else {
+ const pk = KeyManager.isLoggedIn() ? await KeyManager.getPublicKey() : null;
+ if (pk) {
+ const tmpClient = createRxNostr();
+ tmpClient.setRelays(BOOTSTRAP_RELAYS);
+ try {
+ resolved = await resolveRelays(tmpClient, source, pk, settings.defaultRelays);
+ } finally {
+ tmpClient.dispose();
+ }
+ }
+
+ if (!resolved) resolved = settings.defaultRelays;
+ }
+
+ client.setRelays(resolved);
+ currentRelays.set(resolved);
+ relaysReady = true;
+ }
+
+ $: if (browser) {
+ void $pubkey;
+ void $nip07;
+ applyRelaySource($relaySource);
+ }
+
beforeNavigate(() => {
timeout = setTimeout(() => {
loading = true;
@@ -32,6 +90,7 @@
afterNavigate(() => {
clearTimeout(timeout);
loading = false;
+ if (browser && $darkMode) applyDarkMode();
});
@@ -43,7 +102,7 @@
- {#if loading}
+ {#if loading || !relaysReady}
{:else}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 30a0f3a..b51f4c0 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -5,7 +5,7 @@
import ExternalLink from '$lib/components/ExternalLink.svelte';
import GlobalMatomeList from '$lib/components/GlobalMatomeList.svelte';
- const title = 'Nosli | Create curated lists of posts on nostr';
+ const title = 'Nosli - 魔改造 edition | Create curated lists of posts on nostr';
const desc = 'Nosli helps you create a curated list of posts on nostr';
@@ -18,7 +18,7 @@
-
Nosli
+
Nosli- 魔改造 edition
{$_('nosli-description')}
diff --git a/src/routes/li/[id]/+page.svelte b/src/routes/li/[id]/+page.svelte
index 03f3bbf..6e4b0eb 100644
--- a/src/routes/li/[id]/+page.svelte
+++ b/src/routes/li/[id]/+page.svelte
@@ -4,9 +4,11 @@
import type { RxNostr } from 'rx-nostr';
import { _ } from 'svelte-i18n';
+ import { base } from '$app/paths';
import type { PageData } from './$types';
import { matomeStore, profileStore, notesStore } from '$lib/stores/nostr';
- import { linkify, linkifyOpts } from '$lib/actions/linkify';
+ import { linkify, makeLinkifyOpts } from '$lib/actions/linkify';
+ import { linkTarget } from '$lib/stores/cookie';
import KeyManager from '$lib/services/KeyManager';
import NoteList from '$lib/components/NoteList.svelte';
import ProfileLink from '$lib/components/ProfileLink.svelte';
@@ -25,15 +27,16 @@
});
$: profile = profileStore({ client, pubkey: data.params.pubkey });
$: notes = $matome ? notesStore({ client, ids: $matome.eventIds() }) : undefined;
+ $: opts = makeLinkifyOpts($linkTarget);
{#if $matome && $profile}
- {$matome.title} by {$profile.formattedName()} | Nosli
+ {$matome.title} by {$profile.formattedName()} | Nosli - 魔改造 edition
-
+
{/if}
@@ -47,14 +50,14 @@
{:then isMine}
{#if isMine && KeyManager.isWritableLoggedIn()}
{/if}
{/await}
{$matome.summary}
+ {$matome.summary}
{/if}
diff --git a/src/routes/li/[id]/edit/+page.svelte b/src/routes/li/[id]/edit/+page.svelte
index 317e5c6..b086333 100644
--- a/src/routes/li/[id]/edit/+page.svelte
+++ b/src/routes/li/[id]/edit/+page.svelte
@@ -26,7 +26,9 @@
{#if $matome}
- {$_('edit-identifier', { values: { identifier: $matome.identifier } })} | Nosli
+ {$_('edit-identifier', { values: { identifier: $matome.identifier } })} | Nosli - 魔改造 edition
{/if}
diff --git a/src/routes/li/new/+page.svelte b/src/routes/li/new/+page.svelte
index 2d4df8a..68b76ff 100644
--- a/src/routes/li/new/+page.svelte
+++ b/src/routes/li/new/+page.svelte
@@ -5,7 +5,7 @@
- {$_('create-new-list')} | Nosli
+ {$_('create-new-list')} | Nosli - 魔改造 edition
{$_('create-new-list')}
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 18729a6..3f3a271 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -6,7 +6,7 @@
import LoginForm from '$lib/components/LoginForm.svelte';
import Alert from '$lib/components/Alert.svelte';
- $: title = `${$_('login')} | Nosli`;
+ $: title = `${$_('login')} | Nosli - 魔改造 edition`;
$: desc = $_('login-to-nosli');
diff --git a/src/routes/p/[id]/+page.svelte b/src/routes/p/[id]/+page.svelte
index 5291766..8591f01 100644
--- a/src/routes/p/[id]/+page.svelte
+++ b/src/routes/p/[id]/+page.svelte
@@ -6,7 +6,8 @@
import type { PageData } from './$types';
import { recentUserMatomesStore, profileStore } from '$lib/stores/nostr';
- import { linkify, linkifyOpts } from '$lib/actions/linkify';
+ import { linkify, makeLinkifyOpts } from '$lib/actions/linkify';
+ import { linkTarget } from '$lib/stores/cookie';
import KeyManager from '$lib/services/KeyManager';
import MatomeList from '$lib/components/MatomeList.svelte';
import Alert from '$lib/components/Alert.svelte';
@@ -22,13 +23,14 @@
const profile = profileStore({ client, pubkey: data.pubkey });
$: name = $profile?.formattedName() || 'nostrich';
+ $: opts = makeLinkifyOpts($linkTarget);
- {name} | Nosli
+ {name} | Nosli - 魔改造 edition
-
+
@@ -48,7 +50,7 @@
{#if $profile}
- {$profile.about}
+ {$profile.about}
{/if}
{#if $profile && KeyManager.isLoggedInWithPublicKey()}
diff --git a/static/.nojekyll b/static/.nojekyll
new file mode 100644
index 0000000..e69de29
diff --git a/svelte.config.js b/svelte.config.js
index 99e05a6..96c061e 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,11 +1,9 @@
import preprocess from 'svelte-preprocess';
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
import { vitePreprocess } from '@sveltejs/kit/vite';
/** @type {import('@sveltejs/kit').Config} */
const config = {
- // Consult https://kit.svelte.dev/docs/integrations#preprocessors
- // for more information about preprocessors
preprocess: [
vitePreprocess(),
preprocess({
@@ -14,10 +12,16 @@ const config = {
],
kit: {
- // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
- // If your environment is not supported or you settled on a specific environment, switch out the adapter.
- // See https://kit.svelte.dev/docs/adapters for more information about adapters.
- adapter: adapter()
+ adapter: adapter({
+ pages: 'build',
+ assets: 'build',
+ fallback: '404.html',
+ precompress: false,
+ strict: false
+ }),
+ paths: {
+ base: process.env.BASE_PATH || ''
+ }
}
};
- Nosli
+ 
+ Nosli - 魔改造 edition