diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Database/SB/events.ts | 2 | ||||
| -rw-r--r-- | src/lib/Events/Event.svelte | 3 | ||||
| -rw-r--r-- | src/lib/Events/Group.svelte | 2 | ||||
| -rw-r--r-- | src/lib/Home/HeadTitle.svelte | 6 | ||||
| -rw-r--r-- | src/lib/Home/LastActivity.svelte | 5 | ||||
| -rw-r--r-- | src/lib/MarkdownLink.svelte | 29 |
6 files changed, 21 insertions, 26 deletions
diff --git a/src/lib/Database/SB/events.ts b/src/lib/Database/SB/events.ts index b7e2bb85..aa914f95 100644 --- a/src/lib/Database/SB/events.ts +++ b/src/lib/Database/SB/events.ts @@ -1,4 +1,4 @@ -import type Group from '$lib/Events/Group.svelte'; +import type { Group } from '$lib/Database/SB/groups'; import sb from '../sb'; export interface Event { diff --git a/src/lib/Events/Event.svelte b/src/lib/Events/Event.svelte index eab67402..e6e16586 100644 --- a/src/lib/Events/Event.svelte +++ b/src/lib/Events/Event.svelte @@ -3,8 +3,7 @@ import root from '$lib/Utility/root'; import locale from '$stores/locale'; - export let event: Event; - export let avatar = false; + let { event, avatar = false }: { event: Event; avatar?: boolean } = $props(); </script> <div diff --git a/src/lib/Events/Group.svelte b/src/lib/Events/Group.svelte index a3d24807..43eb4f26 100644 --- a/src/lib/Events/Group.svelte +++ b/src/lib/Events/Group.svelte @@ -2,7 +2,7 @@ import type { Group } from '$lib/Database/SB/groups'; import tooltip from '$lib/Tooltip/tooltip'; - export let group: Group; + let { group }: { group: Group } = $props(); </script> <div diff --git a/src/lib/Home/HeadTitle.svelte b/src/lib/Home/HeadTitle.svelte index 39a65ccd..1e86cab2 100644 --- a/src/lib/Home/HeadTitle.svelte +++ b/src/lib/Home/HeadTitle.svelte @@ -1,8 +1,6 @@ <script lang="ts"> - export let route: string | undefined = undefined; - export let path = '/'; - - const title = (route ? `${route} • ` : '') + 'due.moe'; + let { route = undefined, path = '/' }: { route?: string; path?: string } = $props(); + const title = $derived((route ? `${route} • ` : '') + 'due.moe'); </script> <svelte:head> diff --git a/src/lib/Home/LastActivity.svelte b/src/lib/Home/LastActivity.svelte index cfd01534..61cf6c7d 100644 --- a/src/lib/Home/LastActivity.svelte +++ b/src/lib/Home/LastActivity.svelte @@ -5,9 +5,8 @@ import { lastActivityDate } from '../Data/AniList/activity'; import settings from '$stores/settings'; - export let user: AniListAuthorisation; - - let lastActivityWasToday = true; + let { user }: { user: AniListAuthorisation } = $props(); + let lastActivityWasToday = $state(true); onMount(async () => { if (!$settings.displayDisableLastActivityWarning && user !== undefined) { diff --git a/src/lib/MarkdownLink.svelte b/src/lib/MarkdownLink.svelte index 731eb263..ee8c4900 100644 --- a/src/lib/MarkdownLink.svelte +++ b/src/lib/MarkdownLink.svelte @@ -1,21 +1,20 @@ <script lang="ts"> - export let href: string; - export let text: string; + let { href, text }: { href: string; text: string } = $props(); + let safeHref = $derived.by(() => { + try { + let url = new URL(href); - try { - let url = new URL(href); + switch (url.protocol) { + case 'javascript:': + return '#'; - switch (url.protocol) { - case 'javascript:': - href = '#'; - break; - - default: - break; + default: + return href; + } + } catch (error) { + return '#'; } - } catch (error) { - href = '#'; - } + }); </script> -<a {href} target="_blank">{text}</a> +<a href={safeHref} target="_blank">{text}</a> |