X-Git-Url: https://git.r.bdr.sh/rbdr/forum/blobdiff_plain/fcbbc49687afeeecdc9388b367b1d7f2d0c76214..refs/heads/main:/src/routes/t/%5Bid%5D.svelte

diff --git a/src/routes/t/[id].svelte b/src/routes/t/[id].svelte
index 50aad50..b7a067b 100644
--- a/src/routes/t/[id].svelte
+++ b/src/routes/t/[id].svelte
@@ -1,48 +1,43 @@
-<script context="module">
-	export const load = ({
-	  page: {
-	    params: { id }
-	  }
-	}) => ({ props: { id } });
+<script lang="ts" context="module">
+	export const load = ({ params: { id } }) => ({ props: { id } });
 </script>
 
-<script>
+<script lang="ts">
 	import { onDestroy } from 'svelte';
 	import { _ } from 'svelte-i18n';
-	import { getTopic } from '$/stores/topics';
-	import { disableTopicActions, enableTopicActions } from '$/stores/actions';
+	import { topic } from '$lib/stores/topics';
+	import { disableTopicActions, enableTopicActions } from '$lib/stores/actions';
 
-	import Topic from '$/components/topic/topic.svelte';
-	import ErrorBlock from '$/components/error_block/error_block.svelte';
-	import Loader from '$/components/loader/loader.svelte';
+	import Topic from '$lib/components/topic/topic.svelte';
+	import ErrorBlock from '$lib/components/error_block/error_block.svelte';
+	import Loader from '$lib/components/loader/loader.svelte';
 
-	export let id;
+	export let id: string;
 
-	$: store = getTopic(id);
-	$: topic = $store.data;
+	$: response = topic(id, true);
 
 	enableTopicActions(id);
 	onDestroy(() => disableTopicActions());
 </script>
 
 <svelte:head>
-	{#if $store.loading}
+	{#if $response.loading}
 		<title>{$_('loader.message')}, {$_('topic.title')}</title>
 	{/if}
-	{#if $store.error}
+	{#if $response.error}
 		<title>{$_('error.generic.title')}, {$_('topic.title')}</title>
 	{/if}
-	{#if topic}
-		<title>{topic.title}, {$_('topic.title')}</title>
+	{#if $response.data}
+		<title>{$response.data.title}, {$_('topic.title')}</title>
 	{/if}
 </svelte:head>
 
-{#if $store.loading}
+{#if $response.loading}
 	<Loader />
 {/if}
-{#if $store.error}
+{#if $response.error}
 	<ErrorBlock message={$_('topic.error.unavailable')} />
 {/if}
-{#if topic}
-	<Topic {topic} />
+{#if $response.data}
+	<Topic topic={$response.data} />
 {/if}